Skip to content
Merged
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 .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,6 @@ android/\.settings/org\.eclipse\.buildship\.core\.prefs
android/mendixnative-release/\.project

android/mendixnative-release/\.settings/org\.eclipse\.buildship\.core\.prefs

android/**/.cxx/
android/.kotlin/
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
source 'https://rubygems.org'

# You may use http://rbenv.org/ or https://rvm.io/ to install and use this version
ruby ">= 2.7.8"
ruby ">= 2.6.10"

# Exclude problematic versions of cocoapods and activesupport that causes build failures.
gem 'cocoapods', '>= 1.13', '!= 1.15.0', '!= 1.15.1'
gem 'cocoapods', '= 1.16.2'
gem 'activesupport', '>= 6.1.7.5', '!= 7.1.0'
gem 'xcodeproj', '< 1.26.0'
gem 'xcodeproj', '>= 1.27.0'
gem 'concurrent-ruby', '< 1.3.4'
140 changes: 140 additions & 0 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -0,0 +1,140 @@
GEM
remote: https://rubygems.org/
specs:
CFPropertyList (3.0.7)
base64
nkf
rexml
activesupport (7.2.2.2)
base64
benchmark (>= 0.3)
bigdecimal
concurrent-ruby (~> 1.0, >= 1.3.1)
connection_pool (>= 2.2.5)
drb
i18n (>= 1.6, < 2)
logger (>= 1.4.2)
minitest (>= 5.1)
securerandom (>= 0.3)
tzinfo (~> 2.0, >= 2.0.5)
addressable (2.8.7)
public_suffix (>= 2.0.2, < 7.0)
algoliasearch (1.27.5)
httpclient (~> 2.8, >= 2.8.3)
json (>= 1.5.1)
atomos (0.1.3)
base64 (0.3.0)
benchmark (0.5.0)
bigdecimal (3.3.1)
claide (1.1.0)
cocoapods (1.16.2)
addressable (~> 2.8)
claide (>= 1.0.2, < 2.0)
cocoapods-core (= 1.16.2)
cocoapods-deintegrate (>= 1.0.3, < 2.0)
cocoapods-downloader (>= 2.1, < 3.0)
cocoapods-plugins (>= 1.0.0, < 2.0)
cocoapods-search (>= 1.0.0, < 2.0)
cocoapods-trunk (>= 1.6.0, < 2.0)
cocoapods-try (>= 1.1.0, < 2.0)
colored2 (~> 3.1)
escape (~> 0.0.4)
fourflusher (>= 2.3.0, < 3.0)
gh_inspector (~> 1.0)
molinillo (~> 0.8.0)
nap (~> 1.0)
ruby-macho (>= 2.3.0, < 3.0)
xcodeproj (>= 1.27.0, < 2.0)
cocoapods-core (1.16.2)
activesupport (>= 5.0, < 8)
addressable (~> 2.8)
algoliasearch (~> 1.0)
concurrent-ruby (~> 1.1)
fuzzy_match (~> 2.0.4)
nap (~> 1.0)
netrc (~> 0.11)
public_suffix (~> 4.0)
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.5)
cocoapods-downloader (2.1)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.1)
cocoapods-trunk (1.6.0)
nap (>= 0.8, < 2.0)
netrc (~> 0.11)
cocoapods-try (1.2.0)
colored2 (3.1.2)
concurrent-ruby (1.3.3)
connection_pool (2.5.4)
drb (2.2.3)
escape (0.0.4)
ethon (0.15.0)
ffi (>= 1.15.0)
ffi (1.17.2)
ffi (1.17.2-aarch64-linux-gnu)
ffi (1.17.2-aarch64-linux-musl)
ffi (1.17.2-arm-linux-gnu)
ffi (1.17.2-arm-linux-musl)
ffi (1.17.2-arm64-darwin)
ffi (1.17.2-x86-linux-gnu)
ffi (1.17.2-x86-linux-musl)
ffi (1.17.2-x86_64-darwin)
ffi (1.17.2-x86_64-linux-gnu)
ffi (1.17.2-x86_64-linux-musl)
fourflusher (2.3.1)
fuzzy_match (2.0.4)
gh_inspector (1.1.3)
httpclient (2.9.0)
mutex_m
i18n (1.14.7)
concurrent-ruby (~> 1.0)
json (2.15.1)
logger (1.7.0)
minitest (5.26.0)
molinillo (0.8.0)
mutex_m (0.3.0)
nanaimo (0.4.0)
nap (1.1.0)
netrc (0.11.0)
nkf (0.2.0)
public_suffix (4.0.7)
rexml (3.4.4)
ruby-macho (2.5.1)
securerandom (0.4.1)
typhoeus (1.5.0)
ethon (>= 0.9.0, < 0.16.0)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
xcodeproj (1.27.0)
CFPropertyList (>= 2.3.3, < 4.0)
atomos (~> 0.1.3)
claide (>= 1.0.2, < 2.0)
colored2 (~> 3.1)
nanaimo (~> 0.4.0)
rexml (>= 3.3.6, < 4.0)

