Merge pull request #18 from mendix/moo/RN-upgrade-0.73.8

RN upgrade 0.73.8

.java-version

@@ -1 +1 @@
-11.0
+17.0

android/app/build.gradle

@@ -24,7 +24,7 @@ react {
     //   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 = ["liteDebug", "prodDebug"]
+     debuggableVariants = ["productionDebug", "productionRelease"]
     /* Bundling */
     //   A list containing the node command and its flags. Default is just 'node'.
     // nodeExecutableAndArgs = ["node"]
@@ -80,6 +80,7 @@ def reactNativeFromSource = BUILD_RN_FROM_SOURCE.toBoolean()
 
 android {
     ndkVersion rootProject.ndkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
     compileSdkVersion rootProject.compileSdkVersion
 
     namespace "com.mendix.developerapp"
@@ -156,7 +157,7 @@ android {
         buildConfig true
     }
     composeOptions {
-        kotlinCompilerExtensionVersion '1.4.7'
+        kotlinCompilerExtensionVersion  compose_version
     }
     packagingOptions {
         pickFirst "**/*.so"
@@ -172,11 +173,7 @@ dependencies {
     }
 
     // Flipper debugger
-    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")
 
     // Javascript engine
     if (hermesEnabled.toBoolean()) {
@@ -189,9 +186,9 @@ dependencies {
     implementation project(":mendixnative-release")
 
     // Dev app dependencies
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "android.arch.lifecycle:extensions:1.1.1"
-    implementation "com.google.android.material:material:1.4.0"
+    implementation "com.google.android.material:material:1.12.0"
     implementation "androidx.core:core-ktx:$androidx_core_version"
     implementation "androidx.activity:activity-ktx:1.3.1"
     implementation "androidx.fragment:fragment-ktx:1.3.6"
@@ -200,10 +197,10 @@ dependencies {
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:$androidx_lifecycle_version"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation "androidx.appcompat:appcompat:$appcompat_version"
-    implementation "androidx.navigation:navigation-common-ktx:2.3.5"
-    implementation "androidx.navigation:navigation-ui-ktx:2.3.5"
-    implementation "androidx.navigation:navigation-fragment-ktx:2.3.5"
-    implementation "androidx.navigation:navigation-runtime-ktx:2.3.5"
+    implementation "androidx.navigation:navigation-common-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-runtime-ktx:$nav_version"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.legacy:legacy-support-v4:1.0.0"
     implementation "com.android.support.constraint:constraint-layout:$constraint_layout_version"

android/app/src/main/AndroidManifest.xml

@@ -68,7 +68,9 @@
             android:largeHeap="true"
             android:requestLegacyExternalStorage="true"
             android:theme="@style/Theme.MakeItNative"
-            android:usesCleartextTraffic="true">
+            android:usesCleartextTraffic="true"
+            tools:ignore="GoogleAppIndexingWarning"
+            tools:targetApi="28">
         <activity
                 android:name=".MainActivity"
                 android:configChanges="keyboard|keyboardHidden|orientation|screenSize|uiMode"

android/app/src/production/java/com/mendix/developerapp/home/HomeFragment.kt

@@ -72,7 +72,7 @@ class HomeFragment : BaseFragment() {
         super.onResume()
         activity?.window?.statusBarColor = MaterialColors.getColor(
             requireContext(),
-            R.attr.colorPrimary,
+            android.R.attr.colorPrimary,
             ResourcesCompat.getColor(requireActivity().resources, R.color.red1, activity?.theme)
         )
     }
@@ -143,15 +143,15 @@ class HomeFragment : BaseFragment() {
         findNavController().navigate(
             HomeFragmentDirections.actionStartAppFragmentToMendixProjectLoaderFragment(
                 getString(R.string.react_native_component_name),
-                activity?.intent?.extras,
-                MendixApp(
-                    viewModel.getAppUrl(),
-                    getWarningFilterValue(requireActivity()),
-                    viewModel.getDevModeEnabled(),
-                    true
-                ),
-                viewModel.getClearData(),
-                true,
+                    MendixApp(
+                            viewModel.getAppUrl(),
+                            getWarningFilterValue(requireActivity()),
+                            viewModel.getDevModeEnabled(),
+                            true
+                    ),
+                    activity?.intent?.extras,
+                    viewModel.getClearData(),
+                    true,
             )
         )
     }

android/app/src/production/java/com/mendix/developerapp/loading/MendixProjectLoaderFragment.kt

@@ -105,11 +105,7 @@ class MendixProjectLoaderFragment : Fragment() {
         requireActivity().runOnUiThread {
             findNavController().navigate(
                 MendixProjectLoaderFragmentDirections.actionMendixProjectLoaderFragmentToMendixProjectFragment(
-                    argComponentName,
-                    argLaunchOptions,
-                    argMendixApp,
-                    argClearData,
-                    argUseDeveloperSupport
+                    argComponentName, argMendixApp, argLaunchOptions, argClearData, argUseDeveloperSupport
                 )
             )
         }

android/build.gradle

@@ -1,27 +1,29 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
-        buildToolsVersion = "33.0.0"
+        buildToolsVersion = "34.0.0"
         minSdkVersion = 21
-        compileSdkVersion = 33
-        targetSdkVersion = 33
+        compileSdkVersion = 34
+        targetSdkVersion = 34
         // needed by camera module
         googlePlayServicesVersion = "17+"
         supportLibVersion = "28.0.0"
         lifecycleVersion = "2.0.0"
-        kotlin_version = "1.8.21"
+        kotlin_version = "1.9.0"
+        kotlinVersion = "1.9.0"
+        compose_version = "1.5.2"
+        nav_version = "2.7.7"
         androidx_core_version = "1.6.0"
         androidXBrowser = "1.2.0"
         excludeAppGlideModule = true
         androidx_lifecycle_version = "2.6.1"
         constraint_layout_version = "2.0.4"
         appcompat_version = "1.3.1"
         excludeAppGlideModule = true
-        compose_ui_version = '1.2.0'
+        compose_ui_version = '1.5.4'
         camerax_version = "1.3.0-alpha04"
 
-        // 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"
     }
 
     repositories {
@@ -35,7 +37,7 @@ buildscript {
         classpath "de.undercouch:gradle-download-task:4.1.2"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "com.google.firebase:firebase-crashlytics-gradle:2.7.1"
-        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.3.5"
+        classpath "androidx.navigation:navigation-safe-args-gradle-plugin:2.7.7"
 
         apply from: file("../node_modules/@mendix/native/androidlib/mendix.gradle"); applyMendixClassPaths(project)
 
@@ -65,3 +67,5 @@ allprojects {
         maven { url 'https://jitpack.io' }
     }
 }
+
+apply plugin: "com.facebook.react.rootproject"

android/gradle.properties

@@ -15,15 +15,14 @@ org.gradle.parallel=true
 android.useAndroidX=true
 android.enableJetifier=true
 org.gradle.configureondemand=true
-FLIPPER_VERSION=0.182.0
 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.disableAutomaticComponentCreation=true
 android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=true
 # Use this property to enable or disable the Hermes JS engine.
 # If set to false, you will be using JSC instead.
 hermesEnabled=false

android/gradle/wrapper/gradle-wrapper.properties

@@ -1,7 +1,8 @@
-#Wed Sep 21 13:32:51 CEST 2022
+#Fri June 14 12:14:06 CET 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
-networkTimeout=10000
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+validateDistributionUrl=true
+networkTimeout=10000