Merge pull request #1047 from breez/savage-android-example-fix

Fix Kotlin incompatibility error in RN Android example
breez · Aug 8, 2024 · 0eb0f6a · 0eb0f6a
2 parents 74a8208 + 341b124
commit 0eb0f6a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 628 deletions.
diff --git a/libs/sdk-react-native/example/.gitignore b/libs/sdk-react-native/example/.gitignore
@@ -61,6 +61,7 @@ buck-out/
 
 # Ruby / CocoaPods
 /ios/Pods/
+/ios/Podfile.lock
 /vendor/bundle/
 
 .watchman-cookie-.*
diff --git a/libs/sdk-react-native/example/android/app/build.gradle b/libs/sdk-react-native/example/android/app/build.gradle
@@ -283,6 +283,9 @@ dependencies {
 
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
 
+    implementation "androidx.core:core-ktx:1.3.2"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:${rootProject.ext.kotlinVersion}"
+
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
         exclude group:'com.facebook.fbjni'
     }

diff --git a/libs/sdk-react-native/example/android/build.gradle b/libs/sdk-react-native/example/android/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     ext {
-        buildToolsVersion = "31.0.0"
-        minSdkVersion = 21
-        compileSdkVersion = 31
-        targetSdkVersion = 31
+        buildToolsVersion = "33.0.0"
+        minSdkVersion = 24
+        compileSdkVersion = 33
+        targetSdkVersion = 33
+        kotlinVersion = "1.8.0"
 
         if (System.properties['os.arch'] == "aarch64") {
             // For M1 Users we need to use the NDK 24 which added support for aarch64
@@ -23,6 +24,7 @@ buildscript {
         classpath("com.android.tools.build:gradle:7.2.1")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("de.undercouch:gradle-download-task:5.0.1")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion")
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }