Skip to content

Commit 51f3650

Browse files
Merge pull request #1225 from mendix/moo/MOO-2316-upgrade-rn-v084
[MOO-2316]: Upgrade RN to 0.84.1 (and dependencies)
2 parents b4fd7d1 + 2164cde commit 51f3650

14 files changed

Lines changed: 1462 additions & 1622 deletions

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Native Template
22

33
![License](https://img.shields.io/badge/license-MIT-blue.svg)
4-
![React Native](https://img.shields.io/badge/react_native-0.75.4-blue.svg)
4+
![React Native](https://img.shields.io/badge/react_native-0.84.1-blue.svg)
55
![Node](https://img.shields.io/badge/node-v20-green.svg)
66

77
![Custom Dev App CI - Android](https://github.com/mendix/native-template/actions/workflows/android-build-custom-dev-app.yml/badge.svg?branch=master)

android/app/src/dev/res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@
88
<string name="camera_permission_button">Continue</string>
99
<string name="packager_connection_timeout">Please verify that your Mendix App is running.</string>
1010
<string name="qr_code_invalid">This is not a valid QR code.</string>
11+
<string name="enable_dev_mode">Enable dev mode</string>
12+
<string name="clear_data">Clear data</string>
1113
</resources>

android/gradle.properties

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ android.nonTransitiveRClass=true
2424
android.suppressUnsupportedCompileSdk=33
2525
newArchEnabled=true
2626
hermesEnabled=true
27+
hermesV1Enabled=false
2728
mendixnative.cookieEncryption=false
2829
VisionCamera_enableCodeScanner=true
2930

ios/Dev/MendixApp/MendixAppViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import UIKit
22
import MendixNative
33

4-
class MendixAppViewController: UIViewController, ReactNativeDelegate {
4+
class MendixAppViewController: UIViewController, ReactNativeDelegateInternal {
55
override func viewDidLoad() {
66
super.viewDidLoad()
77

ios/Dev/MendixApp/MendixReactWindowExtensions.swift

Lines changed: 0 additions & 13 deletions
This file was deleted.

ios/Extensions/AppDelegate+Extension.swift

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
import Foundation
22
import MendixNative
3-
import React_RCTAppDelegate
4-
#if canImport(ReactAppDependencyProvider)
5-
import ReactAppDependencyProvider
6-
#endif
73

84
extension AppDelegate {
95

@@ -22,20 +18,14 @@ extension AppDelegate {
2218
func showUnrecoverableDialog(title: String, message: String) {
2319
let controller = UIAlertController(title: title, message: message, preferredStyle: .alert)
2420
controller.addAction(.init(title: "Close", style: .default, handler: {_ in
25-
fatalError(message)
21+
print(message)
22+
exit(0)
2623
}))
2724
window?.rootViewController?.present(controller, animated: true, completion: nil)
2825
}
2926

3027
func setupApp(application: UIApplication, launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) {
31-
#if canImport(ReactAppDependencyProvider)
32-
let appDependencyProvider: any RCTDependencyProvider = RCTAppDependencyProvider()
33-
setUpProvider(dependencyProvider: appDependencyProvider)
34-
#else
3528
setUpProvider()
36-
#endif
37-
38-
super.application(application, didFinishLaunchingWithOptions: launchOptions)
3929
clearKeychain()
4030
setupUI()
4131
}

ios/Podfile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ ENV['RCT_NEW_ARCH_ENABLED'] = '1'
1616
ENV['RCT_USE_PREBUILT_RNCORE'] = '0'
1717
ENV['RCT_USE_RN_DEP'] = '0'
1818

19+
# The JS bundle is compiled compiled using a different version than the prebuilt Hermes engine embedded in the native binary, causing a runtime crash.
20+
ENV['RCT_HERMES_V1_ENABLED'] = '0'
21+
1922
# Use it to require both react-native's and this package's scripts:
2023
node_require('react-native/scripts/react_native_pods.rb')
2124
node_require('react-native-permissions/scripts/setup.rb')

0 commit comments

Comments
 (0)