bump react-native-test-app for TurboModule support

tido64 · tido64 · commit 2b38af4b313b · 2022-07-22T22:07:24.000+02:00
diff --git a/android/build.gradle b/android/build.gradle
@@ -42,12 +42,13 @@ buildscript {
             : '1.6.10'
 
     repositories {
-        google()
         mavenCentral()
+        google()
     }
     dependencies {
-        if (project == rootProject) {
-            classpath 'com.android.tools.build:gradle:4.2.2'
+        def projectExampleDir = Paths.get(project.projectDir.getParent(), "example", "android").toString()
+        def rootProjectDir = rootProject.projectDir.getPath()
+        if (projectExampleDir == rootProjectDir) {
             classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$asyncStorageKtVersion"
         }
     }
diff --git a/example/android/build.gradle b/example/android/build.gradle
@@ -38,15 +38,12 @@ buildscript {
     println("[AsyncStorage] Using Next storage: " + nextStorageFlag)
 
     repositories {
-        google()
         mavenCentral()
-        jcenter()
+        google()
     }
 
     dependencies {
         classpath "com.android.tools.build:gradle:$androidPluginVersion"
-        // kotlinVersion is applied from react-native-test-app's dependencies.gradle script
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
     }
 }
 
@@ -55,7 +52,8 @@ allprojects {
         maven {
             url("$rootDir/../../node_modules/detox/Detox-android")
         }
-        jcenter()
+        mavenCentral()
+        google()
     }
     afterEvaluate { project ->
         def androidExtension = project.extensions.findByName('android')
diff --git a/package.json b/package.json
@@ -87,7 +87,7 @@
     "react-native": "^0.68.0-0",
     "react-native-builder-bob": "^0.18.0",
     "react-native-macos": "^0.68.0-0",
-    "react-native-test-app": "^1.4.6",
+    "react-native-test-app": "^1.5.0",
     "react-native-web": "^0.17.0",
     "react-native-windows": "^0.68.0-0",
     "react-test-renderer": "17.0.2",
diff --git a/yarn.lock b/yarn.lock
@@ -9882,10 +9882,10 @@ react-native-macos@^0.68.0-0:
     whatwg-fetch "^3.0.0"
     ws "^6.1.4"
 
-react-native-test-app@^1.4.6:
-  version "1.4.6"
-  resolved "https://registry.yarnpkg.com/react-native-test-app/-/react-native-test-app-1.4.6.tgz#2087d453771676ed499c2a203eb6c867a84a6c1b"
-  integrity sha512-YOR/kQ1etMNc6/+DhYXiZQIqIz8Oox+5QvSuA+t8W0DfuUfIQkcLmEVT/11Eq5x7jcEjZAfc0yIm5yU+mhOTJw==
+react-native-test-app@^1.5.0:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/react-native-test-app/-/react-native-test-app-1.5.0.tgz#a504a71246555234a18c02cab454d2a57950e914"
+  integrity sha512-Z+zJjnwnqE/H36aFRKLgjyjrCRanB2R5gN8j33VclBiw9tP6O3lC7iCEewJlKVyRkPzMDOdL0EM18hcx6snqsg==
   dependencies:
     ajv "^8.0.0"
     chalk "^4.1.0"

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,13 @@ buildscript {`
`42`	`42`	`: '1.6.10'`
`43`	`43`
`44`	`44`	`repositories {`
`45`		`- google()`
`46`	`45`	`mavenCentral()`
	`46`	`+ google()`
`47`	`47`	`}`
`48`	`48`	`dependencies {`
`49`		`- if (project == rootProject) {`
`50`		`- classpath 'com.android.tools.build:gradle:4.2.2'`
	`49`	`+ def projectExampleDir = Paths.get(project.projectDir.getParent(), "example", "android").toString()`
	`50`	`+ def rootProjectDir = rootProject.projectDir.getPath()`
	`51`	`+ if (projectExampleDir == rootProjectDir) {`
`51`	`52`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$asyncStorageKtVersion"`
`52`	`53`	`}`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,15 +38,12 @@ buildscript {`
`38`	`38`	`println("[AsyncStorage] Using Next storage: " + nextStorageFlag)`
`39`	`39`
`40`	`40`	`repositories {`
`41`		`- google()`
`42`	`41`	`mavenCentral()`
`43`		`- jcenter()`
	`42`	`+ google()`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`dependencies {`
`47`	`46`	`classpath "com.android.tools.build:gradle:$androidPluginVersion"`
`48`		`- // kotlinVersion is applied from react-native-test-app's dependencies.gradle script`
`49`		`- classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"`
`50`	`47`	`}`
`51`	`48`	`}`
`52`	`49`
`@@ -55,7 +52,8 @@ allprojects {`
`55`	`52`	`maven {`
`56`	`53`	`url("$rootDir/../../node_modules/detox/Detox-android")`
`57`	`54`	`}`
`58`		`- jcenter()`
	`55`	`+ mavenCentral()`
	`56`	`+ google()`
`59`	`57`	`}`
`60`	`58`	`afterEvaluate { project ->`
`61`	`59`	`def androidExtension = project.extensions.findByName('android')`