From 9ae3367431428748f5486c782199beb4f9c6b477 Mon Sep 17 00:00:00 2001 From: svbutko Date: Wed, 13 Oct 2021 06:00:42 -0700 Subject: [PATCH] Bump Kotlin and Gradle versions (#32319) Summary: Bump Kotlin version to 1.5.31 to include following changes: https://kotlinlang.org/docs/whatsnew15.html https://kotlinlang.org/docs/whatsnew1520.html https://kotlinlang.org/docs/whatsnew1530.html Primarily: - Native support for Apple silicon - Kotlin/JS IR backend reaches Beta - Improved Gradle plugin experience - Performance improvements ## Changelog [Android] [Changed] - Bump Kotlin version to 1.5.31 [Android] [Changed] - Bump Gradle version to 7.2 Pull Request resolved: https://github.com/facebook/react-native/pull/32319 Reviewed By: yungsters Differential Revision: D31365479 Pulled By: cortinico fbshipit-source-id: 1ffaef1222a6ada8ebc746267b2a22561c3c770f --- gradle.properties | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- packages/react-native-gradle-plugin/build.gradle.kts | 4 ++-- .../gradle/wrapper/gradle-wrapper.properties | 2 +- template/android/gradle/wrapper/gradle-wrapper.properties | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gradle.properties b/gradle.properties index 223dcfb79c2..4d0bece201b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,4 +6,4 @@ org.gradle.parallel=true ANDROID_NDK_VERSION=21.4.7075529 android.useAndroidX=true -kotlin_version=1.4.32 +kotlin_version=1.5.31 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index af7be50b101..a0f7639f7d3 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/packages/react-native-gradle-plugin/build.gradle.kts b/packages/react-native-gradle-plugin/build.gradle.kts index 88d9dc7774a..6320a994ad4 100644 --- a/packages/react-native-gradle-plugin/build.gradle.kts +++ b/packages/react-native-gradle-plugin/build.gradle.kts @@ -9,7 +9,7 @@ import org.gradle.api.internal.classpath.ModuleRegistry import org.gradle.configurationcache.extensions.serviceOf plugins { - kotlin("jvm") version "1.4.21" + kotlin("jvm") version "1.5.31" id("java-gradle-plugin") } @@ -30,7 +30,7 @@ gradlePlugin { dependencies { implementation(gradleApi()) implementation("com.android.tools.build:gradle:4.2.2") - + testImplementation("junit:junit:4.13.2") testRuntimeOnly( diff --git a/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties b/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties index af7be50b101..a0f7639f7d3 100644 --- a/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties +++ b/packages/react-native-gradle-plugin/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/template/android/gradle/wrapper/gradle-wrapper.properties b/template/android/gradle/wrapper/gradle-wrapper.properties index af7be50b101..a0f7639f7d3 100644 --- a/template/android/gradle/wrapper/gradle-wrapper.properties +++ b/template/android/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists