feat: upgrade rn to 0.73.2

fingerprintjs · Jan 17, 2024 · ed3148c · ed3148c
1 parent 76ac218
commit ed3148c
Show file tree

Hide file tree

Showing 19 changed files with 4,770 additions and 7,650 deletions.
diff --git a/TestProject/android/app/build.gradle b/TestProject/android/app/build.gradle
@@ -1,4 +1,5 @@
 apply plugin: "com.android.application"
+apply plugin: "com.facebook.react"
 
 import com.android.build.OutputFile
 import org.apache.tools.ant.taskdefs.condition.Os
@@ -82,7 +83,6 @@ project.ext.react = [
     enableHermes: true,  // clean and rebuild if changing
 ]
 
-apply from: "../../node_modules/react-native/react.gradle"
 
 /**
  * Set this to true to create two separate APKs instead of one:
@@ -159,6 +159,9 @@ android {
                 }
             }
         }
+        buildFeatures {
+            buildConfig = true
+        }
     }
 
     if (isNewArchitectureEnabled()) {
@@ -202,6 +205,8 @@ android {
         }
     }
 
+    namespace = "com.testproject"
+
     splits {
         abi {
             reset()
@@ -265,9 +270,7 @@ dependencies {
         exclude group:'com.squareup.okhttp3', module:'okhttp'
     }
 
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.facebook.flipper'
-    }
+    debugImplementation("com.facebook.fresco:flipper-fresco-plugin:${FLIPPER_FRESCO_VERSION}")
 
     if (enableHermes) {
         //noinspection GradleDynamicVersion

diff --git a/TestProject/android/app/src/debug/java/com/testproject/ReactNativeFlipper.java b/TestProject/android/app/src/debug/java/com/testproject/ReactNativeFlipper.java
@@ -23,7 +23,6 @@
 import com.facebook.react.ReactInstanceManager;
 import com.facebook.react.bridge.ReactContext;
 import com.facebook.react.modules.network.NetworkingModule;
-import okhttp3.OkHttpClient;
 
 public class ReactNativeFlipper {
   public static void initializeFlipper(Context context, ReactInstanceManager reactInstanceManager) {
@@ -38,12 +37,7 @@ public static void initializeFlipper(Context context, ReactInstanceManager react
 
       NetworkFlipperPlugin networkFlipperPlugin = new NetworkFlipperPlugin();
       NetworkingModule.setCustomClientBuilder(
-          new NetworkingModule.CustomClientBuilder() {
-            @Override
-            public void apply(OkHttpClient.Builder builder) {
-              builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin));
-            }
-          });
+              (NetworkingModule.CustomClientBuilder) builder -> builder.addNetworkInterceptor(new FlipperOkhttpInterceptor(networkFlipperPlugin)));
       client.addPlugin(networkFlipperPlugin);
       client.start();
 

diff --git a/TestProject/android/app/src/main/java/com/testproject/MainActivity.java b/TestProject/android/app/src/main/java/com/testproject/MainActivity.java
@@ -37,12 +37,5 @@ protected ReactRootView createRootView() {
       reactRootView.setIsFabric(BuildConfig.IS_NEW_ARCHITECTURE_ENABLED);
       return reactRootView;
     }
-
-    @Override
-    protected boolean isConcurrentRootEnabled() {
-      // If you opted-in for the New Architecture, we enable Concurrent Root (i.e. React 18).
-      // More on this on https://reactjs.org/blog/2022/03/29/react-v18.html
-      return BuildConfig.IS_NEW_ARCHITECTURE_ENABLED;
-    }
   }
 }
diff --git a/TestProject/android/app/src/main/java/com/testproject/MainApplication.java b/TestProject/android/app/src/main/java/com/testproject/MainApplication.java
@@ -77,13 +77,8 @@ private static void initializeFlipper(
         aClass
             .getMethod("initializeFlipper", Context.class, ReactInstanceManager.class)
             .invoke(null, context, reactInstanceManager);
-      } catch (ClassNotFoundException e) {
-        e.printStackTrace();
-      } catch (NoSuchMethodException e) {
-        e.printStackTrace();
-      } catch (IllegalAccessException e) {
-        e.printStackTrace();
-      } catch (InvocationTargetException e) {
+      } catch (ClassNotFoundException | NoSuchMethodException | IllegalAccessException |
+               InvocationTargetException e) {
         e.printStackTrace();
       }
     }

diff --git a/TestProject/android/build.gradle b/TestProject/android/build.gradle
@@ -21,7 +21,7 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.4.2")
+        classpath("com.android.tools.build:gradle:8.1.1")
         classpath("com.facebook.react:react-native-gradle-plugin")
         classpath("de.undercouch:gradle-download-task:5.0.1")
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/TestProject/android/gradle.properties b/TestProject/android/gradle.properties
@@ -31,7 +31,8 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.125.0
+FLIPPER_VERSION=0.182.0
+FLIPPER_FRESCO_VERSION=3.0.0
 
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using

diff --git a/TestProject/android/gradle/wrapper/gradle-wrapper.properties b/TestProject/android/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/TestProject/android/settings.gradle b/TestProject/android/settings.gradle
@@ -1,7 +1,7 @@
 rootProject.name = 'TestProject'
 apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':app'
-includeBuild('../node_modules/react-native-gradle-plugin')
+includeBuild('../node_modules/@react-native/gradle-plugin')
 if (settings.hasProperty("newArchEnabled") && settings.newArchEnabled == "true") {
     include(":ReactAndroid")
     project(":ReactAndroid").projectDir = file('../node_modules/react-native/ReactAndroid')

diff --git a/TestProject/ios/Podfile b/TestProject/ios/Podfile
@@ -1,7 +1,7 @@
 require_relative '../node_modules/react-native/scripts/react_native_pods'
 require_relative '../node_modules/@react-native-community/cli-platform-ios/native_modules'
 
-platform :ios, '13.0'
+platform :ios, '13.4'
 install! 'cocoapods', :deterministic_uuids => false
 
 target 'TestProject' do
@@ -39,6 +39,11 @@ target 'TestProject' do
       # necessary for Mac Catalyst builds
       :mac_catalyst_enabled => false
     )
-    __apply_Xcode_12_5_M1_post_install_workaround(installer)
+
+    installer.pods_project.targets.each do |target|
+      target.build_configurations.each do |config|
+       config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.4'
+      end
+     end
   end
 end