Facebook/react-native
1
0
Fork 0
mirror of https://github.com/facebook/react-native.git synced 2025-11-01 09:14:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Gradle 6.9, Android Gradle Plugin 4.2.1 (#31593)"

Browse Source 
This reverts commit 7599593b30.
This commit is contained in:
Lorenzo Sciandra
2021-06-16 16:37:46 +01:00
parent 5556968645
commit a10a20105b
12 changed files with 23 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ReactAndroid/build.gradle
+4
View File
@@ -385,6 +385,10 @@ task installArchives {
android {
compileSdkVersion 30
ndkVersion ANDROID_NDK_VERSION
compileOptions {
sourceCompatibility(JavaVersion.VERSION_1_8)
targetCompatibility(JavaVersion.VERSION_1_8)
}
defaultConfig {
minSdkVersion(21)
build.gradle.kts
+2 -2
View File
@@ -12,8 +12,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:4.2.1")
classpath("de.undercouch:gradle-download-task:4.1.1")
classpath("com.android.tools.build:gradle:4.1.0")
classpath("de.undercouch:gradle-download-task:4.0.2")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
gradle.properties
-1
View File
@@ -5,4 +5,3 @@ org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2048m -XX:+HeapDumpOnOutOfMemoryError
org.gradle.parallel=true
ANDROID_NDK_VERSION=20.1.5948944
android.useAndroidX=true
gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
packages/react-native-codegen/android/build.gradle
+1 -1
View File
@@ -14,7 +14,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:4.2.1")
classpath("com.android.tools.build:gradle:4.1.0")
}
}
packages/react-native-codegen/android/gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
packages/react-native-codegen/android/gradlePlugin-build/gradlePlugin/build.gradle
+1 -1
View File
@@ -19,7 +19,7 @@ gradlePlugin {
}
dependencies {
implementation 'com.android.tools.build:gradle:4.2.1'
implementation 'com.android.tools.build:gradle:4.1.0'
// Use the same Gson version that `com.android.tools.build:gradle` depends on.
implementation 'com.google.code.gson:gson:2.8.5'
implementation 'com.google.guava:guava:29.0-jre'
packages/react-native-gradle-plugin/build.gradle.kts
+2 -2
View File
@@ -8,7 +8,7 @@
plugins {
`java-gradle-plugin`
`kotlin-dsl`
kotlin("jvm") version "1.4.20"
kotlin("jvm") version "1.4.21"
}
repositories {
@@ -26,5 +26,5 @@ gradlePlugin {
}
dependencies {
implementation("com.android.tools.build:gradle:4.2.1")
implementation("com.android.tools.build:gradle:4.1.0")
}
packages/rn-tester/android/app/build.gradle
+4 -1
View File
@@ -131,7 +131,10 @@ def useIntlJsc = false
android {
compileSdkVersion 29
ndkVersion ANDROID_NDK_VERSION
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
dexOptions {
javaMaxHeapSize "4g"
}
template/android/app/build.gradle
+5
View File
@@ -125,6 +125,11 @@ android {
compileSdkVersion rootProject.ext.compileSdkVersion
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
defaultConfig {
applicationId "com.helloworld"
minSdkVersion rootProject.ext.minSdkVersion
template/android/build.gradle
+1 -1
View File
@@ -13,7 +13,7 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("com.android.tools.build:gradle:4.2.1")
classpath("com.android.tools.build:gradle:4.1.0")
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
template/android/gradle/wrapper/gradle-wrapper.properties
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.9-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists