Skip to content

Commit d9df742

Browse files
committed
chore: upgrade MendixNative to version 0.4.4 and update related configurations
1 parent 6b36a1e commit d9df742

8 files changed

Lines changed: 26 additions & 12 deletions

File tree

ios/Dev/AppDelegate.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class AppDelegate: ReactAppProvider {
1717

1818
let controller = UIStoryboard.launchApp.instantiateInitialViewController() ?? UIViewController()
1919
changeRoot(to: controller)
20-
window.isUserInteractionEnabled = true
20+
window?.isUserInteractionEnabled = true
2121

2222
return true
2323
}
@@ -30,7 +30,7 @@ class AppDelegate: ReactAppProvider {
3030
#endif
3131
}
3232

33-
override func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
33+
func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {
3434

3535
let handled = MendixAppDelegate.application(app, openURL: url, options: options)
3636

@@ -69,11 +69,11 @@ class AppDelegate: ReactAppProvider {
6969
return handled
7070
}
7171

72-
override func applicationWillTerminate(_ application: UIApplication) {
72+
func applicationWillTerminate(_ application: UIApplication) {
7373
SessionCookieStore.persist() //iOS does not persist session cookies across app restarts, this helps persisting session cookies to match behaviour with Android
7474
}
7575

76-
override func applicationDidEnterBackground(_ application: UIApplication) {
76+
func applicationDidEnterBackground(_ application: UIApplication) {
7777
SessionCookieStore.persist() //iOS does not persist session cookies across app restarts, this helps persisting session cookies to match behaviour with Android
7878
}
7979
}

ios/Extensions/AppDelegate+Extension.swift

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

48
extension AppDelegate {
59

@@ -20,11 +24,17 @@ extension AppDelegate {
2024
controller.addAction(.init(title: "Close", style: .default, handler: {_ in
2125
fatalError(message)
2226
}))
23-
window.rootViewController?.present(controller, animated: true, completion: nil)
27+
window?.rootViewController?.present(controller, animated: true, completion: nil)
2428
}
2529

2630
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
2735
setUpProvider()
36+
#endif
37+
2838
super.application(application, didFinishLaunchingWithOptions: launchOptions)
2939
clearKeychain()
3040
setupUI()

ios/Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ PODS:
2121
- libwebp/sharpyuv (1.5.0)
2222
- libwebp/webp (1.5.0):
2323
- libwebp/sharpyuv
24-
- MendixNative (0.4.2):
24+
- MendixNative (0.4.4):
2525
- hermes-engine
2626
- RCTRequired
2727
- RCTTypeSafety
@@ -2884,7 +2884,7 @@ SPEC CHECKSUMS:
28842884
libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7
28852885
libdav1d: 23581a4d8ec811ff171ed5e2e05cd27bad64c39f
28862886
libwebp: 02b23773aedb6ff1fd38cec7a77b81414c6842a8
2887-
MendixNative: f05c5a9b83f7dffca3ea5c9dc3ce0253d119b23d
2887+
MendixNative: 35add6550b0eda1a6ae475c8123960b75af94ed1
28882888
op-sqlite: e9ef65bcf95a97863874cee87841425bb71c8396
28892889
OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2
28902890
RCTDeprecation: a522c536d2c7be8f518dd834883cf6dce1d4f545

ios/nativeTemplate/Info-dev.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>en</string>
79
<key>CFBundleDisplayName</key>

ios/nativeTemplate/Info.plist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
33
<plist version="1.0">
44
<dict>
5+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
57
<key>CFBundleDevelopmentRegion</key>
68
<string>en</string>
79
<key>CFBundleDisplayName</key>
Binary file not shown.

package-lock.json

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
"dependencies": {
1111
"@d11/react-native-fast-image": "8.13.0",
1212
"@gorhom/bottom-sheet": "5.1.8",
13-
"mendix-native": "file:./package-0.4.3.tgz",
13+
"mendix-native": "file:./package-0.4.4.tgz",
1414
"@op-engineering/op-sqlite": "15.2.5",
1515
"@shopify/flash-list": "2.2.2",
1616
"@react-native-async-storage/async-storage": "2.2.0",

0 commit comments

Comments
 (0)