feat!: drop support for react-native 0.64, 0.65

tido64 · tido64 · commit bb335daf3df4 · 2023-10-24T16:04:58.000+02:00
BREAKING CHANGE: Dropped support for `react-native` 0.64, 0.65
diff --git a/ReactTestApp-DevSupport.podspec b/ReactTestApp-DevSupport.podspec
@@ -19,7 +19,7 @@ package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 version = package['version']
 
 Pod::Spec.new do |s|
-  s.name      = 'ReactTestApp-DevSupport'
+  s.name      = File.basename(__FILE__, '.podspec')
   s.version   = version
   s.author    = { package['author']['name'] => package['author']['email'] }
   s.license   = package['license']
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -45,21 +45,6 @@ repositories {
     mavenCentral()
     google()
 
-    // TODO: Remove this block when we drop support for 0.64.
-    if (reactNativeVersion > 0 && reactNativeVersion < v(0, 65, 0)) {
-        // Artifacts for 0.65+ are published to Maven Central. If we're on an
-        // older version, we still need to use JCenter.
-        // noinspection JcenterRepositoryObsolete
-        jcenter() {
-            content {
-                includeGroup("com.facebook.fbjni")
-                includeGroup("com.facebook.flipper")
-                includeGroup("com.facebook.fresco")
-                includeGroup("com.facebook.yoga")
-            }
-        }
-    }
-
     // https://github.com/AzureAD/microsoft-authentication-library-for-android#step-1-declare-dependency-on-msal
     maven {
         url = uri("https://pkgs.dev.azure.com/MicrosoftDeviceSDK/DuoSDK-Public/_packaging/Duo-SDK-Feed/maven/v1")
@@ -310,9 +295,6 @@ android {
             // TODO: Remove this block when we drop support for 0.67
             project.ext.react.enableFabric ? "src/fabric/java" : "src/no-fabric/java",
 
-            // TODO: Remove this block when we drop support for 0.65
-            enableNewArchitecture ? "src/turbomodule/java" : "src/no-turbomodule/java",
-
             // TODO: Remove this block when we drop support for 0.67
             // https://github.com/facebook/react-native/commit/ce74aa4ed335d4c36ce722d47937b582045e05c4
             reactNativeVersion > 0 && reactNativeVersion < v(0, 68, 0)
diff --git a/android/app/src/main/java/com/microsoft/reacttestapp/compat/ReactNativeHostCompat.kt b/android/app/src/main/java/com/microsoft/reacttestapp/compat/ReactNativeHostCompat.kt
diff --git a/android/app/src/main/java/com/microsoft/reacttestapp/fabric/ComponentsRegistry.kt b/android/app/src/main/java/com/microsoft/reacttestapp/fabric/ComponentsRegistry.kt
diff --git a/android/app/src/main/java/com/microsoft/reacttestapp/turbomodule/TurboModuleManagerDelegate.kt b/android/app/src/main/java/com/microsoft/reacttestapp/turbomodule/TurboModuleManagerDelegate.kt
diff --git a/android/app/src/no-turbomodule/java/com/microsoft/reacttestapp/compat/ReactNativeHostCompat.kt b/android/app/src/no-turbomodule/java/com/microsoft/reacttestapp/compat/ReactNativeHostCompat.kt
diff --git a/android/app/src/no-turbomodule/java/com/microsoft/reacttestapp/fabric/ComponentsRegistry.kt b/android/app/src/no-turbomodule/java/com/microsoft/reacttestapp/fabric/ComponentsRegistry.kt
diff --git a/android/dependencies.gradle b/android/dependencies.gradle
@@ -30,15 +30,9 @@ static String getKspVersion(String kotlinVersion) {
 ext {
     apply(from: "${buildscript.sourceFile.getParent()}/test-app-util.gradle")
 
-    reactNativeVersion = getPackageVersionNumber("react-native", rootDir)
-
     compileSdkVersion = 34
     minSdkVersion = 23
-
-    // A bug in an older version of OkHttp causes it to throw 'expected Android
-    // API level 21+ but was 33'.
-    // TODO: Remove when we drop support for 0.64
-    targetSdkVersion = reactNativeVersion > 0 && reactNativeVersion < v(0, 65, 0) ? 29 : 33
+    targetSdkVersion = 33
 
     /**
      * Returns the recommended Gradle plugin version for the specified React Native
@@ -70,6 +64,7 @@ ext {
         }
     }
 
+    reactNativeVersion = getPackageVersionNumber("react-native", rootDir)
     autodetectReactNativeVersion = reactNativeVersion == 0 || reactNativeVersion >= v(0, 71, 0)
     enableNewArchitecture = isNewArchitectureEnabled(project)
     usePrefabs = reactNativeVersion == 0 || reactNativeVersion >= v(0, 71, 0)
@@ -86,7 +81,7 @@ ext {
     } else if (System.properties["os.arch"] == "aarch64" && androidPluginVersion == "7.2.2") {
         // NDK r23c has been patched to support Apple M1 and is default in AGP
         // 7.3.0. Prior to 0.71, we still need to set `ndkVersion` because we'll
-        // be using AGP 7.2.2 (see `androidPluginVersion` below).
+        // be using AGP 7.2.2 (see `androidPluginVersion` above).
         // Note that even though newer 23.x versions exist, we'll stick to AGP's
         // default. See also
         // https://developer.android.com/studio/releases/gradle-plugin#compatibility-7-3-0
diff --git a/example/Example-Tests.podspec b/example/Example-Tests.podspec
@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join('..', 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name      = 'Example-Tests'
+  s.name      = File.basename(__FILE__, '.podspec')
   s.version   = package['version']
   s.author    = { package['author']['name'] => package['author']['email'] }
   s.license   = package['license']
diff --git a/example/ios/Podfile.lock b/example/ios/Podfile.lock
@@ -589,6 +589,6 @@ SPEC CHECKSUMS:
   SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17
   Yoga: b76f1acfda8212aa16b7e26bcce3983230c82603
 
-PODFILE CHECKSUM: a0a692acf4827473693e5d8de3ca917e2e2df417
+PODFILE CHECKSUM: 870582483dda68180ae1f996147f31dc3551ce31
 
 COCOAPODS: 1.13.0
diff --git a/example/package.json b/example/package.json
@@ -17,11 +17,12 @@
     "start": "react-native start",
     "windows": "react-native run-windows --no-packager"
   },
-  "peerDependencies": {
-    "react": "~17.0.1 || ~18.0.0 || ~18.1.0 || ~18.2.0",
-    "react-native": "^0.0.0-0 || 0.64 - 0.72 || 1000.0.0",
-    "react-native-macos": "^0.0.0-0 || 0.64 || 0.66 || 0.68 || 0.71 - 0.72",
-    "react-native-windows": "^0.0.0-0 || 0.64 - 0.72"
+  "dependencies": {
+    "react": "18.2.0",
+    "react-native": "^0.72.0",
+    "react-native-macos": "^0.72.0",
+    "react-native-safe-area-context": "^4.5.3",
+    "react-native-windows": "^0.72.0"
   },
   "devDependencies": {
     "@babel/core": "^7.1.6",
@@ -30,12 +31,7 @@
     "@types/react": "~18.2.0",
     "appium": "^2.0.0",
     "metro-react-native-babel-preset": "^0.76.8",
-    "react": "18.2.0",
-    "react-native": "^0.72.0",
-    "react-native-macos": "^0.72.0",
-    "react-native-safe-area-context": "^4.5.3",
     "react-native-test-app": "workspace:.",
-    "react-native-windows": "^0.72.0",
     "webdriverio": "^8.11.2"
   },
   "eslintConfig": {
@@ -68,6 +64,7 @@
         "navigation/stack",
         "netinfo",
         "popover",
+        "safe-area",
         "screens",
         "shimmer",
         "sqlite",
diff --git a/example/tsconfig.json b/example/tsconfig.json
@@ -5,7 +5,7 @@
     "jsx": "react-native"
   },
   "include": [
-    "App.js",
+    "App.tsx",
     "index.js"
   ]
 }
diff --git a/ios/test_app.rb b/ios/test_app.rb
@@ -1,6 +1,5 @@
 require('json')
 require('pathname')
-require('rubygems/version')
 
 require_relative('pod_helpers')
 
@@ -135,12 +134,11 @@ def generate_assets_catalog!(project_root, target_platform, destination)
 end
 
 def react_native_pods(version)
-  v = version.release
-  if v == Gem::Version.new('0.0.0') || v >= Gem::Version.new('0.70')
+  if version.zero? || version >= v(0, 70, 0)
     'use_react_native-0.70'
-  elsif v >= Gem::Version.new('0.68')
+  elsif version >= v(0, 68, 0)
     'use_react_native-0.68'
-  elsif v >= Gem::Version.new('0.64')
+  elsif version >= v(0, 66, 0)
     'use_react_native-0.64'
   else
     raise "Unsupported React Native version: #{version}"
@@ -202,7 +200,8 @@ def use_flipper!(versions = {})
 
 def use_react_native!(project_root, target_platform, options)
   react_native = react_native_path(project_root, target_platform)
-  version = package_version(react_native.to_s)
+  version = package_version(react_native.to_s).segments
+  version = v(version[0], version[1], version[2])
 
   require_relative(react_native_pods(version))
 
diff --git a/package.json b/package.json
@@ -91,10 +91,10 @@
   },
   "peerDependencies": {
     "@expo/config-plugins": ">=5.0",
-    "react": "~17.0.1 || ~18.0.0 || ~18.1.0 || ~18.2.0",
-    "react-native": "^0.0.0-0 || 0.64 - 0.72 || 1000.0.0",
-    "react-native-macos": "^0.0.0-0 || 0.64 || 0.66 || 0.68 || 0.71 - 0.72",
-    "react-native-windows": "^0.0.0-0 || 0.64 - 0.72"
+    "react": "~17.0.2 || 18.0 - 18.2",
+    "react-native": "^0.0.0-0 || 0.66 - 0.72 || 1000.0.0",
+    "react-native-macos": "^0.0.0-0 || 0.66 || 0.68 || 0.71 - 0.72",
+    "react-native-windows": "^0.0.0-0 || 0.66 - 0.72"
   },
   "peerDependenciesMeta": {
     "@expo/config-plugins": {
diff --git a/scripts/android-nightly.patch b/scripts/android-nightly.patch
@@ -11,14 +11,14 @@ index 66c01cf..3fa8f86 100644
  validateDistributionUrl=true
  zipStoreBase=GRADLE_USER_HOME
 diff --git a/example/package.json b/example/package.json
-index f801fbc..27df42e 100644
+index d90a956..bcfed43 100644
 --- a/example/package.json
 +++ b/example/package.json
-@@ -35,7 +35,6 @@
+@@ -21,7 +21,6 @@
      "react": "18.2.0",
      "react-native": "^0.72.0",
      "react-native-macos": "^0.72.0",
 -    "react-native-safe-area-context": "^4.5.3",
-     "react-native-test-app": "workspace:.",
-     "react-native-windows": "^0.72.0",
-     "webdriverio": "^8.11.2"
+     "react-native-windows": "^0.72.0"
+   },
+   "devDependencies": {
diff --git a/scripts/configure.js b/scripts/configure.js
@@ -251,18 +251,10 @@ function androidManifestPath(sourceDir) {
 }
 
 /**
- * @param {string} sourceDir
  * @returns {string | undefined}
  */
-function iosProjectPath(sourceDir) {
+function iosProjectPath() {
   const rnDir = path.dirname(require.resolve("react-native/package.json"));
-  const needsDummyProject = cliPlatformIOSVersion(rnDir) < v(5, 0, 2);
-  if (needsDummyProject) {
-    // Prior to @react-native-community/cli-platform-ios v5.0.0, `project` was
-    // only used to infer `sourceDir` and `podfile`.
-    return path.join(sourceDir, "ReactTestApp-Dummy.xcodeproj");
-  }
-
   const needsProjectPath = cliPlatformIOSVersion(rnDir) < v(8, 0, 0);
   if (needsProjectPath) {
     // `sourceDir` and `podfile` detection was fixed in
@@ -323,7 +315,7 @@ function configureProjects({ android, ios, windows }) {
     if (cliPlatformIOSVersion(rnDir) >= v(8, 0, 0)) {
       config.ios = ios;
     }
-    const project = iosProjectPath(path.basename(ios.sourceDir));
+    const project = iosProjectPath();
     if (project) {
       config.ios = config.ios ?? {};
       config.ios.project = project;
diff --git a/scripts/patch-cli-platform-android.js b/scripts/patch-cli-platform-android.js
diff --git a/test-app.gradle b/test-app.gradle
@@ -14,23 +14,13 @@ private static void applyConfigPlugins(String testAppDir, File rootDir) {
     }
 }
 
-// TODO: Remove when `@react-native-community/cli` 6.0+ is required. See also
-// https://github.com/react-native-community/cli/commit/fa0d09b2c9be144bbdff526bb14f171d7ddca88e
-private static void patchArgumentTypeMismatchError(String testAppDir, File cliAndroidDir) {
-    // We need to delegate this to a separate script to avoid running out of
-    // Java heap space.
-    String[] patch = ["node", "${testAppDir}/scripts/patch-cli-platform-android.js"]
-    Runtime.runtime.exec(patch, null, cliAndroidDir).waitFor()
-}
-
 def testAppDir = buildscript.sourceFile.getParent()
 apply(from: "${testAppDir}/android/test-app-util.gradle")
 
 checkEnvironment(rootDir)
 
 def reactNativeDir = file(findNodeModulesPath("react-native", rootDir))
 def cliAndroidDir = findNodeModulesPath("@react-native-community/cli-platform-android", reactNativeDir)
-patchArgumentTypeMismatchError(testAppDir, file(cliAndroidDir))
 
 if (findNodeModulesPath("@expo/config-plugins", rootDir)) {
     applyConfigPlugins(testAppDir, rootDir)
diff --git a/test/pack.test.mjs b/test/pack.test.mjs
@@ -38,17 +38,20 @@ describe("npm pack", () => {
       "android/app/src/main/AndroidManifest.xml",
       "android/app/src/main/java/com/microsoft/reacttestapp/MainActivity.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/Session.kt",
+      "android/app/src/main/java/com/microsoft/reacttestapp/compat/ReactNativeHostCompat.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/component/ComponentActivity.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/component/ComponentBottomSheetDialogFragment.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/component/ComponentListAdapter.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/component/ComponentViewModel.kt",
+      "android/app/src/main/java/com/microsoft/reacttestapp/fabric/ComponentsRegistry.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/manifest/Manifest.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/manifest/ManifestProvider.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/manifest/MoshiBundleAdapter.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/react/AppRegistry.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/react/ReactBundleNameProvider.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/react/TestAppReactNativeHost.kt",
       "android/app/src/main/java/com/microsoft/reacttestapp/react/ToReadableMap.kt",
+      "android/app/src/main/java/com/microsoft/reacttestapp/turbomodule/TurboModuleManagerDelegate.kt",
       "android/app/src/main/jni/Android.mk",
       "android/app/src/main/jni/AppRegistry.cpp",
       "android/app/src/main/jni/AppRegistry.h",
@@ -81,17 +84,12 @@ describe("npm pack", () => {
       "android/app/src/main/res/values/styles.xml",
       "android/app/src/no-camera/java/com/microsoft/reacttestapp/camera/MainActivityExtensions.kt",
       "android/app/src/no-fabric/java/com/microsoft/reacttestapp/fabric/FabricJSIModulePackage.kt",
-      "android/app/src/no-turbomodule/java/com/microsoft/reacttestapp/compat/ReactNativeHostCompat.kt",
-      "android/app/src/no-turbomodule/java/com/microsoft/reacttestapp/fabric/ComponentsRegistry.kt",
       "android/app/src/reactactivitydelegate-0.72/java/com/microsoft/reacttestapp/component/ComponentActivityDelegate.kt",
       "android/app/src/reactactivitydelegate-pre-0.72/java/com/microsoft/reacttestapp/component/ComponentActivityDelegate.kt",
       "android/app/src/reactapplication-0.73/java/com/microsoft/reacttestapp/TestApp.kt",
       "android/app/src/reactapplication-pre-0.73/java/com/microsoft/reacttestapp/TestApp.kt",
       "android/app/src/reactinstanceeventlistener-0.68/java/com/microsoft/reacttestapp/compat/ReactInstanceEventListener.kt",
       "android/app/src/reactinstanceeventlistener-pre-0.68/java/com/microsoft/reacttestapp/compat/ReactInstanceEventListener.kt",
-      "android/app/src/turbomodule/java/com/microsoft/reacttestapp/compat/ReactNativeHostCompat.kt",
-      "android/app/src/turbomodule/java/com/microsoft/reacttestapp/fabric/ComponentsRegistry.kt",
-      "android/app/src/turbomodule/java/com/microsoft/reacttestapp/turbomodule/TurboModuleManagerDelegate.kt",
       "android/dependencies.gradle",
       "android/settings.gradle",
       "android/support/build.gradle",
@@ -183,7 +181,6 @@ describe("npm pack", () => {
       "scripts/init.js",
       "scripts/link.js",
       "scripts/parseargs.js",
-      "scripts/patch-cli-platform-android.js",
       "scripts/schema.js",
       "scripts/validate-manifest.js",
       "test-app.gradle",
diff --git a/test/test_test_app.rb b/test/test_test_app.rb
@@ -103,22 +103,17 @@ def test_package_version
 
   def test_react_native_pods
     [
-      ['1000.0.0', '0.70'],
-      ['0.70.0', '0.70'],
-      ['0.70.0-rc.1', '0.70'],
-      ['0.68.0', '0.68'],
-      ['0.68.0-rc.1', '0.68'],
-      ['0.67.3', '0.64'],
-      ['0.66.4', '0.64'],
-      ['0.65.1', '0.64'],
-      ['0.64.3', '0.64'],
-      ['0.64.0', '0.64'],
+      [v(1000, 0, 0), '0.70'],
+      [v(0, 70, 0), '0.70'],
+      [v(0, 68, 0), '0.68'],
+      [v(0, 67, 3), '0.64'],
+      [v(0, 66, 4), '0.64'],
     ].each do |target, profile|
-      assert_equal("use_react_native-#{profile}", react_native_pods(Gem::Version.new(target)))
+      assert_equal("use_react_native-#{profile}", react_native_pods(target))
     end
 
     assert_raises(RuntimeError) do
-      react_native_pods(Gem::Version.new('0.63.4'))
+      react_native_pods(v(0, 65, 3))
     end
   end
 
diff --git a/yarn.lock b/yarn.lock
