Merge pull request #55 from mendix/MOO-1776-upgrade-rn

[MOO-1776] upgrade rn to v0.77.1

Author: vadymv-mendix

android/app/build.gradle

@@ -1,56 +1,19 @@
 apply plugin: "com.android.application"
 apply plugin: "com.facebook.react"
-apply plugin: "kotlin-android"
 apply plugin: "com.google.gms.google-services"
 apply plugin: "com.google.firebase.crashlytics"
+apply plugin: "kotlin-android"
 apply plugin: "kotlin-kapt"
+apply plugin: 'org.jetbrains.kotlin.plugin.compose'
 apply plugin: "androidx.navigation.safeargs.kotlin"
 
-/**
- * This is the configuration block to customize your React Native Android app.
- * By default you don't need to apply any configuration, just uncomment the lines you need.
- */
 react {
-    /* Folders */
-    //   The root of your project, i.e. where "package.json" lives. Default is '../..'
-    // root = file("../../")
-    //   The folder where the react-native NPM package is. Default is ../../node_modules/react-native
-    // reactNativeDir = file("../../node_modules/react-native")
-    //   The folder where the react-native Codegen package is. Default is ../../node_modules/@react-native/codegen
-    // codegenDir = file("../../node_modules/@react-native/codegen")
-    //   The cli.js file which is the React Native CLI entrypoint. Default is ../../node_modules/react-native/cli.js
-    // cliFile = file("../../node_modules/react-native/cli.js")
     /* Variants */
     //   The list of variants to that are debuggable. For those we're going to
     //   skip the bundling of the JS bundle and the assets. By default is just 'debug'.
     //   If you add flavors like lite, prod, etc. you'll have to list your debuggableVariants.
      debuggableVariants = ["productionDebug", "productionRelease"]
-    /* Bundling */
-    //   A list containing the node command and its flags. Default is just 'node'.
-    // nodeExecutableAndArgs = ["node"]
-    //
-    //   The command to run when bundling. By default is 'bundle'
-    // bundleCommand = "ram-bundle"
-    //
-    //   The path to the CLI configuration file. Default is empty.
-    // bundleConfig = file(../rn-cli.config.js)
-    //
-    //   The name of the generated asset file containing your JS bundle
-    // bundleAssetName = "MyApplication.android.bundle"
-    //
-    //   The entry file for bundle generation. Default is 'index.android.js' or 'index.js'
-    // entryFile = file("../js/MyApplication.android.js")
-    //
-    //   A list of extra flags to pass to the 'bundle' commands.
-    //   See https://github.com/react-native-community/cli/blob/main/docs/commands.md#bundle
-    // extraPackagerArgs = []
-    /* Hermes Commands */
-    //   The hermes compiler command to run. By default it is 'hermesc'
-    // hermesCommand = "$rootDir/my-custom-hermesc/bin/hermesc"
-    //
-    //   The list of flags to pass to the Hermes compiler. By default is "-O", "-output-source-map"
-    // hermesFlags = ["-O", "-output-source-map"]
-    //
+
     /* Autolinking */
     autolinkLibrariesWithApp()
 }
