Upgrade to RN 0.73.10

.github/workflows/build-android-dev.yml

@@ -33,20 +33,13 @@ jobs:
       - name: Set NodeJS version
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Set up our JDK environment
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt-hotspot'
-          java-version: '11'
-
-      - name: Fixing Android Build Tool Issue
-        run: |
-            cd $ANDROID_HOME/build-tools/33.0.0
-            mv d8 dx
-            cd lib
-            mv d8.jar dx.jar
+          java-version: '17'
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

.github/workflows/build-android-prod.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Set NodeJS version
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Check out Git repository
         uses: actions/checkout@v3
@@ -31,14 +31,7 @@ jobs:
         uses: actions/setup-java@v3
         with:
           distribution: 'adopt-hotspot'
-          java-version: '11'
-
-      - name: Fixing Android Build Tool Issue
-        run: |
-            cd $ANDROID_HOME/build-tools/33.0.0
-            mv d8 dx
-            cd lib
-            mv d8.jar dx.jar
+          java-version: '17'
 
       - name: Get yarn cache directory path
         id: yarn-cache-dir-path

.github/workflows/build-ios-dev.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Set NodeJS version
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Setup Ruby (bundle)
         uses: ruby/setup-ruby@v1
@@ -107,4 +107,3 @@ jobs:
         with:
           name: XCode Build Logs
           path: '/Users/runner/Library/Logs/gym/CozyReactNative-CozyReactNative.log'
-

.github/workflows/build-ios-prod.yml

@@ -24,14 +24,14 @@ jobs:
 
       - name: Select Xcode 15.3
         run: sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
-  
+
       - name: Check out Git repository
         uses: actions/checkout@v3
 
       - name: Set NodeJS version
         uses: actions/setup-node@v3
         with:
-          node-version: 16
+          node-version: 20
 
       - name: Setup Ruby (bundle)
         uses: ruby/setup-ruby@v1

.github/workflows/quality_checks.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Setup Node
       uses: actions/setup-node@v3
       with:
-        node-version: '16.x'
+        node-version: 20
         cache: 'yarn'
 
     - name: Install dependencies

Gemfile

@@ -2,4 +2,4 @@ source 'https://rubygems.org'
 # You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
 ruby ">= 2.6.10"
 gem 'cocoapods', '~> 1.13'
-gem 'activesupport', '>= 6.1.7.3', '< 7.1.0'
+gem 'activesupport', '>= 6.1.7.5', '< 7.1.0'

Gemfile.lock

@@ -89,7 +89,7 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport (>= 6.1.7.3, < 7.1.0)
+  activesupport (>= 6.1.7.5, < 7.1.0)
   cocoapods (~> 1.13)
 
 RUBY VERSION

android/app/build.gradle

@@ -1,4 +1,5 @@
 apply plugin: "com.android.application"
+apply plugin: "org.jetbrains.kotlin.android"
 apply plugin: "com.facebook.react"
 apply plugin: 'com.google.gms.google-services'
 apply from: project(':react-native-config').projectDir.getPath() + "/dotenv.gradle"
@@ -91,6 +92,7 @@ def jscFlavor = 'org.webkit:android-jsc:+'
 android {
     ndkVersion rootProject.ext.ndkVersion
 
+    buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdkVersion rootProject.ext.compileSdkVersion
 
     namespace "io.cozy.flagship.mobile"
@@ -146,15 +148,7 @@ android {
 dependencies {
     // The version of react-native is set by the React Native Gradle Plugin
     implementation("com.facebook.react:react-android")
-
-
-
-    debugImplementation("com.facebook.flipper:flipper:${FLIPPER_VERSION}")
-    debugImplementation("com.facebook.flipper:flipper-network-plugin:${FLIPPER_VERSION}") {
-        exclude group:'com.squareup.okhttp3', module:'okhttp'
-    }
-
-    debugImplementation("com.facebook.flipper:flipper-fresco-plugin:${FLIPPER_VERSION}")
+    implementation("com.facebook.react:flipper-integration")
 
     if (hermesEnabled.toBoolean()) {
         implementation("com.facebook.react:hermes-android")

android/app/src/debug/AndroidManifest.xml

@@ -3,15 +3,12 @@
   xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:tools="http://schemas.android.com/tools">
 
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
-
     <uses-sdk tools:overrideLibrary="androidx.core.splashscreen" />
 
     <application
       android:usesCleartextTraffic="true"
       tools:targetApi="28"
       tools:ignore="GoogleAppIndexingWarning">
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" android:exported="false" />
       <meta-data android:name="firebase_analytics_collection_deactivated" android:value="true" />
       <meta-data android:name="google_analytics_adid_collection_enabled" android:value="false" />
       <meta-data android:name="google_analytics_ssaid_collection_enabled" android:value="false" />

android/app/src/main/java/io/cozy/flagship/mobile/MainApplication.java

@@ -11,6 +11,7 @@
 import com.facebook.react.ReactPackage;
 import com.facebook.react.defaults.DefaultNewArchitectureEntryPoint;
 import com.facebook.react.defaults.DefaultReactNativeHost;
+import com.facebook.react.flipper.ReactNativeFlipper;
 import com.facebook.soloader.SoLoader;
 import java.util.List;
 import android.webkit.WebView;

android/build.gradle

@@ -10,9 +10,12 @@ buildscript {
         googlePlayServicesLocationVersion = "20.0.0"
         DocumentScanner_compileSdkVersion = 34
         DocumentScanner_targetSdkVersion = 34
-        kotlinVersion = '1.8.0' // react-native-receive-sharing-intent requires a global kotlin version else the build fails
-        // We use NDK 23 which has both M1 support and is the side-by-side NDK version from AGP.
-        ndkVersion = "23.1.7779620"
+        ndkVersion = "25.1.8937393"
+        kotlinVersion = "1.8.0"
+        // To solve a conflict between flipper and react-native-background-geolocation
+        // https://github.com/transistorsoft/react-native-background-geolocation/issues/1983
+        slf4jVersion = "2.0.7"
+        logbackVersion = "3.0.0"
     }
     repositories {
         google()
@@ -21,10 +24,13 @@ buildscript {
     dependencies {
         classpath("com.android.tools.build:gradle")
         classpath("com.facebook.react:react-native-gradle-plugin")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin")
         classpath("com.google.gms:google-services:4.3.15")
     }
 }
 
+apply plugin: "com.facebook.react.rootproject"
+
 allprojects {
     repositories {
         maven {

android/gradle.properties

@@ -25,7 +25,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # Version of flipper SDK to use with React Native
-FLIPPER_VERSION=0.182.0
+FLIPPER_VERSION=0.269.0
 
 # Helps against out of memory errors
 org.gradle.jvmargs=-Xmx4096m -XX:MaxMetaspaceSize=4096m -XX:+HeapDumpOnOutOfMemoryError

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

android/gradlew

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+      die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -197,6 +198,9 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in

babel.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  presets: ['module:metro-react-native-babel-preset'],
+  presets: ['module:@react-native/babel-preset'],
   plugins: [
     'optional-require',
     [