chore: update android build dependencies

rive-app · Jul 26, 2023 · f15aa19 · f15aa19
1 parent 281c986
commit f15aa19
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 35 deletions.
diff --git a/android/build.gradle b/android/build.gradle
@@ -8,7 +8,8 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:4.1.2"
+    classpath("com.android.tools.build:gradle")
+    classpath("com.facebook.react:react-native-gradle-plugin")
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -37,13 +38,6 @@ android {
 
   }
 
-  packagingOptions {
-      pickFirst "lib/x86/libc++_shared.so"
-      pickFirst "lib/x86_64/libc++_shared.so"
-      pickFirst "lib/armeabi-v7a/libc++_shared.so"
-      pickFirst "lib/arm64-v8a/libc++_shared.so"
-  }
-
   buildTypes {
     release {
       minifyEnabled false

diff --git a/example/android/app/build.gradle b/example/android/app/build.gradle
@@ -146,7 +146,7 @@ def enableProguardInReleaseBuilds = false
 def jscFlavor = 'org.webkit:android-jsc:+'
 
 android {
-    ndkVersion "22.1.7171670"
+    ndkVersion "25.1.8937393"
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     compileOptions {
@@ -185,14 +185,14 @@ android {
 
 dependencies {
      // The version of react-native is set by the React Native Gradle Plugin
-    implementation "com.facebook.react:react-native:+"  // From node_modules
+    implementation "com.facebook.react:react-android"
     implementation "androidx.startup:startup-runtime:1.1.1"
     implementation ("androidx.appcompat:appcompat:1.3.1") {
         version {
             strictly '1.3.1'
         }
     }
-    
+
     debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}") {
       exclude group:'com.facebook.fbjni'
     }

diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -23,27 +23,3 @@ buildscript {
         // in the individual module build.gradle files
     }
 }
-
-allprojects {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-        maven {
-            // All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-            url("$rootDir/../node_modules/react-native/android")
-        }
-        maven {
-            // Android JSC is installed from npm
-            url("$rootDir/../node_modules/jsc-android/dist")
-        }
-
-        google()
-        maven { url 'https://www.jitpack.io' }
-    }
-
-    configurations.all {
-        resolutionStrategy {
-            force 'com.facebook.react:react-native:0.66.4'
-        }
-    }
-}