Skip to content

Commit 5514431

Browse files
author
Srirang.Kalantri
committed
chore: merge branch master
2 parents 8b479c4 + 2fcf1c1 commit 5514431

24 files changed

Lines changed: 3540 additions & 2720 deletions

.mx/releases_list.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,16 @@
11
[
2+
{
3+
"id": 311056037,
4+
"tag_name": "v19.0.0",
5+
"name": "Release 19.0.0",
6+
"draft": false,
7+
"prerelease": false,
8+
"body": "* We upgraded the core stack to React Native `0.83.4` and aligned related React dependencies.\r\n* We upgraded multiple React Native ecosystem dependencies for compatibility and stability (including CLI, navigation, animation, media, and platform modules).\r\n* We migrated from `react-native-vector-icons` to the scoped `@react-native-vector-icons/*` package set.\r\n* We updated `.gitignore` to more precisely exclude `node_modules` directories in specific locations.\r\n* We added a new dependency for `@shopify/flash-list` to support the migration from FlatList to FlashList.\r\n* We upgraded `react-native-tab-view` from 3.5.2 to 4.3.0.\r\n* Fix the iOS builds crashing when building with Xcode 26.",
9+
"created_at": "2026-04-20T07:57:36Z",
10+
"published_at": "2026-04-20T08:00:20Z",
11+
"tarball_url": "https://api.github.com/repos/mendix/native-template/tarball/v19.0.0",
12+
"zipball_url": "https://api.github.com/repos/mendix/native-template/zipball/v19.0.0"
13+
},
214
{
315
"id": 306566142,
416
"tag_name": "v18.0.1",
@@ -1186,17 +1198,5 @@
11861198
"published_at": "2024-01-18T13:04:06Z",
11871199
"tarball_url": "https://api.github.com/repos/mendix/native-template/tarball/v8.0.2",
11881200
"zipball_url": "https://api.github.com/repos/mendix/native-template/zipball/v8.0.2"
1189-
},
1190-
{
1191-
"id": 137413792,
1192-
"tag_name": "v8.0.1",
1193-
"name": "Release 8.0.1",
1194-
"draft": false,
1195-
"prerelease": false,
1196-
"body": "## Fixed\r\n\r\n- We updated `react-native-vector-icons` to version `10.0.3`\r\n",
1197-
"created_at": "2024-01-17T15:59:02Z",
1198-
"published_at": "2024-01-17T16:02:00Z",
1199-
"tarball_url": "https://api.github.com/repos/mendix/native-template/tarball/v8.0.1",
1200-
"zipball_url": "https://api.github.com/repos/mendix/native-template/zipball/v8.0.1"
12011201
}
12021202
]

CHANGELOG.md

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,12 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
66

77
## [Unreleased]
88

9+
- We upgraded the core stack to React Native `0.83.4` and aligned related React dependencies.
10+
- We upgraded multiple React Native ecosystem dependencies for compatibility and stability (including CLI, navigation, animation, media, and platform modules).
11+
- We migrated from `react-native-vector-icons` to the scoped `@react-native-vector-icons/*` package set.
912
- We updated `.gitignore` to more precisely exclude `node_modules` directories in specific locations.
1013
- We added a new dependency for `@shopify/flash-list` to support the migration from FlatList to FlashList.
14+
- We upgraded `react-native-tab-view` from 3.5.2 to 4.3.0.
1115
- Fix the iOS builds crashing when building with Xcode 26.
1216

1317
## [17.0.4] - 2026-01-22
@@ -95,10 +99,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
9599

96100
- We have updated React Navigation to V7
97101
- We have updated the following additional dependencies:
98-
react-native-reanimated to 3.16.1
99-
react-native-screens to 4.4.0
100-
react-native-image-picker to 7.2.3
101-
@react-native-community/netinfo to 11.4.1
102+
react-native-reanimated to 3.16.1
103+
react-native-screens to 4.4.0
104+
react-native-image-picker to 7.2.3
105+
@react-native-community/netinfo to 11.4.1
102106
- We're now using @gorhom/bottom-sheet for bottom sheet implementation
103107
- We have added the option to enable or disable cookie encryption for Android devices.
104108

android/app/build.gradle

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ dependencies {
131131
implementation("com.fasterxml.jackson.core:jackson-core:2.11.3")
132132
implementation("com.fasterxml.jackson.core:jackson-databind:2.11.3")
133133
implementation("com.fasterxml.jackson.core:jackson-annotations:2.11.3")
134-
implementation "androidx.security:security-crypto:1.1.0-alpha06"
134+
implementation "androidx.security:security-crypto:1.1.0"
135135

136136
// Required for Custom Dev Apps
137137
devImplementation "androidx.constraintlayout:constraintlayout:2.0.4"
@@ -159,4 +159,3 @@ task copyDownloadableDepsToLibs(type: Copy) {
159159
}
160160

161161
apply from: file("../../node_modules/mendix-native/android/mendix.gradle"); applyMendixGradle(project)
162-
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"

android/build.gradle

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
buildscript {
22
ext {
3-
buildToolsVersion = "35.0.0"
4-
minSdkVersion = 24
5-
compileSdkVersion = 35
6-
targetSdkVersion = 35
7-
kotlinVersion = "1.9.24"
3+
buildToolsVersion = "36.0.0"
4+
minSdkVersion = 29
5+
compileSdkVersion = 36
6+
targetSdkVersion = 36
7+
kotlinVersion = "2.1.20"
88
excludeAppGlideModule = true
99
androidx_lifecycle_version = "2.8.6"
1010
playServicesVersion = "18+"
@@ -25,10 +25,10 @@ buildscript {
2525
}
2626
}
2727
dependencies {
28-
classpath "com.android.tools.build:gradle:8.8.2"
28+
classpath 'com.android.tools.build:gradle'
2929
classpath "com.facebook.react:react-native-gradle-plugin"
3030
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
31-
classpath 'org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21'
31+
classpath 'org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.10'
3232
apply from: file("../node_modules/mendix-native/android/mendix.gradle"); applyMendixClassPaths(project)
3333

3434
// NOTE: Do not place your application dependencies here; they belong

android/gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
77
validateDistributionUrl=true
88
networkTimeout=10000

docs/version-compatibility/native_template_versions.json

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
{
2+
">=11.10.0": {
3+
"max": "19.*.*",
4+
"min": "19.0.0",
5+
"androidSdk": {
6+
"min": "29",
7+
"compile": "36",
8+
"target": "36"
9+
},
10+
"gradle": null,
11+
"iosMinSdk": "15.5"
12+
},
213
">=11.9.0": {
314
"max": "18.*.*",
415
"min": "18.0.0",

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@ end
1212
# Explicitly enable new architecture
1313
ENV['RCT_NEW_ARCH_ENABLED'] = '1'
1414

15+
# Build React Native from source so patch-package changes to native RN code are compiled.
16+
ENV['RCT_USE_PREBUILT_RNCORE'] = '0'
17+
ENV['RCT_USE_RN_DEP'] = '0'
18+
1519
# Use it to require both react-native's and this package's scripts:
1620
node_require('react-native/scripts/react_native_pods.rb')
1721
node_require('react-native-permissions/scripts/setup.rb')

0 commit comments

Comments
 (0)