Bump NDK to 25 (#37974)

Summary: Bumps NDK to current LTS Release. ## Changelog: [Android] [Changed] - Bump NDK to 25 Pull Request resolved: #37974 Test Plan: CI Green ✅ Reviewed By: christophpurrer Differential Revision: D47754763 Pulled By: cortinico fbshipit-source-id: 24fbca503b3814c28a05aada5223c741e14bda28
facebook · Jul 25, 2023 · 28deaa3 · 28deaa3
1 parent dd1c8a6
commit 28deaa3
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 9 deletions.
diff --git a/.circleci/Dockerfiles/Dockerfile.android b/.circleci/Dockerfiles/Dockerfile.android
@@ -14,7 +14,7 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:9.0
+FROM reactnativecommunity/react-native-android:v10.0
 
 LABEL Description="React Native Android Test Image"
 LABEL maintainer="Meta Open Source <opensource@meta.com>"

diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -113,7 +113,7 @@ executors:
   reactnativeandroid:
     <<: *defaults
     docker:
-      - image: reactnativecommunity/react-native-android:9.0
+      - image: reactnativecommunity/react-native-android:v10.0
     resource_class: "xlarge"
     environment:
       - TERM: "dumb"

diff --git a/build.gradle.kts b/build.gradle.kts
@@ -30,7 +30,7 @@ version =
 group = "com.facebook.react"
 
 val ndkPath by extra(System.getenv("ANDROID_NDK"))
-val ndkVersion by extra(System.getenv("ANDROID_NDK_VERSION") ?: "23.1.7779620")
+val ndkVersion by extra(System.getenv("ANDROID_NDK_VERSION") ?: "25.1.8937393")
 val sonatypeUsername = findProperty("SONATYPE_USERNAME")?.toString()
 val sonatypePassword = findProperty("SONATYPE_PASSWORD")?.toString()
 

diff --git a/package.json b/package.json
@@ -27,7 +27,7 @@
     "prettier": "prettier --write \"./**/*.{js,md,yml,ts,tsx}\"",
     "format-check": "prettier --list-different \"./**/*.{js,md,yml,ts,tsx}\"",
     "update-lock": "npx yarn-deduplicate",
-    "docker-setup-android": "docker pull reactnativecommunity/react-native-android:9.0",
+    "docker-setup-android": "docker pull reactnativecommunity/react-native-android:v10.0",
     "docker-build-android": "docker build -t reactnativeci/android -f .circleci/Dockerfiles/Dockerfile.android .",
     "test-android-run-instrumentation": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-instrumentation-tests.sh",
     "test-android-run-unit": "docker run --cap-add=SYS_ADMIN -it reactnativeci/android bash .circleci/Dockerfiles/scripts/run-android-docker-unit-tests.sh",

diff --git a/packages/react-native/ReactAndroid/gradle.properties b/packages/react-native/ReactAndroid/gradle.properties
@@ -7,7 +7,7 @@ ANDROIDX_AUTOFILL_VERSION=1.1.0
 ANDROIDX_TEST_VERSION=1.1.0
 ANDROIDX_TRACING_VERSION=1.1.0
 ASSERTJ_VERSION=3.21.0
-FBJNI_VERSION=0.4.0
+FBJNI_VERSION=0.5.1
 FRESCO_VERSION=3.0.0
 INFER_ANNOTATIONS_VERSION=0.18.0
 JAVAX_INJECT_VERSION=1

diff --git a/packages/react-native/ReactAndroid/hermes-engine/build.gradle b/packages/react-native/ReactAndroid/hermes-engine/build.gradle
@@ -258,7 +258,7 @@ android {
     }
 
     dependencies {
-        implementation("com.facebook.fbjni:fbjni:0.4.0")
+        implementation("com.facebook.fbjni:fbjni:0.5.1")
         implementation("com.facebook.soloader:soloader:0.10.5")
         implementation("com.facebook.yoga:proguard-annotations:1.19.0")
         implementation("androidx.annotation:annotation:1.3.0")

diff --git a/packages/react-native/template/android/build.gradle b/packages/react-native/template/android/build.gradle
@@ -6,9 +6,7 @@ buildscript {
         minSdkVersion = 21
         compileSdkVersion = 33
         targetSdkVersion = 33
-
-        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-        ndkVersion = "23.1.7779620"
+        ndkVersion = "25.1.8937393"
         kotlinVersion = "1.8.0"
     }
     repositories {