AGP to 8.2.1 (facebook#37019)

Summary:
Pull Request resolved: facebook#37019

This bumps the version of AGP to the latest stable.
There was a breaking change in how buildConfig are built which I had to handle.
This also requires a bump of RNGP to work correctly.
Moreover, we now required Java 17 to build Android apps (as that's a AGP requirement).

Changelog:
[Android] [Changed] - Java to 17 and AGP to 8.0.2

Reviewed By: cipolleschi

Differential Revision: D45178748

fbshipit-source-id: 0f302e1f2f2ee56bd3566202fbb5ef67c9b220db

Author: cortinico

.circleci/Dockerfiles/Dockerfile.android

@@ -14,23 +14,19 @@
 # and build a Android application that can be used to run the
 # tests specified in the scripts/ directory.
 #
-FROM reactnativecommunity/react-native-android:7.0
+FROM reactnativecommunity/react-native-android:9.0
 
 LABEL Description="React Native Android Test Image"
-LABEL maintainer="Héctor Ramos <hector@fb.com>"
+LABEL maintainer="Meta Open Source <opensource@meta.com>"
 
 # set default environment variables
 ENV GRADLE_OPTS="-Dorg.gradle.daemon=false -Dfile.encoding=utf-8 -Dorg.gradle.jvmargs=\"-Xmx512m -XX:+HeapDumpOnOutOfMemoryError\""
 ENV KOTLIN_HOME="packages/react-native/third-party/kotlin"
 
-ADD .buckconfig /app/.buckconfig
-ADD .buckjavaargs /app/.buckjavaargs
-ADD BUCK /app/BUCK
 ADD packages/react-native/Libraries /app/packages/react-native/Libraries
 ADD packages/react-native/ReactAndroid /app/packages/react-native/ReactAndroid
 ADD packages/react-native/ReactCommon /app/packages/react-native/ReactCommon
 ADD packages/react-native/React /app/packages/react-native/React
-ADD keystores /app/keystores
 ADD packages/react-native-codegen /app/packages/react-native-codegen
 ADD tools /app/tools
 ADD scripts /app/scripts

.circleci/config.yml

@@ -653,6 +653,7 @@ android {
     buildFeatures {
         prefab true
         prefabPublishing !skipPrefabPublishing
+        buildConfig true
     }
 
     prefab {
@@ -813,6 +814,8 @@ react {
 }
 
 kotlin {
+    // We intentionally don't build on JDK 17 as our tests are broken due to Mockito/PowerMock
+    // not running well on JDK 17.
     jvmToolchain(11)
 }
 

ReactAndroid/build.gradle

@@ -32,3 +32,7 @@ LIBEVENT_VERSION=2.1.12
 
 android.useAndroidX=true
 android.enableJetifier=true
+
+# We want to have more fine grained control on the Java version for
+# ReactAndroid, therefore we disable RGNP Java version alignment mechanism
+react.internal.disableJavaVersionAlignment=true

ReactAndroid/gradle.properties

@@ -227,10 +227,6 @@ android {
         targetCompatibility = JavaVersion.VERSION_11
     }
 
-    kotlin {
-        jvmToolchain(11)
-    }
-
     sourceSets {
         main {
             manifest.srcFile "$hermesDir/android/hermes/src/main/AndroidManifest.xml"

ReactAndroid/hermes-engine/build.gradle

@@ -11,8 +11,8 @@
 // their settings.gradle.kts file.
 // More on this here: https://reactnative.dev/contributing/how-to-build-from-source
 plugins {
-  id("com.android.library") version "7.4.2" apply false
-  id("com.android.application") version "7.4.2" apply false
+  id("com.android.library") version "8.2.1" apply false
+  id("com.android.application") version "8.2.1" apply false
   id("de.undercouch.download") version "5.0.1" apply false
   kotlin("android") version "1.8.22" apply false
 }

build.gradle.kts

@@ -1,6 +1,7 @@
+#Sat Jan 13 16:13:20 PST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -37,7 +37,7 @@ dependencies {
   // The KGP/AGP version is defined by React Native Gradle plugin.
   // Therefore we specify an implementation dep rather than a compileOnly.
   implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.22")
-  implementation("com.android.tools.build:gradle:7.4.2")
+  implementation("com.android.tools.build:gradle:8.2.1")
 
   implementation("com.google.code.gson:gson:2.8.9")
   implementation("com.google.guava:guava:31.0.1-jre")
@@ -55,11 +55,14 @@ dependencies {
 }
 
 java {
+  // We intentionally don't build for Java 17 as users will see a cryptic bytecode version
+  // error first. Instead we produce a Java 11-compatible Gradle Plugin, so that AGP can print their
+  // nice message showing that JDK 11 (or 17) is required first
   sourceCompatibility = JavaVersion.VERSION_11
   targetCompatibility = JavaVersion.VERSION_11
 }
 
-kotlin { jvmToolchain(11) }
+kotlin { jvmToolchain(17) }
 
 tasks.withType<KotlinCompile> {
   kotlinOptions {

packages/react-native-gradle-plugin/build.gradle.kts

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties

@@ -86,13 +86,13 @@ class ReactPlugin : Plugin<Project> {
 
   private fun checkJvmVersion(project: Project) {
     val jvmVersion = Jvm.current()?.javaVersion?.majorVersion
-    if ((jvmVersion?.toIntOrNull() ?: 0) <= 8) {
+    if ((jvmVersion?.toIntOrNull() ?: 0) <= 16) {
       project.logger.error(
           """
 
       ********************************************************************************
 
-      ERROR: requires JDK11 or higher.
+      ERROR: requires JDK17 or higher.
       Incompatible major version detected: '$jvmVersion'
 
       ********************************************************************************