From 63fdc048880ccb4e6d88825e7081772efcb44dc6 Mon Sep 17 00:00:00 2001 From: Nicola Corti Date: Wed, 12 Mar 2025 10:10:46 -0700 Subject: [PATCH] RNGP - Better compatibility with Kotlin 2.1.x (#49977) Summary: Pull Request resolved: https://github.com/facebook/react-native/pull/49977 See: https://github.com/facebook/react-native/issues/48274 This makes our integration with Kotlin 2.1.x easier. Changelog: [Android] [Changed] - Better compatibility with Kotlin 2.1.x Reviewed By: cipolleschi Differential Revision: D71034044 fbshipit-source-id: 9a26ed28ae4770a5c05a4113f4d86c1b97063db3 --- .../kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt index 0d557148eb8..e59e9d5b684 100644 --- a/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt +++ b/packages/gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt @@ -13,7 +13,7 @@ import org.gradle.api.Action import org.gradle.api.JavaVersion import org.gradle.api.Project import org.gradle.api.plugins.AppliedPlugin -import org.jetbrains.kotlin.gradle.dsl.KotlinTopLevelExtension +import org.jetbrains.kotlin.gradle.dsl.kotlinExtension internal object JdkConfiguratorUtils { /** @@ -42,10 +42,10 @@ internal object JdkConfiguratorUtils { project.pluginManager.withPlugin("com.android.application", action) project.pluginManager.withPlugin("com.android.library", action) project.pluginManager.withPlugin("org.jetbrains.kotlin.android") { - project.extensions.getByType(KotlinTopLevelExtension::class.java).jvmToolchain(17) + project.kotlinExtension.jvmToolchain(17) } project.pluginManager.withPlugin("org.jetbrains.kotlin.jvm") { - project.extensions.getByType(KotlinTopLevelExtension::class.java).jvmToolchain(17) + project.kotlinExtension.jvmToolchain(17) } } }