PLATFORMS
aarch64-linux-gnu
aarch64-linux-musl
arm-linux-gnu
arm-linux-musl
arm64-darwin
ruby
x86-linux-gnu
x86-linux-musl
x86_64-darwin
x86_64-linux-gnu
x86_64-linux-musl

DEPENDENCIES
activesupport (>= 6.1.7.5, != 7.1.0)
cocoapods (= 1.16.2)
concurrent-ruby (< 1.3.4)
xcodeproj (>= 1.27.0)

RUBY VERSION
ruby 3.2.7p253

BUNDLED WITH
2.7.2
3 changes: 1 addition & 2 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,6 @@ dependencies {
implementation("com.facebook.react:hermes-android")

implementation project(':react-native-localize')
implementation project(":mendixnative-release")

// Explicit add okhttp
implementation("com.squareup.okhttp3:okhttp:4.9.1")
Expand Down Expand Up @@ -160,5 +159,5 @@ task copyDownloadableDepsToLibs(type: Copy) {
into "libs"
}

apply from: file("../../node_modules/@mendix/native/androidlib/mendix.gradle"); applyMendixGradle(project)
apply from: file("../../node_modules/mendix-native/android/mendix.gradle"); applyMendixGradle(project)
apply from: "../../node_modules/react-native-vector-icons/fonts.gradle"
2 changes: 1 addition & 1 deletion android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ buildscript {
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'
apply from: file("../node_modules/@mendix/native/androidlib/mendix.gradle"); applyMendixClassPaths(project)
apply from: file("../node_modules/mendix-native/android/mendix.gradle"); applyMendixClassPaths(project)

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
3 changes: 1 addition & 2 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ org.gradle.configureondemand=true
android.disableResourceValidation=true
android.nonTransitiveRClass=true
android.suppressUnsupportedCompileSdk=33
# enabled by default in RN 0.76 so we need to disable it explicitly
newArchEnabled=false
newArchEnabled=true
hermesEnabled=true
mendixnative.cookieEncryption=false
VisionCamera_enableCodeScanner=true
Expand Down
3 changes: 0 additions & 3 deletions android/settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,4 @@ rootProject.name = 'nativeTemplate'

includeBuild('../node_modules/@react-native/gradle-plugin')

include ':mendixnative-release'
project(':mendixnative-release').projectDir = new File(rootProject.projectDir, '../node_modules/@mendix/native/androidlib')

include ':app'
10 changes: 0 additions & 10 deletions ios/AppDelegate.h

This file was deleted.

96 changes: 0 additions & 96 deletions ios/AppDelegate.m

This file was deleted.

65 changes: 65 additions & 0 deletions ios/AppDelegate.swift
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
import MendixNative

@UIApplicationMain
class AppDelegate: ReactAppProvider, UNUserNotificationCenterDelegate {

var shouldOpenInLastApp = false
var hasHandledLaunchAppWithOptions = false

override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {

setupApp(application: application, launchOptions: launchOptions)
MendixAppDelegate.delegate = self
UNUserNotificationCenter.current().delegate = self
MendixAppDelegate.application(application, didFinishLaunchingWithOptions: launchOptions)

changeRoot(to: UIViewController())

guard let url = Bundle.main.object(forInfoDictionaryKey: "Runtime url") as? String, !url.isEmpty else {
showUnrecoverableDialog(
title: "The runtime URL is missing",
message: "Missing the 'Runtime url' configuration within the Info.plist file. The app will close."
)
return false
}

if let bundleUrl = MendixAppDelegate.getJSBundleFile() {

let runtimeUrl = AppUrl.forRuntime((url).replacingOccurrences(of: "\\", with: ""))

let mendixApp = MendixApp(
identifier: nil,
bundleUrl: bundleUrl,
runtimeUrl: runtimeUrl,
warningsFilter: .none,
isDeveloperApp: false,
clearDataAtLaunch: false,
splashScreenPresenter: SplashScreenPresenter(),
reactLoading: nil,
enableThreeFingerGestures: false
)

ReactNative.shared.setup(mendixApp, launchOptions: launchOptions)
ReactNative.shared.start()
} else {
showUnrecoverableDialog(
title: "No Mendix bundle found",
message: "Missing the Mendix app bundle. Make sure that the index.ios.bundle file is available in ios/NativeTemplate/Bundle folder. If building locally consult the documentation on how to generate a bundle from your project."
)
}

return true
}

override func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool {
return MendixAppDelegate.application(app, openURL: url, options: options)
}

func getWarningFilterValue() -> WarningsFilter {
return .none
}

func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) {
MendixAppDelegate.userNotificationCenter(center, willPresentNotification: notification, withCompletionHandler: completionHandler)
}
}
Loading