feat: Add react-native 0.65 support (#378)

* fix `;` * upgrade react-native to 0.65.1 * upgrade example to react-native 0.65.1 * Update Podfile.lock * Update Podfile.lock * add `jcenter()` temporarily * upgrade gradle tools (kotlin, build-tools, swipe-to-refresh) * Upgrade `react-native-navigation` to `7.18.1-snapshot.1611` * chore(deps): Upgrade a few more deps
mrousavy · Aug 20, 2021 · cae08a1 · cae08a1
1 parent 8e02b49
commit cae08a1
Show file tree

Hide file tree

Showing 11 changed files with 813 additions and 982 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -4,10 +4,10 @@ import java.nio.file.Paths
 
 def reactNative = new File("$projectDir/../node_modules/react-native")
 
-def FOR_HERMES = System.getenv("FOR_HERMES") == "True";
+def FOR_HERMES = System.getenv("FOR_HERMES") == "True"
 rootProject.getSubprojects().forEach({project ->
   if (project.plugins.hasPlugin("com.android.application")) {
-    FOR_HERMES = project.ext.react.enableHermes;
+    FOR_HERMES = project.ext.react.enableHermes
   }
 })
 
@@ -52,14 +52,14 @@ buildscript {
 
   repositories {
     google()
-    jcenter()
+    mavenCentral()
     maven {
       url "https://plugins.gradle.org/m2/"
     }
   }
 
   dependencies {
-    classpath 'com.android.tools.build:gradle:4.2.1'
+    classpath 'com.android.tools.build:gradle:4.2.2'
     classpath 'de.undercouch:gradle-download-task:4.1.2'
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -136,7 +136,6 @@ android {
 
 repositories {
   mavenCentral()
-  jcenter()
   google()
 
   def found = false

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -15,6 +15,6 @@ VisionCamera_buildToolsVersion=30.0.0
 VisionCamera_compileSdkVersion=30
 VisionCamera_kotlinVersion=1.5.0
 VisionCamera_targetSdkVersion=30
-VisionCamera_ndkVersion=22.0.7026061
+VisionCamera_ndkVersion=20.1.5948944
 android.enableJetifier=true
 android.useAndroidX=true
diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -126,11 +126,6 @@ android {
     ndkVersion rootProject.ext.ndkVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-
     dexOptions {
         javaMaxHeapSize "4g"
     }
@@ -194,24 +189,24 @@ dependencies {
     implementation "com.facebook.react:react-native:+"  // From node_modules
 
 
-    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.0.0"
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 
     if (enableHermes) {
-        def hermesPath = "../../node_modules/hermes-engine/android/";
+        def hermesPath = "../../node_modules/hermes-engine/android/"
         debugImplementation files(hermesPath + "hermes-debug.aar")
         releaseImplementation files(hermesPath + "hermes-release.aar")
     } else {
         implementation jscFlavor
     }
 
     implementation project(':react-native-vision-camera')
-    implementation "androidx.camera:camera-core:1.1.0-alpha05"
+    implementation "androidx.camera:camera-core:1.1.0-alpha08"
 }
 
 // Run this once to be able to run the application with BUCK
 // puts all compile dependencies into folder libs for BUCK to use
 task copyDownloadableDepsToLibs(type: Copy) {
-    from configurations.compile
+    from configurations.implementation
     into 'libs'
 }
 

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -3,19 +3,20 @@
 buildscript {
     ext {
         RNNKotlinVersion = "1.3.61"
-        buildToolsVersion = "30.0.0"
+        buildToolsVersion = "30.0.2"
         minSdkVersion = 21
         compileSdkVersion = 30
         targetSdkVersion = 30
         ndkVersion = "20.1.5948944"
     }
     repositories {
         google()
-        jcenter()
+        mavenCentral()
+        jcenter() // <-- TODO: REMOVE jcenter() WHEN BlurView & Video supports it
     }
     dependencies {
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.0"
-        classpath("com.android.tools.build:gradle:4.1.3")
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.21"
+        classpath("com.android.tools.build:gradle:4.2.2")
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -24,6 +25,8 @@ buildscript {
 
 allprojects {
     repositories {
+        mavenCentral()
+        jcenter() // <-- TODO: REMOVE jcenter() WHEN BlurView & Video supports it
         mavenLocal()
         maven {
             // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
@@ -35,7 +38,6 @@ allprojects {
         }
 
         google()
-        jcenter()
         maven { url 'https://www.jitpack.io' }
     }
 }
diff --git a/example/android/gradle/wrapper/gradle-wrapper.properties b/example/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists