[LOCAL] Fix broken build of RNGP due to complex cherry-pick

facebook · Jul 29, 2024 · 51156fd · 51156fd
1 parent c8cb3d4
commit 51156fd
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 0 deletions.
diff --git 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
@@ -50,6 +50,7 @@ dependencies {
   implementation(libs.javapoet)
 
   testImplementation(libs.junit)
+  testImplementation(libs.assertj)
   testImplementation(project(":shared-testutil"))
 
   testRuntimeOnly(

diff --git a/...ain/kotlin/com/facebook/react/utils/Os.kt → ...ain/kotlin/com/facebook/react/utils/Os.kt b/...ain/kotlin/com/facebook/react/utils/Os.kt → ...ain/kotlin/com/facebook/react/utils/Os.kt
diff --git a/...lin/com/facebook/react/utils/TaskUtils.kt → ...lin/com/facebook/react/utils/TaskUtils.kt b/...lin/com/facebook/react/utils/TaskUtils.kt → ...lin/com/facebook/react/utils/TaskUtils.kt