Skip to content

Commit 272cfe5

Browse files
dulmandakhfacebook-github-bot
authored andcommitted
draft: bump AGP to 7 (#32589)
Summary: Bump Android Gradle Plugin to 7. ## Changelog [Android] [Changed] - Bump Android Gradle Plugin to 7. This will make Java 11 a requirement for users that are either: * Cloning react-native to contribute * Using react-native while building from source. * Creating new project from the template. Pull Request resolved: #32589 Test Plan: CI is green Reviewed By: ShikaSD Differential Revision: D32427945 Pulled By: cortinico fbshipit-source-id: c1ea464d87c3e397616c55154b3d8b1c3ea6c592
1 parent c10dc49 commit 272cfe5

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

ReactAndroid/build.gradle

+6
Original file line numberDiff line numberDiff line change
@@ -410,6 +410,12 @@ react {
410410
}
411411

412412
afterEvaluate {
413+
414+
// Needed as some of the native sources needs to be downloaded
415+
// before configureNdkBuildDebug could be executed.
416+
configureNdkBuildDebug.dependsOn(preBuild)
417+
configureNdkBuildRelease.dependsOn(preBuild)
418+
413419
publishing {
414420
publications {
415421
release(MavenPublication) {

build.gradle.kts

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ buildscript {
1212
}
1313
dependencies {
1414
val kotlin_version: String by project
15-
classpath("com.android.tools.build:gradle:4.2.2")
15+
classpath("com.android.tools.build:gradle:7.0.1")
1616
classpath("de.undercouch:gradle-download-task:4.1.1")
1717
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version")
1818
// NOTE: Do not place your application dependencies here; they belong

packages/rn-tester/android/app/build.gradle

+4-5
Original file line numberDiff line numberDiff line change
@@ -150,9 +150,6 @@ android {
150150
ndkPath project.property("ANDROID_NDK_PATH")
151151
}
152152

153-
dexOptions {
154-
javaMaxHeapSize "4g"
155-
}
156153
flavorDimensions "vm"
157154
productFlavors {
158155
hermes {
@@ -291,14 +288,14 @@ if (enableCodegen) {
291288
def packageReactDebugNdkLibs = tasks.register("packageReactDebugNdkLibs", Copy) {
292289
// TODO: handle extracting .so from prebuilt :ReactAndroid.
293290
dependsOn(":ReactAndroid:packageReactNdkDebugLibsForBuck")
294-
dependsOn("generateCodegenSchemaFromJavaScript")
291+
dependsOn("generateCodegenArtifactsFromSchema")
295292
from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
296293
into("$buildDir/react-ndk/exported")
297294
}
298295
def packageReactReleaseNdkLibs = tasks.register("packageReactReleaseNdkLibs", Copy) {
299296
// TODO: handle extracting .so from prebuilt :ReactAndroid.
300297
dependsOn(":ReactAndroid:packageReactNdkReleaseLibsForBuck")
301-
dependsOn("generateCodegenSchemaFromJavaScript")
298+
dependsOn("generateCodegenArtifactsFromSchema")
302299
from("$reactAndroidProjectDir/src/main/jni/prebuilt/lib")
303300
into("$buildDir/react-ndk/exported")
304301
}
@@ -317,8 +314,10 @@ if (enableCodegen) {
317314
}
318315

319316
afterEvaluate {
317+
configureNdkBuildRelease.dependsOn(packageReactReleaseNdkLibs)
320318
preHermesReleaseBuild.dependsOn(packageReactReleaseNdkLibs)
321319
preJscReleaseBuild.dependsOn(packageReactReleaseNdkLibs)
320+
configureNdkBuildDebug.dependsOn(packageReactDebugNdkLibs)
322321
preHermesDebugBuild.dependsOn(packageReactDebugNdkLibs)
323322
preJscDebugBuild.dependsOn(packageReactDebugNdkLibs)
324323
clean.dependsOn(cleanProjectNdkBuild)

template/android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ buildscript {
1313
mavenCentral()
1414
}
1515
dependencies {
16-
classpath("com.android.tools.build:gradle:4.2.2")
16+
classpath("com.android.tools.build:gradle:7.0.1")
1717
// NOTE: Do not place your application dependencies here; they belong
1818
// in the individual module build.gradle files
1919
}

0 commit comments

Comments
 (0)