@@ -60,27 +23,6 @@ react {
  */
 def enableProguardInReleaseBuilds = false
 
-/**
- * The preferred build flavor of JavaScriptCore (JSC)
- *
- * For example, to use the international variant, you can use:
- * `def jscFlavor = 'org.webkit:android-jsc-intl:+'`
- *
- * The international variant includes ICU i18n library and necessary data
- * allowing to use e.g. `Date.toLocaleString` and `String.localeCompare` that
- * give correct results when using with locales other than en-US. Note that
- * this variant is about 6MiB larger per architecture than default.
- */
-def jscFlavor = "org.webkit:android-jsc:+"
-
-/**
- * Whether to load react from source or use the prepacked package
- *
- * Keep false for faster compilation and avoid the need for an NDK to be installed.
- * Use true if you want to debug and modify RN source, say for patching.
- */
-def reactNativeFromSource = BUILD_RN_FROM_SOURCE.toBoolean()
-
 android {
     ndkVersion rootProject.ndkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
@@ -91,8 +33,8 @@ android {
         applicationId "com.mendix.developerapp.mx10"
         minSdkVersion rootProject.minSdkVersion
         targetSdkVersion rootProject.targetSdkVersion
-        versionCode 404
-        versionName "4.1.0"
+        versionCode 500
+        versionName "5.0.0"
         missingDimensionStrategy "react-native-camera", "general"
         testBuildType System.getProperty("testBuildType", "debug")
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -117,7 +59,7 @@ android {
         }
         release {
            Properties releaseProps = new Properties()
-           def propFile = new File('./local.properties')
+           def propFile = new File('./keystores/debug.keystore.properties')
            if (propFile.canRead()) {
                releaseProps.load(new FileInputStream(propFile))
 
@@ -169,13 +111,7 @@ android {
 
 dependencies {
     // React Native Core
-    if (reactNativeFromSource) {
-        implementation project(":ReactAndroid")
-    } else {
-        implementation "com.facebook.react:react-android"
-    }
-
-    // Javascript engine
+    implementation "com.facebook.react:react-android:0.77.0"
     implementation("com.facebook.react:hermes-android")
 
     // Mendix dependencies

android/app/src/main/AndroidManifest.xml

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools"
-          package="com.mendix.developerapp">
+          xmlns:tools="http://schemas.android.com/tools">
 
     <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" tools:node="remove"
                      tools:ignore="QueryAllPackagesPermission"/>

android/app/src/main/java/com/mendix/developerapp/utilities/EmptyDevLoadingViewController.kt

@@ -262,7 +262,7 @@ class MainActivity : AppCompatActivity(), DefaultHardwareBackBtnHandler, LaunchS
     }
 
     override fun requestPermissions(
-        permissions: Array<out String>,
+        permissions: Array<String>,
         requestCode: Int,
         listener: PermissionListener?
     ) {

android/app/src/production/java/com/mendix/developerapp/MainActivity.kt

@@ -2,9 +2,8 @@ package com.mendix.developerapp.mendixapp
 
 import android.os.Bundle
 import androidx.navigation.fragment.findNavController
-import com.facebook.react.devsupport.overrideDevLoadingViewController
+import com.facebook.react.devsupport.DefaultDevLoadingViewImplementation
 import com.facebook.react.devsupport.setBundleDownloadListener
-import com.mendix.developerapp.utilities.EmptyDevLoadingViewController
 import com.mendix.mendixnative.react.MxConfiguration
 
 class MendixProjectFragment : MendixProjectFragmentBase() {
@@ -23,8 +22,10 @@ class MendixProjectFragment : MendixProjectFragmentBase() {
         // Setting up our download listener
         reactNativeHost.reactInstanceManager.devSupportManager.apply {
             setBundleDownloadListener(this, viewModel.devServerCallback)
-            overrideDevLoadingViewController(this, EmptyDevLoadingViewController())
         }
+
+        // This now uses built-in RN mechanism to show bundling progress.
+        DefaultDevLoadingViewImplementation.setDevLoadingEnabled(true);
     }
 
     override fun onCloseProjectSelected() {

android/app/src/production/java/com/mendix/developerapp/mendixapp/MendixProjectFragment.kt

@@ -2,16 +2,14 @@
 buildscript {
     ext {
         buildToolsVersion = "35.0.0"
-        minSdkVersion = 23
+        minSdkVersion = 24
         compileSdkVersion = 35
         targetSdkVersion = 35
         // needed by camera module
         googlePlayServicesVersion = "17+"
-//        supportLibVersion = "28.0.0"
         androidXAnnotation = "1.2.0"
         androidXBrowser = "1.3.0"
         lifecycleVersion = "2.0.0"
-        kotlin_version = "1.9.24"
         kotlinVersion = "1.9.24"
         nav_version = "2.8.3"
         androidx_core_version = "1.6.0"
@@ -33,11 +31,12 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:7.2.2"
+        classpath "com.android.tools.build:gradle:7.4.2"
         classpath "com.facebook.react:react-native-gradle-plugin"
         classpath "com.google.gms:google-services:4.4.2"
         classpath "de.undercouch:gradle-download-task:4.1.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath 'org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21'
         classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.1"
         classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.8.3"
 

android/build.gradle

@@ -16,12 +16,13 @@ android.useAndroidX=true
 android.enableJetifier=true
 # android.enableJetifier=true
 org.gradle.configureondemand=true
-BUILD_RN_FROM_SOURCE=false
 # Use this property to specify which architecture you want to build.
 # You can also override it from the CLI using
 # ./gradlew <task> -PreactNativeArchitectures=x86_64
 reactNativeArchitectures=armeabi-v7a,arm64-v8a,x86,x86_64
 android.suppressUnsupportedCompileSdk=33
 android.defaults.buildfeatures.buildconfig=true
 android.nonTransitiveRClass=true
-hermesEnabled=true
+# enabled by default in RN 0.76 so we need to disable it explicitly
+newArchEnabled=false
+hermesEnabled=true

android/gradle.properties

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

android/gradle/wrapper/gradle-wrapper.properties

@@ -4,17 +4,6 @@ extensions.configure(com.facebook.react.ReactSettingsExtension){ ex -> ex.autoli
 
 includeBuild('../node_modules/@react-native/gradle-plugin')
 
-if (BUILD_RN_FROM_SOURCE.toBoolean()) {
-    include ':ReactAndroid'
-    project(':ReactAndroid').projectDir = new File(rootProject.projectDir, '../node_modules/react-native/ReactAndroid')
-
-    include(":packages:react-native-codegen:android")
-    project(":packages:react-native-codegen:android").projectDir = new File(rootProject.projectDir,
-            "../node_modules/react-native/packages/react-native-codegen/android")
-
-    includeBuild("../node_modules/react-native/packages/react-native-codegen/android")
-}
-
 include ':mendixnative-release'
 project(':mendixnative-release').projectDir = new File(rootProject.projectDir, '../node_modules/@mendix/native/androidlib')
 

android/settings.gradle

@@ -86,7 +86,7 @@
 	<key>NSPhotoLibraryUsageDescription</key>
 	<string>To use that feature the app needs access to your photo library.</string>
 	<key>Native Binary Version</key>
-	<integer>9</integer>
+	<integer>10</integer>
 	<key>NativeOTAEnabled</key>
 	<true/>
 	<key>ReferenceGuideUrl</key>