Merge pull request #15 from bamlab/fix/xcode16-working

Fix/xcode16 support
bamlab · Sep 24, 2024 · c8aa70d · c8aa70d
2 parents 03514fc + 8d924dc
commit c8aa70d
Show file tree

Hide file tree

Showing 13 changed files with 32 additions and 21 deletions.
diff --git a/.github/workflows/.env b/.github/workflows/.env
@@ -1 +1 @@
-FLUTTER_VERSION=3.13.9
+FLUTTER_VERSION=3.24.3
diff --git a/flutter_lyra/CHANGELOG.md b/flutter_lyra/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.4.1
+
+- **CHORE**: add support for Xcode 16
+
 # 0.4.0
 
 - [Android] Upgrade kotlin version

diff --git a/flutter_lyra/example/android/build.gradle b/flutter_lyra/example/android/build.gradle
@@ -21,8 +21,6 @@ allprojects {
 rootProject.buildDir = '../build'
 subprojects {
     project.buildDir = "${rootProject.buildDir}/${project.name}"
-}
-subprojects {
     project.evaluationDependsOn(':app')
 }
 

diff --git a/flutter_lyra/example/ios/Flutter/AppFrameworkInfo.plist b/flutter_lyra/example/ios/Flutter/AppFrameworkInfo.plist
@@ -21,6 +21,6 @@
   <key>CFBundleVersion</key>
   <string>1.0</string>
   <key>MinimumOSVersion</key>
-  <string>11.0</string>
+  <string>12.0</string>
 </dict>
 </plist>
diff --git a/flutter_lyra/example/ios/Podfile b/flutter_lyra/example/ios/Podfile
@@ -1,5 +1,5 @@
 # Uncomment this line to define a global platform for your project
-platform :ios, '11.0'
+platform :ios, '15.6'
 
 # CocoaPods analytics sends network stats synchronously affecting flutter build latency.
 ENV['COCOAPODS_DISABLE_STATS'] = 'true'

diff --git a/flutter_lyra/example/ios/Runner.xcodeproj/project.pbxproj b/flutter_lyra/example/ios/Runner.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -68,7 +68,6 @@
 				075899B4BFBB0D3216F4C334 /* Pods-Runner.release.xcconfig */,
 				FB03A8B5B9F46AC5B8EFF2B9 /* Pods-Runner.profile.xcconfig */,
 			);
-			name = Pods;
 			path = Pods;
 			sourceTree = "<group>";
 		};
@@ -156,7 +155,7 @@
 		97C146E61CF9000F007C117D /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 1300;
+				LastUpgradeCheck = 1510;
 				ORGANIZATIONNAME = "";
 				TargetAttributes = {
 					97C146ED1CF9000F007C117D = {
@@ -217,10 +216,12 @@
 		};
 		3B06AD1E1E4923F5004D2608 /* Thin Binary */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
 			inputPaths = (
+				"${TARGET_BUILD_DIR}/${INFOPLIST_PATH}",
 			);
 			name = "Thin Binary";
 			outputPaths = (
@@ -253,6 +254,7 @@
 		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
+			alwaysOutOfDate = 1;
 			buildActionMask = 2147483647;
 			files = (
 			);
@@ -340,7 +342,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -359,6 +361,7 @@
 				DEVELOPMENT_TEAM = Z445H6455F;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -418,7 +421,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -467,7 +470,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				SUPPORTED_PLATFORMS = iphoneos;
@@ -488,6 +491,7 @@
 				DEVELOPMENT_TEAM = Z445H6455F;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -511,6 +515,7 @@
 				DEVELOPMENT_TEAM = Z445H6455F;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 15.6;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",

diff --git a/flutter_lyra/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/flutter_lyra/example/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1430"
+   LastUpgradeVersion = "1510"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

diff --git a/flutter_lyra/example/ios/Runner/AppDelegate.swift b/flutter_lyra/example/ios/Runner/AppDelegate.swift
@@ -1,7 +1,7 @@
 import UIKit
 import Flutter
 
-@UIApplicationMain
+@main
 @objc class AppDelegate: FlutterAppDelegate {
   override func application(
     _ application: UIApplication,

diff --git a/flutter_lyra/pubspec.yaml b/flutter_lyra/pubspec.yaml
@@ -1,7 +1,7 @@
 name: flutter_lyra
 description: This package allows you to use the methods from the lyra android and ios native sdks in Flutter
 
-version: 0.4.0
+version: 0.4.1
 
 homepage: https://github.com/bamlab/Flutter-Lyra
 repository: https://github.com/bamlab/Flutter-Lyra
@@ -23,7 +23,7 @@ dependencies:
   flutter:
     sdk: flutter
   flutter_lyra_android: ^0.4.0
-  flutter_lyra_ios: ^0.4.0
+  flutter_lyra_ios: ^0.4.1
   flutter_lyra_platform_interface: ^0.4.0
 dev_dependencies:
   analyzer: ^4.7.0

diff --git a/flutter_lyra_ios/CHANGELOG.md b/flutter_lyra_ios/CHANGELOG.md
@@ -1,3 +1,7 @@
+# 0.4.1
+
+- **CHORE**: add support for Xcode 16
+
 # 0.4.0
 
 - [Android] Upgrade kotlin version

diff --git a/flutter_lyra_ios/ios/Classes/Converters.swift b/flutter_lyra_ios/ios/Classes/Converters.swift
@@ -21,21 +21,21 @@ public class Converters {
     ) -> [String : Any] {
         var options = [String : Any]()
 
-        options[Lyra.apiServerName] = optionsInterface.apiServerName
+        options[LyraInitOptions.apiServerName] = optionsInterface.apiServerName
 
         let cardScanningEnabled = optionsInterface.cardScanningEnabled
         if (cardScanningEnabled != nil) {
-            options[Lyra.cardScanningEnabled] = cardScanningEnabled
+            options[LyraInitOptions.cardScanningEnabled] = cardScanningEnabled
         }
 
         let applePayMerchantId = optionsInterface.applePayMerchantId
         if (applePayMerchantId != nil) {
-            options[Lyra.applePayMerchantId] = applePayMerchantId
+            options[LyraInitOptions.applePayMerchantId] = applePayMerchantId
         }
 
         let applePayMerchantName = optionsInterface.applePayMerchantName
         if (applePayMerchantName != nil) {
-            options[Lyra.applePayMerchantName] = applePayMerchantName
+            options[LyraInitOptions.applePayMerchantName] = applePayMerchantName
         }
 
         return options

diff --git a/flutter_lyra_ios/ios/flutter_lyra_ios.podspec b/flutter_lyra_ios/ios/flutter_lyra_ios.podspec
@@ -20,6 +20,6 @@ Pod::Spec.new do |s|
   s.pod_target_xcconfig = { 'DEFINES_MODULE' => 'YES' }  
   s.swift_version = '5.0'
 
-  s.dependency 'LyraPaymentSDK', '~> 2.6.8'
+  s.dependency 'LyraPaymentSDK', '~> 2.7.4'
   s.dependency 'LyraCardsRecognizer', '~> 2.0.1'
 end
diff --git a/flutter_lyra_ios/pubspec.yaml b/flutter_lyra_ios/pubspec.yaml
@@ -1,6 +1,6 @@
 name: flutter_lyra_ios
 description: iOS implementation of the flutter_lyra plugin
-version: 0.4.0
+version: 0.4.1
 homepage: https://github.com/bamlab/Flutter-Lyra
 repository: https://github.com/bamlab/Flutter-Lyra