Merge pull request #1126 from mendix/swift5

YogendraShelke · web-flow · commit 5968bb94ae14 · 2025-12-16T21:17:49.000+05:30
Migrate to Swift 5
diff --git 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
@@ -1 +1 @@
-v20
+24
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ class AppDelegate: ReactAppProvider {`
`6`	`6`	`var shouldOpenInLastApp = false`
`7`	`7`	`var hasHandledLaunchAppWithOptions = false`
`8`	`8`
`9`		`- override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplicationLaunchOptionsKey : Any]? = nil) -> Bool {`
	`9`	`+ override func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey : Any]? = nil) -> Bool {`
`10`	`10`
`11`	`11`	`MendixAppDelegate.application(application, didFinishLaunchingWithOptions: launchOptions)`
`12`	`12`	`setupApp(application: application, launchOptions: launchOptions)`
`@@ -48,7 +48,7 @@ class AppDelegate: ReactAppProvider {`
`48`	`48`	`return true`
`49`	`49`	`}`
`50`	`50`
`51`		`- override func application(_ app: UIApplication, open url: URL, options: [UIApplicationOpenURLOptionsKey : Any] = [:]) -> Bool {`
	`51`	`+ override func application(_ app: UIApplication, open url: URL, options: [UIApplication.OpenURLOptionsKey : Any] = [:]) -> Bool {`
`52`	`52`	`return MendixAppDelegate.application(app, openURL: url, options: options)`
`53`	`53`	`}`
`54`	`54`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,3 @@`
`1`	`1`	`#include "Pods/Target Support Files/Pods-nativeTemplate/Pods-nativeTemplate.release.xcconfig"`
	`2`	`+#include "Pods/Target Support Files/Pods-nativeTemplate/Pods-nativeTemplate.releasedevapp.xcconfig"`
`2`	`3`	`#include "config.xcconfig"`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ class QRMaskView: UIView {`
`26`	`26`	`let path = UIBezierPath(roundedRect: userRect!, cornerRadius: 20)`
`27`	`27`	`let multiplier = CGFloat(3)`
`28`	`28`	`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)))`
`29`		`- mask.fillRule = kCAFillRuleEvenOdd`
	`29`	`+ mask.fillRule = .evenOdd`
`30`	`30`	`mask.path = path.cgPath`
`31`	`31`	`self.layer.mask = mask`
`32`	`32`	`}`