From 51156fd3b2f371e598b3da284a4b1dec45c93cc8 Mon Sep 17 00:00:00 2001
From: Nicola Corti <ncor@meta.com>
Date: Mon, 29 Jul 2024 15:40:56 +0100
Subject: [PATCH] [LOCAL] Fix broken build of RNGP due to complex cherry-pick

---
 packages/react-native-gradle-plugin/gradle/libs.versions.toml   | 2 ++
 .../react-native-gradle-plugin/build.gradle.kts                 | 1 +
 .../src/main/kotlin/com/facebook/react/utils/Os.kt              | 0
 .../src/main/kotlin/com/facebook/react/utils/TaskUtils.kt       | 0
 4 files changed, 3 insertions(+)
 rename packages/react-native-gradle-plugin/{react-native-gradle-plugin => shared}/src/main/kotlin/com/facebook/react/utils/Os.kt (100%)
 rename packages/react-native-gradle-plugin/{react-native-gradle-plugin => shared}/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt (100%)

diff --git a/packages/react-native-gradle-plugin/gradle/libs.versions.toml b/packages/react-native-gradle-plugin/gradle/libs.versions.toml
index c00785f5f9b7eb..026a9276e01912 100644
--- a/packages/react-native-gradle-plugin/gradle/libs.versions.toml
+++ b/packages/react-native-gradle-plugin/gradle/libs.versions.toml
@@ -5,6 +5,7 @@ guava = "31.0.1-jre"
 javapoet = "1.13.0"
 junit = "4.13.2"
 kotlin = "1.9.24"
+assertj = "3.25.1"
 
 [libraries]
 kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -13,6 +14,7 @@ gson = { module = "com.google.code.gson:gson", version.ref = "gson" }
 guava = { module = "com.google.guava:guava", version.ref = "guava" }
 javapoet = { module = "com.squareup:javapoet", version.ref = "javapoet" }
 junit = {module = "junit:junit", version.ref = "junit" }
+assertj = { module = "org.assertj:assertj-core", version.ref = "assertj" }
 
 [plugins]
 kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
diff --git a/packages/react-native-gradle-plugin/react-native-gradle-plugin/build.gradle.kts b/packages/react-native-gradle-plugin/react-native-gradle-plugin/build.gradle.kts
index 344ac62ef259ff..8528900a50d9b5 100644
--- a/packages/react-native-gradle-plugin/react-native-gradle-plugin/build.gradle.kts
+++ b/packages/react-native-gradle-plugin/react-native-gradle-plugin/build.gradle.kts
@@ -50,6 +50,7 @@ dependencies {
   implementation(libs.javapoet)
 
   testImplementation(libs.junit)
+  testImplementation(libs.assertj)
   testImplementation(project(":shared-testutil"))
 
   testRuntimeOnly(
diff --git a/packages/react-native-gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/Os.kt b/packages/react-native-gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/Os.kt
similarity index 100%
rename from packages/react-native-gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/Os.kt
rename to packages/react-native-gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/Os.kt
diff --git a/packages/react-native-gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt b/packages/react-native-gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt
similarity index 100%
rename from packages/react-native-gradle-plugin/react-native-gradle-plugin/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt
rename to packages/react-native-gradle-plugin/shared/src/main/kotlin/com/facebook/react/utils/TaskUtils.kt