diff --git a/.github/workflows/ios-build-custom-dev-app.yml b/.github/workflows/ios-build-custom-dev-app.yml index 0b9ecdd83..d87b56823 100644 --- a/.github/workflows/ios-build-custom-dev-app.yml +++ b/.github/workflows/ios-build-custom-dev-app.yml @@ -38,8 +38,12 @@ jobs: path: ios/Pods key: ${{ runner.os }}-pods-${{ hashFiles('**/Podfile.lock') }} + - name: bundle install + run: bundle install + working-directory: ./ios + - name: pod install - run: pod install + run: bundle exec pod install working-directory: ./ios - name: appcenter prebuilt script test diff --git a/.nvmrc b/.nvmrc index 9a2a0e219..cabf43b5d 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v20 +24 \ No newline at end of file diff --git a/Gemfile.lock b/Gemfile.lock index 1be6889df..0b36a0655 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -129,8 +129,12 @@ PLATFORMS DEPENDENCIES activesupport (>= 6.1.7.5, != 7.1.0) + benchmark + bigdecimal cocoapods (= 1.16.2) concurrent-ruby (< 1.3.4) + logger + mutex_m xcodeproj (>= 1.27.0) RUBY VERSION diff --git a/ios/AppDelegate.swift b/ios/AppDelegate.swift index 799ae945a..3d0472dec 100644 --- a/ios/AppDelegate.swift +++ b/ios/AppDelegate.swift @@ -6,7 +6,7 @@ class AppDelegate: ReactAppProvider { var shouldOpenInLastApp = false var hasHandledLaunchAppWithOptions = false - override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool { + override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { MendixAppDelegate.application(application, didFinishLaunchingWithOptions: launchOptions) setupApp(application: application, launchOptions: launchOptions) @@ -48,7 +48,7 @@ class AppDelegate: ReactAppProvider { return true } - override func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool { + override func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool { return MendixAppDelegate.application(app, openURL: url, options: options) } diff --git a/ios/Config/config.release.xcconfig b/ios/Config/config.release.xcconfig index 6d6d89a6d..f7b4d8228 100644 --- a/ios/Config/config.release.xcconfig +++ b/ios/Config/config.release.xcconfig @@ -1,2 +1,3 @@ #include "Pods/Target Support Files/Pods-nativeTemplate/Pods-nativeTemplate.release.xcconfig" +#include "Pods/Target Support Files/Pods-nativeTemplate/Pods-nativeTemplate.releasedevapp.xcconfig" #include "config.xcconfig" diff --git a/ios/Dev/AppDelegate.swift b/ios/Dev/AppDelegate.swift index c6e398093..459176add 100644 --- a/ios/Dev/AppDelegate.swift +++ b/ios/Dev/AppDelegate.swift @@ -7,7 +7,7 @@ class AppDelegate: ReactAppProvider { var shouldOpenInLastApp = false var hasHandledLaunchAppWithOptions = false - override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool { + override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool { MendixAppDelegate.application(application, didFinishLaunchingWithOptions: launchOptions) setupApp(application: application, launchOptions: launchOptions) @@ -29,7 +29,7 @@ class AppDelegate: ReactAppProvider { #endif } - override func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool { + override func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool { let handled = MendixAppDelegate.application(app, openURL: url, options: options) @@ -47,8 +47,8 @@ class AppDelegate: ReactAppProvider { ) let launchOptions = NSMutableDictionary(dictionary: options) - launchOptions[UIApplicationLaunchOptionsKey.url] = url - launchOptions[UIApplicationOpenURLOptionsKey.annotation] = options[UIApplicationOpenURLOptionsKey.annotation] + launchOptions[UIApplication.LaunchOptionsKey.url] = url + launchOptions[UIApplication.OpenURLOptionsKey.annotation] = options[UIApplication.OpenURLOptionsKey.annotation] let mxApp = MendixApp.init( identifier: nil, diff --git a/ios/Dev/Config/config.release.xcconfig b/ios/Dev/Config/config.release.xcconfig index 2f384cc7a..89d4ddcff 100644 --- a/ios/Dev/Config/config.release.xcconfig +++ b/ios/Dev/Config/config.release.xcconfig @@ -1,2 +1,3 @@ +#include "Pods/Target Support Files/Pods-dev/Pods-dev.release.xcconfig" #include "Pods/Target Support Files/Pods-dev/Pods-dev.releasedevapp.xcconfig" #include "config.xcconfig" diff --git a/ios/Dev/LaunchApp/LaunchAppViewController.swift b/ios/Dev/LaunchApp/LaunchAppViewController.swift index 40e60fa94..968ebc081 100644 --- a/ios/Dev/LaunchApp/LaunchAppViewController.swift +++ b/ios/Dev/LaunchApp/LaunchAppViewController.swift @@ -101,7 +101,7 @@ class LaunchAppViewController: UIViewController, QRViewDelegate { textField.layer.cornerRadius = 30 if let placeHolderText = textField.placeholder { - textField.attributedPlaceholder = NSAttributedString(string: placeHolderText, attributes: [NSAttributedStringKey.foregroundColor: UIColor.lightGray]) + textField.attributedPlaceholder = NSAttributedString(string: placeHolderText, attributes: [NSAttributedString.Key.foregroundColor: UIColor.lightGray]) } } @@ -163,22 +163,22 @@ extension LaunchAppViewController { } private func registerNotificationObservers() { - NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: .UIKeyboardWillShow, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: .UIKeyboardWillHide, object: nil) - NotificationCenter.default.addObserver(self, selector: #selector(deviceRotated), name: .UIDeviceOrientationDidChange, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillShow), name: UIResponder.keyboardWillShowNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide), name: UIResponder.keyboardWillHideNotification, object: nil) + NotificationCenter.default.addObserver(self, selector: #selector(deviceRotated), name: UIDevice.orientationDidChangeNotification, object: nil) } private func unregisterNotificationObservers() { - NotificationCenter.default.removeObserver(self, name: .UIKeyboardWillShow, object: nil) - NotificationCenter.default.removeObserver(self, name: .UIKeyboardWillHide, object: nil) - NotificationCenter.default.removeObserver(self, name: .UIDeviceOrientationDidChange, object: self) + NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillShowNotification, object: nil) + NotificationCenter.default.removeObserver(self, name: UIResponder.keyboardWillHideNotification, object: nil) + NotificationCenter.default.removeObserver(self, name: UIDevice.orientationDidChangeNotification, object: nil) } @objc func keyboardWillShow(_ notification: Notification) { keyboardShowTask?.cancel() keyboardShowTask = DispatchWorkItem { - if let keyboardRect = notification.userInfo?[UIKeyboardFrameEndUserInfoKey] as? CGRect { - let duration = notification.userInfo?[UIKeyboardAnimationDurationUserInfoKey] as? Double + if let keyboardRect = notification.userInfo?[UIResponder.keyboardFrameEndUserInfoKey] as? CGRect { + let duration = notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double self.view.frame.size.height = UIScreen.main.bounds.height - keyboardRect.height self.qrView.stopScanning() self.qrView.layer.opacity = 0 @@ -191,7 +191,7 @@ extension LaunchAppViewController { } @objc func keyboardWillHide(_ notification: Notification) { - let duration = notification.userInfo?[UIKeyboardAnimationDurationUserInfoKey] as? Double + let duration = notification.userInfo?[UIResponder.keyboardAnimationDurationUserInfoKey] as? Double view.frame.size.height = UIScreen.main.bounds.height self.qrView.startScanning() self.qrView.layer.opacity = 1 diff --git a/ios/Dev/LaunchApp/QRMaskView.swift b/ios/Dev/LaunchApp/QRMaskView.swift index be2711a54..6d3f4a948 100644 --- a/ios/Dev/LaunchApp/QRMaskView.swift +++ b/ios/Dev/LaunchApp/QRMaskView.swift @@ -26,7 +26,7 @@ class QRMaskView: UIView { let path = UIBezierPath(roundedRect: userRect!, cornerRadius: 20) let multiplier = CGFloat(3) path.append(UIBezierPath(rect: CGRect(x: 0 - self.bounds.width, y: 0 - self.bounds.height, width: self.bounds.width * multiplier, height: self.bounds.height * multiplier))) - mask.fillRule = kCAFillRuleEvenOdd + mask.fillRule = .evenOdd mask.path = path.cgPath self.layer.mask = mask } diff --git a/ios/Dev/LaunchApp/QRView.swift b/ios/Dev/LaunchApp/QRView.swift index 86af5e9b0..b0b0b6696 100644 --- a/ios/Dev/LaunchApp/QRView.swift +++ b/ios/Dev/LaunchApp/QRView.swift @@ -2,7 +2,7 @@ import Foundation import AVFoundation import UIKit -@objc protocol QRViewDelegate: class { +@objc protocol QRViewDelegate: AnyObject { @objc optional func qrScanningFailed() @objc optional func qrScanningSucceeded(_ str: String?) @objc optional func qrScanningStopped() diff --git a/ios/Dev/MendixApp/MendixAppViewController.swift b/ios/Dev/MendixApp/MendixAppViewController.swift index 1ed1621a0..4d27f47b7 100644 --- a/ios/Dev/MendixApp/MendixAppViewController.swift +++ b/ios/Dev/MendixApp/MendixAppViewController.swift @@ -9,18 +9,24 @@ class MendixAppViewController: UIViewController, ReactNativeDelegate { ReactNative.shared.start() } + override var preferredStatusBarStyle: UIStatusBarStyle { + return isAppeared ? .darkContent : .lightContent + } + + private var isAppeared = false { + didSet { + setNeedsStatusBarAppearanceUpdate() + } + } + override func viewDidAppear(_ animated: Bool) { super.viewDidAppear(animated) - if #available(iOS 13.0, *) { - UIApplication.shared.statusBarStyle = .darkContent - } else { - UIApplication.shared.statusBarStyle = .default - } + isAppeared = true } override func viewWillDisappear(_ animated: Bool) { super.viewDidDisappear(animated) - UIApplication.shared.statusBarStyle = .lightContent + isAppeared = false } func onAppClosed() { diff --git a/ios/Dev/MendixApp/MendixReactWindowExtensions.swift b/ios/Dev/MendixApp/MendixReactWindowExtensions.swift index 3d5de1317..1bcfa74c5 100644 --- a/ios/Dev/MendixApp/MendixReactWindowExtensions.swift +++ b/ios/Dev/MendixApp/MendixReactWindowExtensions.swift @@ -5,7 +5,7 @@ extension MendixReactWindow { return true } - open override func motionEnded(_ motion: UIEventSubtype, with event: UIEvent?) { + open override func motionEnded(_ motion: UIEvent.EventSubtype, with event: UIEvent?) { if (motion == .motionShake && ReactAppProvider.isReactAppActive()) { DevHelper.showAppMenu(); } diff --git a/ios/Podfile b/ios/Podfile index f6d038c79..332369cc3 100644 --- a/ios/Podfile +++ b/ios/Podfile @@ -110,25 +110,6 @@ post_install do |installer| config.build_settings['GCC_PREPROCESSOR_DEFINITIONS'] |= ['$(inherited)', "DEBUG=1"] end end - # Specify 'Swift Version: 5.0' for resolving archieve errors. - if target.name == 'react-native-video' || target.name == 'MendixNative' - config.build_settings['SWIFT_VERSION'] = '5.0' - end - if target.name == 'VisionCamera' - config.build_settings['SWIFT_VERSION'] = '5.2' - end - end - end - - # Ensure deployment_target is set correctly for all projects - installer.generated_projects.each do |project| - project.targets.each do |target| - target.build_configurations.each do |config| - config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target - end - end - project.build_configurations.each do |bc| - bc.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = deployment_target end end end diff --git a/ios/Podfile.lock b/ios/Podfile.lock index e7fe94186..395a386ff 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -2551,7 +2551,7 @@ SPEC CHECKSUMS: MendixNative: a55e00448d33a66d59bd4b5c5d3057123d34337c op-sqlite: 12554de3e1a0cb86cbad3cf1f0c50450f57d3855 OpenSSL-Universal: 6082b0bf950e5636fe0d78def171184e2b3899c2 - RCT-Folly: 36fe2295e44b10d831836cc0d1daec5f8abcf809 + RCT-Folly: e78785aa9ba2ed998ea4151e314036f6c49e6d82 RCTDeprecation: be794de7dc6ed8f9f7fbf525f86e7651b8b68746 RCTRequired: a83787b092ec554c2eb6019ff3f5b8d125472b3b RCTTypeSafety: 48ad3c858926b1c46f46a81a58822b476e178e2c @@ -2636,6 +2636,6 @@ SPEC CHECKSUMS: SSZipArchive: 8a6ee5677c8e304bebc109e39cf0da91ccef22ea Yoga: e14bad835e12b6c7e2260fc320bd00e0f4b45add -PODFILE CHECKSUM: 532b439839464076449499a1a589dce62fdeb5e5 +PODFILE CHECKSUM: b234d1af9b2f93d0707d97b1f37c0fbb8e2cfcb8 COCOAPODS: 1.16.2 diff --git a/ios/nativeTemplate.xcodeproj/project.pbxproj b/ios/nativeTemplate.xcodeproj/project.pbxproj index cd6f832a4..87420a886 100644 --- a/ios/nativeTemplate.xcodeproj/project.pbxproj +++ b/ios/nativeTemplate.xcodeproj/project.pbxproj @@ -713,11 +713,9 @@ "\"${PODS_ROOT}/GoogleMobileVision/Detector/Frameworks\"", "\"${PODS_ROOT}/GoogleMobileVision/FaceDetector/Frameworks\"", "\"${PODS_ROOT}/GoogleMobileVision/TextDetector/Frameworks\"", - "\"${SRCROOT}/../node_modules/@mendix/native/ios\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios/**", "$(SRCROOT)/../node_modules/@react-native-async-storage/async-storage/ios", "$(SRCROOT)/../node_modules/@react-native-community/netinfo/ios", "$(SRCROOT)/../node_modules/react-native-calendar-events", @@ -741,7 +739,7 @@ "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**", ); INFOPLIST_FILE = nativeTemplate/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -749,7 +747,6 @@ LIBRARY_SEARCH_PATHS = ( "$(SDKROOT)/usr/lib/swift", "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios", "$(PROJECT_DIR)", ); MACH_O_TYPE = mh_execute; @@ -760,10 +757,10 @@ ); PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(PRODUCT_NAME)"; - SWIFT_INCLUDE_PATHS = "$(inherited) ${SRCROOT}/../node_modules/@mendix/native/ios"; + SWIFT_INCLUDE_PATHS = "$(inherited)"; SWIFT_OBJC_BRIDGING_HEADER = "nativeTemplate-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; }; @@ -794,11 +791,9 @@ "\"${PODS_ROOT}/GoogleMobileVision/Detector/Frameworks\"", "\"${PODS_ROOT}/GoogleMobileVision/FaceDetector/Frameworks\"", "\"${PODS_ROOT}/GoogleMobileVision/TextDetector/Frameworks\"", - "\"${SRCROOT}/../node_modules/@mendix/native/ios\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios/**", "$(SRCROOT)/../node_modules/@react-native-async-storage/async-storage/ios", "$(SRCROOT)/../node_modules/@react-native-community/netinfo/ios", "$(SRCROOT)/../node_modules/react-native-calendar-events", @@ -822,7 +817,7 @@ "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**", ); INFOPLIST_FILE = nativeTemplate/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -830,7 +825,6 @@ LIBRARY_SEARCH_PATHS = ( "$(SDKROOT)/usr/lib/swift", "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios", "$(PROJECT_DIR)", ); MACH_O_TYPE = mh_execute; @@ -842,9 +836,9 @@ PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(PRODUCT_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_INCLUDE_PATHS = "$(inherited) ${PROJECT_DIR} ${SRCROOT}/../node_modules/@mendix/native/ios"; + SWIFT_INCLUDE_PATHS = "$(inherited) ${PROJECT_DIR}"; SWIFT_OBJC_BRIDGING_HEADER = "nativeTemplate-Bridging-Header.h"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; }; @@ -857,7 +851,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LANGUAGE_STANDARD = "$(inherited)"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -869,17 +863,11 @@ "DEVELOPMENT_TEAM[sdk=iphoneos*]" = BC32QNM6AD; ENABLE_BITCODE = "$(inherited)"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios/**", - ); INFOPLIST_FILE = "nativeTemplate/Info-dev.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; + HEADER_SEARCH_PATHS = "$(inherited)"; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -887,7 +875,6 @@ LIBRARY_SEARCH_PATHS = ( "$(SDKROOT)/usr/lib/swift", "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios", ); MACH_O_TYPE = mh_execute; MARKETING_VERSION = 1.0.0; @@ -898,10 +885,10 @@ PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Native Template iOS Pipeline"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; - SWIFT_INCLUDE_PATHS = "$(inherited) ${SRCROOT}/../node_modules/@mendix/native/ios"; + SWIFT_INCLUDE_PATHS = "$(inherited)"; SWIFT_OBJC_BRIDGING_HEADER = "nativeTemplate-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; }; name = Debug; @@ -913,7 +900,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LANGUAGE_STANDARD = "$(inherited)"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -926,17 +913,11 @@ "DEVELOPMENT_TEAM[sdk=iphoneos*]" = BC32QNM6AD; ENABLE_BITCODE = "$(inherited)"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios/**", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "nativeTemplate/Info-dev.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -944,7 +925,6 @@ LIBRARY_SEARCH_PATHS = ( "$(SDKROOT)/usr/lib/swift", "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios", ); MACH_O_TYPE = mh_execute; MARKETING_VERSION = 1.0.0; @@ -954,10 +934,10 @@ PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Native Template iOS Pipeline"; SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_INCLUDE_PATHS = "$(inherited) ${SRCROOT}/../node_modules/@mendix/native/ios"; + SWIFT_INCLUDE_PATHS = "$(inherited)"; SWIFT_OBJC_BRIDGING_HEADER = "nativeTemplate-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; }; name = Release; @@ -1009,7 +989,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD = ""; LDPLUSPLUS = ""; MTL_ENABLE_DEBUG_INFO = NO; @@ -1054,11 +1034,9 @@ "\"${PODS_ROOT}/GoogleMobileVision/Detector/Frameworks\"", "\"${PODS_ROOT}/GoogleMobileVision/FaceDetector/Frameworks\"", "\"${PODS_ROOT}/GoogleMobileVision/TextDetector/Frameworks\"", - "\"${SRCROOT}/../node_modules/@mendix/native/ios\"", ); HEADER_SEARCH_PATHS = ( "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios/**", "$(SRCROOT)/../node_modules/@react-native-async-storage/async-storage/ios", "$(SRCROOT)/../node_modules/@react-native-community/netinfo/ios", "$(SRCROOT)/../node_modules/react-native-calendar-events", @@ -1082,7 +1060,7 @@ "$(SRCROOT)/../node_modules/react-native-firebase/ios/RNFirebase/**", ); INFOPLIST_FILE = nativeTemplate/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1090,7 +1068,6 @@ LIBRARY_SEARCH_PATHS = ( "$(SDKROOT)/usr/lib/swift", "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios", "$(PROJECT_DIR)", ); MACH_O_TYPE = mh_execute; @@ -1102,9 +1079,9 @@ PRODUCT_BUNDLE_IDENTIFIER = "$(PRODUCT_BUNDLE_IDENTIFIER)"; PRODUCT_NAME = "$(PRODUCT_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_INCLUDE_PATHS = "$(inherited) ${PROJECT_DIR} ${SRCROOT}/../node_modules/@mendix/native/ios"; + SWIFT_INCLUDE_PATHS = "$(inherited) ${PROJECT_DIR}"; SWIFT_OBJC_BRIDGING_HEADER = "nativeTemplate-Bridging-Header.h"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; VERSIONING_SYSTEM = "apple-generic"; }; @@ -1117,7 +1094,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "c++17"; + CLANG_CXX_LANGUAGE_STANDARD = "$(inherited)"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_WEAK = YES; CLANG_WARN_DOCUMENTATION_COMMENTS = YES; @@ -1130,17 +1107,11 @@ "DEVELOPMENT_TEAM[sdk=iphoneos*]" = BC32QNM6AD; ENABLE_BITCODE = "$(inherited)"; "EXCLUDED_ARCHS[sdk=iphonesimulator*]" = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; GCC_C_LANGUAGE_STANDARD = gnu99; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios/**", - ); + HEADER_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = "nativeTemplate/Info-dev.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 15.6; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -1148,7 +1119,6 @@ LIBRARY_SEARCH_PATHS = ( "$(SDKROOT)/usr/lib/swift", "$(inherited)", - "${SRCROOT}/../node_modules/@mendix/native/ios", ); MACH_O_TYPE = mh_execute; MARKETING_VERSION = 1.0.0; @@ -1158,10 +1128,10 @@ PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Native Template iOS Pipeline"; SWIFT_COMPILATION_MODE = wholemodule; - SWIFT_INCLUDE_PATHS = "$(inherited) ${SRCROOT}/../node_modules/@mendix/native/ios"; + SWIFT_INCLUDE_PATHS = "$(inherited)"; SWIFT_OBJC_BRIDGING_HEADER = "nativeTemplate-Bridging-Header.h"; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 4.0; + SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = 1; }; name = ReleaseDevApp; @@ -1217,7 +1187,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD = ""; LDPLUSPLUS = ""; MTL_ENABLE_DEBUG_INFO = YES; @@ -1285,7 +1255,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD = ""; LDPLUSPLUS = ""; MTL_ENABLE_DEBUG_INFO = NO;