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

BREAKING CHANGE: Dropped support for `react-native` 0.64, 0.65
microsoft · Oct 24, 2023 · d307e16 · d307e16
1 parent 88c2144
commit d307e16
Show file tree

Hide file tree

Showing 20 changed files with 217 additions and 315 deletions.
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/...cttestapp/compat/ReactNativeHostCompat.kt → ...cttestapp/compat/ReactNativeHostCompat.kt b/...cttestapp/compat/ReactNativeHostCompat.kt → ...cttestapp/compat/ReactNativeHostCompat.kt
diff --git a/...reacttestapp/fabric/ComponentsRegistry.kt → ...reacttestapp/fabric/ComponentsRegistry.kt b/...reacttestapp/fabric/ComponentsRegistry.kt → ...reacttestapp/fabric/ComponentsRegistry.kt
diff --git a/...turbomodule/TurboModuleManagerDelegate.kt → ...turbomodule/TurboModuleManagerDelegate.kt b/...turbomodule/TurboModuleManagerDelegate.kt → ...turbomodule/TurboModuleManagerDelegate.kt
diff --git a/...id/app/src/no-turbomodule/java/com/microsoft/reacttestapp/compat/ReactNativeHostCompat.kt b/...id/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']