67 lines
3.1 KiB
Diff
67 lines
3.1 KiB
Diff
diff --git a/node_modules/@react-native/gradle-plugin/build.gradle.kts b/node_modules/@react-native/gradle-plugin/build.gradle.kts
|
|
index 6e09a3e..a4db70d 100644
|
|
--- a/node_modules/@react-native/gradle-plugin/build.gradle.kts
|
|
+++ b/node_modules/@react-native/gradle-plugin/build.gradle.kts
|
|
@@ -7,7 +7,6 @@
|
|
|
|
import org.gradle.api.internal.classpath.ModuleRegistry
|
|
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
|
|
-import org.gradle.configurationcache.extensions.serviceOf
|
|
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
|
|
|
|
plugins {
|
|
@@ -48,14 +47,6 @@ dependencies {
|
|
implementation(libs.javapoet)
|
|
|
|
testImplementation(libs.junit)
|
|
-
|
|
- testRuntimeOnly(
|
|
- files(
|
|
- serviceOf<ModuleRegistry>()
|
|
- .getModule("gradle-tooling-api-builders")
|
|
- .classpath
|
|
- .asFiles
|
|
- .first()))
|
|
}
|
|
|
|
// We intentionally don't build for Java 17 as users will see a cryptic bytecode version
|
|
diff --git a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt b/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
|
|
index 2c5bea4..67a396a 100644
|
|
--- a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
|
|
+++ b/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/ReactPlugin.kt
|
|
@@ -90,7 +90,7 @@ class ReactPlugin : Plugin<Project> {
|
|
}
|
|
|
|
private fun checkJvmVersion(project: Project) {
|
|
- val jvmVersion = Jvm.current()?.javaVersion?.majorVersion
|
|
+ val jvmVersion = Jvm.current().javaVersion?.majorVersion
|
|
if ((jvmVersion?.toIntOrNull() ?: 0) <= 16) {
|
|
project.logger.error(
|
|
"""
|
|
diff --git a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt b/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt
|
|
index 0d55714..e59e9d5 100644
|
|
--- a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/utils/JdkConfiguratorUtils.kt
|
|
+++ b/node_modules/@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)
|
|
}
|
|
}
|
|
}
|