diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt index f0bda7737beabb..3818e4085ab820 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenArtifactsTask.kt @@ -8,7 +8,7 @@ package com.facebook.react.tasks import com.facebook.react.codegen.generator.JavaGenerator -import com.facebook.react.utils.windowsAwareYarn +import com.facebook.react.utils.windowsAwareCommandLine import org.gradle.api.GradleException import org.gradle.api.file.Directory import org.gradle.api.file.DirectoryProperty @@ -93,7 +93,7 @@ abstract class GenerateCodegenArtifactsTask : Exec() { internal fun setupCommandLine() { commandLine( - windowsAwareYarn( + windowsAwareCommandLine( *nodeExecutableAndArgs.get().toTypedArray(), reactNativeDir.file("scripts/generate-specs-cli.js").get().asFile.absolutePath, "--platform", diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt index ee59bc987cb122..dea2d8e7dfc0bd 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/tasks/GenerateCodegenSchemaTask.kt @@ -7,7 +7,7 @@ package com.facebook.react.tasks -import com.facebook.react.utils.windowsAwareYarn +import com.facebook.react.utils.windowsAwareCommandLine import org.gradle.api.file.DirectoryProperty import org.gradle.api.file.RegularFile import org.gradle.api.provider.ListProperty @@ -49,7 +49,7 @@ abstract class GenerateCodegenSchemaTask : Exec() { internal fun setupCommandLine() { commandLine( - windowsAwareYarn( + windowsAwareCommandLine( *nodeExecutableAndArgs.get().toTypedArray(), codegenDir .file("lib/cli/combine/combine-js-to-schema-cli.js") diff --git a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt index 235d92486deb62..fd557079f59dd5 100644 --- a/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt +++ b/packages/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt @@ -14,13 +14,6 @@ internal fun windowsAwareCommandLine(vararg args: Any): List = args.toList() } -internal fun windowsAwareYarn(vararg args: Any): List = - if (Os.isWindows()) { - listOf("yarn.cmd") + args - } else { - listOf("yarn") + args - } - internal fun windowsAwareBashCommandLine( vararg args: String, bashWindowsHome: String? = null diff --git a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/TaskUtilsTest.kt b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/TaskUtilsTest.kt index 11874321102e0f..8156ef029e7174 100644 --- a/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/TaskUtilsTest.kt +++ b/packages/react-native-gradle-plugin/src/test/kotlin/com/facebook/react/utils/TaskUtilsTest.kt @@ -42,24 +42,6 @@ class TaskUtilsTest { assertEquals(listOf("cmd", "/c", "a", "b", "c"), windowsAwareCommandLine("a", "b", "c")) } - @Test - @WithOs(OS.MAC) - fun windowsAwareYarn_onMac_returnsTheList() { - assertEquals(listOf("yarn", "a", "b", "c"), windowsAwareYarn("a", "b", "c")) - } - - @Test - @WithOs(OS.UNIX) - fun windowsAwareYarn_onLinux_returnsTheList() { - assertEquals(listOf("yarn", "a", "b", "c"), windowsAwareYarn("a", "b", "c")) - } - - @Test - @WithOs(OS.WIN) - fun windowsAwareYarn_onWindows_prependsCmd() { - assertEquals(listOf("yarn.cmd", "a", "b", "c"), windowsAwareYarn("a", "b", "c")) - } - @Test @WithOs(OS.MAC) fun windowsAwareBashCommandLine_onMac_returnsTheList() {