Merge pull request #226 from mendix/min-build-fix

[MOO-2309] - MiN build fix

Author: YogendraShelke

android/app/src/main/java/com/mendix/developerapp/BaseApplication.kt

@@ -1,24 +1,14 @@
 package com.mendix.developerapp
 
-import android.content.Context
 import com.facebook.react.PackageList
-import com.facebook.react.ReactInstanceManager
 import com.facebook.react.ReactPackage
 import com.mendix.developerapp.utilities.CrashlyticsErrorHandler
 import com.mendix.mendixnative.MendixReactApplication
 import com.mendix.mendixnative.error.ErrorHandler
-import java.lang.reflect.InvocationTargetException
 
 @Suppress("unused")
 open class BaseApplication : MendixReactApplication() {
 
-    override fun onCreate() {
-        super.onCreate()
-        if(reactNativeHost.hasInstance()) {
-            initializeFlipper(this, reactNativeHost.reactInstanceManager)
-        }
-    }
-
     override fun getPackages(): List<ReactPackage> {
         val packages: MutableList<ReactPackage> = PackageList(this).packages
 
@@ -32,32 +22,4 @@ open class BaseApplication : MendixReactApplication() {
     override fun createErrorHandler(): ErrorHandler {
         return CrashlyticsErrorHandler(this)
     }
-
-    private fun initializeFlipper(context: Context, reactInstanceManager: ReactInstanceManager) {
-        if (BuildConfig.DEBUG) {
-            try {
-                /*
-             * We use reflection here to pick up the class that initializes Flipper, since
-             * Flipper library is not available in release mode
-             */
-                val aClass = Class.forName("com.mendix.developerapp.flipper.ReactNativeFlipper")
-                aClass.getMethod(
-                    "initializeFlipper",
-                    Context::class.java,
-                    ReactInstanceManager::class.java
-                ).invoke(
-                    null, context,
-                    reactInstanceManager
-                )
-            } catch (e: ClassNotFoundException) {
-                e.printStackTrace()
-            } catch (e: NoSuchMethodException) {
-                e.printStackTrace()
-            } catch (e: IllegalAccessException) {
-                e.printStackTrace()
-            } catch (e: InvocationTargetException) {
-                e.printStackTrace()
-            }
-        }
-    }
 }

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

@@ -12,8 +12,9 @@ import com.mendix.mendixnative.error.ErrorType
 
 class CrashlyticsErrorHandler(val context: Context) : ErrorHandler {
     override fun handleError(title: String?, stack: Array<out StackFrame>?, type: ErrorType) {
+        val crashlyticsStack = stack?.let { source -> Array(source.size) { index -> source[index] } } ?: emptyArray()
         FirebaseCrashlytics.getInstance().setCustomKey("Error type", type.name)
-        FirebaseCrashlytics.getInstance().log(StackTraceHelper.formatStackTrace(title, stack!!))
+        FirebaseCrashlytics.getInstance().log(StackTraceHelper.formatStackTrace(title, crashlyticsStack))
         (if (type === ErrorType.NATIVE) Exception(title) else title?.let {
             JavascriptException(
                 it
@@ -23,7 +24,7 @@ class CrashlyticsErrorHandler(val context: Context) : ErrorHandler {
         Bundle().let {
             it.putString("title", title)
             it.putString("type", type.name)
-            it.putString("stack_frame", StackTraceHelper.formatStackTrace(title, stack))
+            it.putString("stack_frame", StackTraceHelper.formatStackTrace(title, crashlyticsStack))
             FirebaseAnalytics.getInstance(context).logEvent("red_box", it)
         }
     }

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

@@ -185,7 +185,7 @@ class ProjectLoaderViewModel : ViewModel() {
             }
         }
 
-        override fun onFailure(cause: Exception?) {
+        override fun onFailure(cause: Exception) {
             setStatus(STATUS_ERROR_BUNDLE)
         }
     }

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

@@ -20,9 +20,7 @@ class MendixProjectFragment : MendixProjectFragmentBase() {
         super.onCreate(savedInstanceState)
 
         // Setting up our download listener
-        reactNativeHost.reactInstanceManager.devSupportManager.apply {
-            setBundleDownloadListener(this, viewModel.devServerCallback)
-        }
+        setBundleDownloadListener(reactHost?.devSupportManager, viewModel.devServerCallback)
 
         // This now uses built-in RN mechanism to show bundling progress.
         DefaultDevLoadingViewImplementation.setDevLoadingEnabled(true);

android/build.gradle

@@ -71,14 +71,6 @@ allprojects {
     // Uncomment the following line if Windows fails due to long paths
     // buildDir = c:/temp/${rootProject.name}/${project.name}
     repositories {
-        all { ArtifactRepository repo ->
-            if (repo.url.toString().contains("jcenter.bintray.com")) {
-                remove repo
-                mavenCentral()
-            }
-        }
-        google()
-        maven { url 'https://jitpack.io' }
         maven {
             url "$rootDir/../node_modules/@notifee/react-native/android/libs"
         }

android/gradle/wrapper/gradle-wrapper.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.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
 validateDistributionUrl=true
 networkTimeout=10000

ios/DeveloperApp/Info.plist

@@ -67,8 +67,6 @@
 	<string>To use that feature the app needs access to your media library.</string>
 	<key>NSBluetoothAlwaysUsageDescription</key>
 	<string>${BLUETOOTH_USAGE_DESCRIPTION}</string>
-	<key>NSBluetoothPeripheralUsageDescription</key>
-	<string>${BLUETOOTH_USAGE_DESCRIPTION}</string>
 	<key>NSCalendarsUsageDescription</key>
 	<string>${CALENDARS_USAGE_DESCRIPTION}</string>
 	<key>NSCameraUsageDescription</key>

ios/Podfile

@@ -48,7 +48,6 @@ target 'DeveloperApp' do
     :fabric_enabled => true,
     :app_path => "#{Pod::Config.instance.installation_root}/.."
   )
-  pod 'react-native-ble-plx', :path => '../node_modules/react-native-ble-plx'
   pod 'react-native-google-maps', :path => '../node_modules/react-native-maps'
   pod 'GoogleMaps'
   pod 'Google-Maps-iOS-Utils'

ios/Podfile.lock

@@ -202,7 +202,7 @@ PODS:
     - SocketRocket
     - SSZipArchive
     - Yoga
-  - MultiplatformBleAdapter (0.1.9)
+  - MultiplatformBleAdapter (0.2.0)
   - nanopb (2.30910.0):
     - nanopb/decode (= 2.30910.0)
     - nanopb/encode (= 2.30910.0)
@@ -2126,9 +2126,35 @@ PODS:
     - React-RCTFBReactNativeSpec
     - ReactCommon/turbomodule/core
     - SocketRocket
-  - react-native-ble-plx (2.0.3):
-    - MultiplatformBleAdapter (= 0.1.9)
+  - react-native-ble-plx (3.5.1):
+    - boost
+    - DoubleConversion
+    - fast_float
+    - fmt
+    - glog
+    - hermes-engine
+    - MultiplatformBleAdapter (= 0.2.0)
+    - RCT-Folly
+    - RCT-Folly/Fabric
+    - RCTRequired
+    - RCTTypeSafety
     - React-Core
+    - React-debug
+    - React-Fabric
+    - React-featureflags
+    - React-graphics
+    - React-ImageManager
+    - React-jsi
+    - React-NativeModulesApple
+    - React-RCTFabric
+    - React-renderercss
+    - React-rendererdebug
+    - React-utils
+    - ReactCodegen
+    - ReactCommon/turbomodule/bridging
+    - ReactCommon/turbomodule/core
+    - SocketRocket
+    - Yoga
   - react-native-blob-util (0.24.7):
     - boost
     - DoubleConversion
@@ -4214,11 +4240,11 @@ SPEC CHECKSUMS:
   GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a
   GoogleMaps: 8939898920281c649150e0af74aa291c60f2e77d
   GoogleUtilities: ea963c370a38a8069cc5f7ba4ca849a60b6d7d15
-  hermes-engine: 9909ca521b44677f3244c0ddbe64a261fbc506d7
+  hermes-engine: d6436b1abe54ecbd1c6f6b72cfe18ebefa2bb3e3
   IQKeyboardManager: c8665b3396bd0b79402b4c573eac345a31c7d485
   libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
   MendixNative: 91822aad01e73d9afe13953415824bd451b809d9
-  MultiplatformBleAdapter: 5a6a897b006764392f9cef785e4360f54fb9477d
+  MultiplatformBleAdapter: b1fddd0d499b96b607e00f0faa8e60648343dc1d
   nanopb: 438bc412db1928dac798aa6fd75726007be04262
   op-sqlite: 64000c0da2357c4d73faf4d23ff34dd1ddb332d4
   OpenSSL-Universal: 9110d21982bb7e8b22a962b6db56a8aa805afde7
@@ -4261,7 +4287,7 @@ SPEC CHECKSUMS:
   React-logger: 993e4b9793768764e0fdd379ad1d6582f7905463
   React-Mapbuffer: 3a5f700ed673820ab4b1b35ba0cf8476400bc4c5
   React-microtasksnativemodule: 094677e625f12276a8f871844a5ee6a945a90221
-  react-native-ble-plx: 2dd8780ee8d34c60399aaa897249ed1860ebef10
+  react-native-ble-plx: 152b07bdf772c95e30c0251649d462b5154a0e13
   react-native-blob-util: 6dec9023ecc3ee5ac8ad377598e943f9ca63f741
   react-native-cameraroll: bb98380ee21115d5fe1ae0f8b80c86e044613746
   react-native-file-viewer-turbo: 360bf8416154b6c9de8c8f377fcb60d05e0f9838
@@ -4342,6 +4368,6 @@ SPEC CHECKSUMS:
   VisionCamera: 7187b3dac1ff3071234ead959ce311875748e14f
   Yoga: b669e79fa0f8d3f6f5e35372345f54b99e06b13c
 
-PODFILE CHECKSUM: 4055089adb603ffbf3447d2f4b53833e1309be14
+PODFILE CHECKSUM: dfd6edcdfb21607087b6c181b325f90fb96b198d
 
 COCOAPODS: 1.16.2