From d651f48d14c4a0903a4671a1a380a0f9bff0549e Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 13 Nov 2021 08:48:59 +0800 Subject: [PATCH 1/5] bump AGP to 7 --- build.gradle.kts | 2 +- packages/react-native-gradle-plugin/build.gradle.kts | 2 +- template/android/build.gradle | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index dbe8e69b2d61..cab3029de00f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -12,7 +12,7 @@ buildscript { } dependencies { val kotlin_version: String by project - classpath("com.android.tools.build:gradle:4.2.2") + classpath("com.android.tools.build:gradle:7.0.1") classpath("de.undercouch:gradle-download-task:4.1.1") classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version") // NOTE: Do not place your application dependencies here; they belong diff --git a/packages/react-native-gradle-plugin/build.gradle.kts b/packages/react-native-gradle-plugin/build.gradle.kts index 6320a994ad40..67202a8685d6 100644 --- a/packages/react-native-gradle-plugin/build.gradle.kts +++ b/packages/react-native-gradle-plugin/build.gradle.kts @@ -29,7 +29,7 @@ gradlePlugin { dependencies { implementation(gradleApi()) - implementation("com.android.tools.build:gradle:4.2.2") + implementation("com.android.tools.build:gradle:7.0.1") testImplementation("junit:junit:4.13.2") diff --git a/template/android/build.gradle b/template/android/build.gradle index 3be1031fb223..ca9477e6581f 100644 --- a/template/android/build.gradle +++ b/template/android/build.gradle @@ -13,7 +13,7 @@ buildscript { mavenCentral() } dependencies { - classpath("com.android.tools.build:gradle:4.2.2") + classpath("com.android.tools.build:gradle:7.0.1") // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } From 132806d27aef5b896a377f2fe5860e5fc66fc565 Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Sat, 13 Nov 2021 08:55:45 +0800 Subject: [PATCH 2/5] downgrade AGP in gradle plugin to 4.x --- packages/react-native-gradle-plugin/build.gradle.kts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/react-native-gradle-plugin/build.gradle.kts b/packages/react-native-gradle-plugin/build.gradle.kts index 67202a8685d6..6320a994ad40 100644 --- a/packages/react-native-gradle-plugin/build.gradle.kts +++ b/packages/react-native-gradle-plugin/build.gradle.kts @@ -29,7 +29,7 @@ gradlePlugin { dependencies { implementation(gradleApi()) - implementation("com.android.tools.build:gradle:7.0.1") + implementation("com.android.tools.build:gradle:4.2.2") testImplementation("junit:junit:4.13.2") From 786dfacc8ba987c4aaee24eb28719c3c02bb8eff Mon Sep 17 00:00:00 2001 From: Dulmandakh Date: Tue, 16 Nov 2021 21:44:00 +0800 Subject: [PATCH 3/5] remove deprecated dexOptions --- packages/rn-tester/android/app/build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle index a2de00ba8fec..885e9a735457 100644 --- a/packages/rn-tester/android/app/build.gradle +++ b/packages/rn-tester/android/app/build.gradle @@ -149,9 +149,6 @@ android { ndkPath project.property("ANDROID_NDK_PATH") } - dexOptions { - javaMaxHeapSize "4g" - } flavorDimensions "vm" productFlavors { hermes { From c71946de3b7b8edb9826e8de9ec3ebd82b916f79 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Fri, 19 Nov 2021 13:04:26 +0000 Subject: [PATCH 4/5] Let configureNdkBuildDebug depend on preBuild --- ReactAndroid/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ReactAndroid/build.gradle b/ReactAndroid/build.gradle index 47ca5dfc72bd..0d9230502570 100644 --- a/ReactAndroid/build.gradle +++ b/ReactAndroid/build.gradle @@ -400,6 +400,12 @@ react { } afterEvaluate { + + // Needed as some of the native sources needs to be downloaded + // before configureNdkBuildDebug could be executed. + configureNdkBuildDebug.dependsOn(preBuild) + configureNdkBuildRelease.dependsOn(preBuild) + publishing { publications { release(MavenPublication) { From 97e52b116bec055e78517f11a622484d41dfeb08 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Mon, 22 Nov 2021 10:23:28 +0000 Subject: [PATCH 5/5] configureNdkBuildDebug depends on packageReactReleaseNdkLibs for RNTester --- packages/rn-tester/android/app/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/rn-tester/android/app/build.gradle b/packages/rn-tester/android/app/build.gradle index 885e9a735457..0c7987d45d91 100644 --- a/packages/rn-tester/android/app/build.gradle +++ b/packages/rn-tester/android/app/build.gradle @@ -313,6 +313,8 @@ if (enableCodegen) { } afterEvaluate { + configureNdkBuildDebug.dependsOn(packageReactReleaseNdkLibs) + configureNdkBuildRelease.dependsOn(packageReactReleaseNdkLibs) preHermesReleaseBuild.dependsOn(packageReactReleaseNdkLibs) preJscReleaseBuild.dependsOn(packageReactReleaseNdkLibs) preHermesDebugBuild.dependsOn(packageReactDebugNdkLibs)