React Native 70 compliance - Detox demo projects (#3939)

wix · Feb 16, 2023 · 4914dcf · 4914dcf
1 parent e04bb14
commit 4914dcf
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 14 deletions.
diff --git a/.../jobs/pipeline.android_demo_app_rn_69.yml → .../jobs/pipeline.android_demo_app_rn_70.yml b/.../jobs/pipeline.android_demo_app_rn_69.yml → .../jobs/pipeline.android_demo_app_rn_70.yml
@@ -1,9 +1,9 @@
-  - label: ":android::react: RN.69 + Android: Demo app"
+  - label: ":android::react: RN .70 + Android: Demo app"
     command:
       - "nvm install"
       - "./scripts/demo-projects.android.sh"
     env:
-      REACT_NATIVE_VERSION: 0.69.7
+      REACT_NATIVE_VERSION: 0.70.7
       DETOX_DISABLE_POD_INSTALL: true
       DETOX_DISABLE_POSTINSTALL: true
     artifact_paths:

diff --git a/...kite/jobs/pipeline.ios_demo_app_rn_69.yml → ...kite/jobs/pipeline.ios_demo_app_rn_70.yml b/...kite/jobs/pipeline.ios_demo_app_rn_69.yml → ...kite/jobs/pipeline.ios_demo_app_rn_70.yml
@@ -1,9 +1,9 @@
-  - label: ":ios::react: RN.69 + iOS: Demo app"
+  - label: ":ios::react: RN. 70 + iOS: Demo app"
     command:
       - "nvm install"
       - "./scripts/demo-projects.ios.sh"
     env:
-      REACT_NATIVE_VERSION: 0.69.7
+      REACT_NATIVE_VERSION: 0.70.7
     artifact_paths:
       - "/Users/builder/work/coverage/**/*.lcov"
       - "/Users/builder/work/artifacts*.tar.gz"
diff --git a/.buildkite/pipeline_common.sh b/.buildkite/pipeline_common.sh
@@ -7,7 +7,7 @@ cat .buildkite/jobs/pipeline.ios_rn_70.yml
 cat .buildkite/jobs/pipeline.android_rn_68.yml
 cat .buildkite/jobs/pipeline.android_rn_70.yml
 cat .buildkite/jobs/pipeline.android_demo_app_rn_68.yml
-cat .buildkite/jobs/pipeline.android_demo_app_rn_69.yml
+cat .buildkite/jobs/pipeline.android_demo_app_rn_70.yml
 cat .buildkite/jobs/pipeline.ios_demo_app_rn_68.yml
-cat .buildkite/jobs/pipeline.ios_demo_app_rn_69.yml
+cat .buildkite/jobs/pipeline.ios_demo_app_rn_70.yml
 cat .buildkite/pipeline.post_processing.yml
diff --git a/detox/android/build.gradle b/detox/android/build.gradle
@@ -23,7 +23,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.1'
+        classpath 'com.android.tools.build:gradle:7.2.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokkaVersion"
 

diff --git a/detox/android/gradle/wrapper/gradle-wrapper.properties b/detox/android/gradle/wrapper/gradle-wrapper.properties
@@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
 
diff --git a/detox/test/ios/Podfile b/detox/test/ios/Podfile
@@ -4,8 +4,6 @@ require_relative '../node_modules/@react-native-community/cli-platform-ios/nativ
 platform :ios, '12.4'
 install! 'cocoapods', :deterministic_uuids => false
 
-production = ENV["PRODUCTION"] == "1"
-
 def shared_pods
   config = use_native_modules!
 

diff --git a/examples/demo-react-native/ios/Podfile b/examples/demo-react-native/ios/Podfile
@@ -13,7 +13,15 @@ target 'example' do
   )
 
   post_install do |installer|
-    react_native_post_install(installer)
+      if ENV["REACT_NATIVE_VERSION"] && ENV["REACT_NATIVE_VERSION"].match(/0.6[6,7,8,9].*/)
+        react_native_post_install(installer)
+      else
+        react_native_post_install(
+          installer,
+            # Set `mac_catalyst_enabled` to `true` in order to apply patches
+            # necessary for Mac Catalyst builds
+            :mac_catalyst_enabled => false
+        )
+      end
   end
 end
-
diff --git a/examples/demo-react-native/package.json b/examples/demo-react-native/package.json
@@ -23,8 +23,8 @@
   },
   "dependencies": {
     "@react-native-async-storage/async-storage": "^1.17.3",
-    "react": "18.0.0",
-    "react-native": "0.69.7",
+    "react": "18.1.0",
+    "react-native": "0.70.7",
     "tslib": "^2.0.3"
   },
   "devDependencies": {