upgrade react-native to 0.75.3

status-im · Sep 17, 2024 · 9539861 · 9539861
1 parent 17180a0
commit 9539861
Show file tree

Hide file tree

Showing 35 changed files with 5,489 additions and 1,626 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -54,6 +54,9 @@ react {
     //
     //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
     // hermesFlags = ["-O", "-output-source-map"]
+
+    /* Autolinking */
+    autolinkLibrariesWithApp()
 }
 
 /**
@@ -297,7 +300,7 @@ dependencies {
     implementation("com.facebook.fresco:fresco:2.5.0")
     implementation("com.facebook.fresco:animated-gif:2.5.0")
     implementation("com.squareup.okhttp3:okhttp-tls:4.11.0")
-    implementation("com.google.prefab:cli:2.0.0")
+    implementation("com.google.prefab:cli:2.1.0")
     implementation("com.android.tools.build:aapt2:8.1.1-10154469")
 }
 
@@ -333,5 +336,3 @@ task hemroidBuild(type: Exec) {
 }
 
 preBuild.dependsOn hemroidBuild
-
-apply from: file("../../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesAppBuildGradle(project)
diff --git a/android/app/jni/Android.mk b/android/app/jni/Android.mk
@@ -6,6 +6,8 @@ LOCAL_MODULE    := status-logs
 LOCAL_SRC_FILES := Log.c
 
 LOCAL_CPPFLAGS  := -std=c++11 -fexceptions -I$(LOCAL_PATH)/include
+# Fix for : ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration]
+LOCAL_CFLAGS := '-Wno-error=implicit-function-declaration'
 LOCAL_LDFLAGS := -llog
 
 include $(BUILD_SHARED_LIBRARY)
diff --git a/android/app/src/debug/AndroidManifest.xml b/android/app/src/debug/AndroidManifest.xml
@@ -7,5 +7,10 @@
     <!-- Remove licensing permission since we don't license our app and it blocks F-Droid submissions. -->
     <uses-permission tools:node="remove" android:name="com.android.vending.CHECK_LICENSE"/>
 
-   <application tools:targetApi="28" tools:ignore="GoogleAppIndexingWarning"  android:usesCleartextTraffic="true" />
+    <application
+            tools:targetApi="28"
+            tools:ignore="GoogleAppIndexingWarning"
+            android:usesCleartextTraffic="true"
+            tools:replace="android:appComponentFactory"
+            android:appComponentFactory="androidx.core.app.CoreComponentFactory" />
 </manifest>
diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml
@@ -42,7 +42,8 @@
             android:largeHeap="true"
             android:usesCleartextTraffic="true"
             android:extractNativeLibs="true"
-            android:requestLegacyExternalStorage="true">
+            android:requestLegacyExternalStorage="true"
+            android:supportsRtl="true">
 <!--        After upgrading Android Gradle Plugin to 4.2.0 and above we must get rid of `extractNativeLibs="true"`
             and use`useLegacyPackaging` flag in our app's `build.gradle`-->
         <meta-data android:name="commitHash" android:value="${commitHash}"/>

diff --git a/android/app/src/main/java/im/status/ethereum/MainApplication.kt b/android/app/src/main/java/im/status/ethereum/MainApplication.kt
@@ -6,7 +6,6 @@ import com.facebook.react.PackageList
 import com.facebook.react.ReactApplication
 import com.facebook.react.ReactNativeHost
 import com.facebook.react.ReactPackage
-import com.facebook.react.bridge.JSIModulePackage
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint
 import com.facebook.react.modules.network.OkHttpClientProvider
 import com.reactnativenavigation.NavigationApplication

diff --git a/android/build.gradle b/android/build.gradle
@@ -17,7 +17,8 @@ ext {
     kotlinVersion       = project.kotlinPluginVersion
     kotlinPluginVersion = project.kotlinPluginVersion
     kotlinToolsVersion  = project.kotlinPluginVersion
-    ndkVersion = "25.2.9519653"
+    // This version must match ndkVersion version inside nix/pkgs/android-sdk/compose.nix
+    ndkVersion = "26.1.10909125"
 }
 
 buildscript {

diff --git a/android/gradle.properties b/android/gradle.properties
@@ -27,8 +27,8 @@ targetSdkVersion=34
 buildToolsVersion=34.0.0
 supportLibVersion=28.0.0
 # This should match version from nix/pkgs/aapt2/default.nix
-gradlePluginVersion=7.4.2
-kotlinPluginVersion=1.9.0
+gradlePluginVersion=8.5.0
+kotlinPluginVersion=1.9.24
 
 android.useAndroidX=true
 android.enableJetifier=true
@@ -54,7 +54,7 @@ commitHash=unknown
 # to write custom TurboModules/Fabric components OR use libraries that
 # are providing them.
 newArchEnabled=false
-
+ORG_GRADLE_PROJECT_universalApk=false
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 # Disabled for debug builds to avoid 'maximum call stack exceeded' errors.

diff --git a/android/settings.gradle b/android/settings.gradle
@@ -1,14 +1,15 @@
 pluginManagement {
+includeBuild("../node_modules/@react-native/gradle-plugin")
 include ':react-native-share'
 project(':react-native-share').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-share/android')
   repositories {
       mavenLocal() // Let's prioritize local Maven repos so that Nix can provide them offline
       gradlePluginPortal()
   }
 }
-
+plugins { id("com.facebook.react.settings") }
+extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autolinkLibrariesFromCommand() }
 rootProject.name = 'StatusIm'
-apply from: file("../node_modules/@react-native-community/cli-platform-android/native_modules.gradle"); applyNativeModulesSettingsGradle(settings)
 include ':react-native-nfc-manager'
 project(':react-native-nfc-manager').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-nfc-manager/android')
 include ':app'

diff --git a/ios/Podfile b/ios/Podfile
@@ -81,6 +81,7 @@ abstract_target 'Status' do
       installer,
       config[:reactNativePath],
       :mac_catalyst_enabled => false,
+      # :ccache_enabled => true
     )
     # some of libs wouldn't be build for x86_64 otherwise and that is
     # necessary for ios simulators