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() - .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 { } 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/tasks/BundleHermesCTask.kt b/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt index 78e5a9b..e0a5f8e 100644 --- a/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt +++ b/node_modules/@react-native/gradle-plugin/src/main/kotlin/com/facebook/react/tasks/BundleHermesCTask.kt @@ -12,6 +12,7 @@ import com.facebook.react.utils.detectOSAwareHermesCommand import com.facebook.react.utils.moveTo import com.facebook.react.utils.windowsAwareCommandLine import java.io.File +import javax.inject.Inject import org.gradle.api.DefaultTask import org.gradle.api.file.ConfigurableFileTree import org.gradle.api.file.DirectoryProperty @@ -19,6 +20,7 @@ import org.gradle.api.file.RegularFileProperty import org.gradle.api.provider.ListProperty import org.gradle.api.provider.Property import org.gradle.api.tasks.* +import org.gradle.process.ExecOperations abstract class BundleHermesCTask : DefaultTask() { @@ -26,6 +28,8 @@ abstract class BundleHermesCTask : DefaultTask() { group = "react" } + @get:Inject abstract val execOperations: ExecOperations + @get:Internal abstract val root: DirectoryProperty @get:InputFiles @@ -127,9 +131,9 @@ abstract class BundleHermesCTask : DefaultTask() { File(jsIntermediateSourceMapsDir.get().asFile, "$bundleAssetName.compiler.map") private fun runCommand(command: List) { - project.exec { - it.workingDir(root.get().asFile) - it.commandLine(command) + execOperations.exec { exec -> + exec.workingDir(root.get().asFile) + exec.commandLine(command) } } 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) } } }