Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),

## [Unreleased]

- We upgraded the core stack to React Native `0.83.2` and aligned related React dependencies.
- We upgraded multiple React Native ecosystem dependencies for compatibility and stability (including CLI, navigation, animation, media, and platform modules).
- We migrated from `react-native-vector-icons` to the scoped `@react-native-vector-icons/*` package set.
- We updated `.gitignore` to more precisely exclude `node_modules` directories in specific locations.
- We added a new dependency for `@shopify/flash-list` to support the migration from FlatList to FlashList.

Expand Down
3 changes: 1 addition & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ dependencies {
implementation("com.fasterxml.jackson.core:jackson-core:2.11.3")
implementation("com.fasterxml.jackson.core:jackson-databind:2.11.3")
implementation("com.fasterxml.jackson.core:jackson-annotations:2.11.3")
implementation "androidx.security:security-crypto:1.1.0-alpha06"
implementation "androidx.security:security-crypto:1.1.0"

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

apply from: file("../../node_modules/mendix-native/android/mendix.gradle"); applyMendixGradle(project)
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
14 changes: 7 additions & 7 deletions android/build.gradle
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
buildscript {
ext {
buildToolsVersion = "35.0.0"
minSdkVersion = 24
compileSdkVersion = 35
targetSdkVersion = 35
kotlinVersion = "1.9.24"
buildToolsVersion = "36.0.0"
minSdkVersion = 29
compileSdkVersion = 36
targetSdkVersion = 36
kotlinVersion = "2.1.20"
excludeAppGlideModule = true
androidx_lifecycle_version = "2.8.6"
playServicesVersion = "18+"
Expand All @@ -25,10 +25,10 @@ buildscript {
}
}
dependencies {
classpath "com.android.tools.build:gradle:8.8.2"
classpath 'com.android.tools.build:gradle'
classpath "com.facebook.react:react-native-gradle-plugin"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath 'org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.0.21'
classpath 'org.jetbrains.kotlin:compose-compiler-gradle-plugin:2.2.10'
apply from: file("../node_modules/mendix-native/android/mendix.gradle"); applyMendixClassPaths(project)

// NOTE: Do not place your application dependencies here; they belong
Expand Down
2 changes: 1 addition & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip
validateDistributionUrl=true
networkTimeout=10000
8 changes: 4 additions & 4 deletions ios/Dev/AppDelegate.swift
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ class AppDelegate: ReactAppProvider {

let controller = UIStoryboard.launchApp.instantiateInitialViewController() ?? UIViewController()
changeRoot(to: controller)
window.isUserInteractionEnabled = true
window?.isUserInteractionEnabled = true

return true
}
Expand All @@ -30,7 +30,7 @@ class AppDelegate: ReactAppProvider {
#endif
}

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

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

Expand Down Expand Up @@ -69,11 +69,11 @@ class AppDelegate: ReactAppProvider {
return handled
}

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

override func applicationDidEnterBackground(_ application: UIApplication) {
func applicationDidEnterBackground(_ application: UIApplication) {
SessionCookieStore.persist() //iOS does not persist session cookies across app restarts, this helps persisting session cookies to match behaviour with Android
}
}
12 changes: 11 additions & 1 deletion ios/Extensions/AppDelegate+Extension.swift
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
import Foundation
import MendixNative
import React_RCTAppDelegate
#if canImport(ReactAppDependencyProvider)
import ReactAppDependencyProvider
#endif

extension AppDelegate {

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

func setupApp(application: UIApplication, launchOptions: [UIApplication.LaunchOptionsKey: Any]? = nil) {
#if canImport(ReactAppDependencyProvider)
let appDependencyProvider: any RCTDependencyProvider = RCTAppDependencyProvider()
setUpProvider(dependencyProvider: appDependencyProvider)
#else
setUpProvider()
#endif

super.application(application, didFinishLaunchingWithOptions: launchOptions)
clearKeychain()
setupUI()
Expand Down
4 changes: 4 additions & 0 deletions ios/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,10 @@ end
# Explicitly enable new architecture
ENV['RCT_NEW_ARCH_ENABLED'] = '1'

# Use prebuilt React Native binaries instead of building from source
ENV['RCT_USE_PREBUILT_RNCORE'] = '1'
ENV['RCT_USE_RN_DEP'] = '1'

# Use it to require both react-native's and this package's scripts:
node_require('react-native/scripts/react_native_pods.rb')
node_require('react-native-permissions/scripts/setup.rb')
Expand Down
Loading