Bumped the minimum supported OS version

EFPrefix · Sep 19, 2024 · 59ee771 · 59ee771
1 parent 97f66a5
commit 59ee771
Show file tree

Hide file tree

Showing 7 changed files with 82 additions and 47 deletions.
diff --git a/EFQRCode.podspec b/EFQRCode.podspec
@@ -15,10 +15,10 @@ Pod::Spec.new do |s|
 	s.social_media_url = 'https://twitter.com/EyreFree777'
 	s.documentation_url = 'https://efprefix.github.io/EFQRCode'
 
-	s.ios.deployment_target = '9.0'
-	s.osx.deployment_target = '10.10'
-	s.tvos.deployment_target = '9.0'
-	s.watchos.deployment_target = '4.0'
+  	s.ios.deployment_target = "11.0"
+  	s.osx.deployment_target = "10.13"
+  	s.watchos.deployment_target = "6.0"
+  	s.tvos.deployment_target = "11.0"
 
 	s.swift_version = '5.0'
 	s.requires_arc = true

diff --git a/EFQRCode.xcodeproj/project.pbxproj b/EFQRCode.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 52;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -34,6 +34,10 @@
 		126A1B5A1EAF225100EFBA1B /* eyrefree.png in Resources */ = {isa = PBXBuildFile; fileRef = 126A1B591EAF225100EFBA1B /* eyrefree.png */; };
 		126A1B5B1EAF225100EFBA1B /* eyrefree.png in Resources */ = {isa = PBXBuildFile; fileRef = 126A1B591EAF225100EFBA1B /* eyrefree.png */; };
 		126A1B5C1EAF225100EFBA1B /* eyrefree.png in Resources */ = {isa = PBXBuildFile; fileRef = 126A1B591EAF225100EFBA1B /* eyrefree.png */; };
+		128481F82C9CB9830044C409 /* QRCodeSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 128481F72C9CB9830044C409 /* QRCodeSwift */; };
+		128481FA2C9CB9880044C409 /* QRCodeSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 128481F92C9CB9880044C409 /* QRCodeSwift */; };
+		128481FC2C9CB98D0044C409 /* QRCodeSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 128481FB2C9CB98D0044C409 /* QRCodeSwift */; };
+		128481FE2C9CB9910044C409 /* QRCodeSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 128481FD2C9CB9910044C409 /* QRCodeSwift */; };
 		12C0B6F3219C0F7D000545C9 /* EFQRCodeMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C0B6F2219C0F7D000545C9 /* EFQRCodeMode.swift */; };
 		12C0B6F4219C0F7D000545C9 /* EFQRCodeMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C0B6F2219C0F7D000545C9 /* EFQRCodeMode.swift */; };
 		12C0B6F5219C0F7D000545C9 /* EFQRCodeMode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12C0B6F2219C0F7D000545C9 /* EFQRCodeMode.swift */; };
@@ -105,7 +109,6 @@
 		D2265576256EA35600920D11 /* EFQRCode+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2265574256EA35600920D11 /* EFQRCode+ObjC.swift */; };
 		D2265577256EA35600920D11 /* EFQRCode+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2265574256EA35600920D11 /* EFQRCode+ObjC.swift */; };
 		D2265578256EA35600920D11 /* EFQRCode+ObjC.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2265574256EA35600920D11 /* EFQRCode+ObjC.swift */; };
-		D2483E82256E3D7F005899D8 /* QRCodeSwift in Frameworks */ = {isa = PBXBuildFile; productRef = D2483E81256E3D7F005899D8 /* QRCodeSwift */; };
 		D2FAEBB82749720F00DFA959 /* EFPointStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2FAEBB72749720F00DFA959 /* EFPointStyle.swift */; };
 		D2FAEBB92749720F00DFA959 /* EFPointStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2FAEBB72749720F00DFA959 /* EFPointStyle.swift */; };
 		D2FAEBBA2749720F00DFA959 /* EFPointStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = D2FAEBB72749720F00DFA959 /* EFPointStyle.swift */; };
@@ -190,6 +193,7 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				128481FC2C9CB98D0044C409 /* QRCodeSwift in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -205,21 +209,23 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				128481FA2C9CB9880044C409 /* QRCodeSwift in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		5282BCA91FF38F8100DFB36B /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				D2483E82256E3D7F005899D8 /* QRCodeSwift in Frameworks */,
+				128481FE2C9CB9910044C409 /* QRCodeSwift in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 		F8111E2F19A95C8B0040E7D1 /* Frameworks */ = {
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				128481F82C9CB9830044C409 /* QRCodeSwift in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -443,6 +449,9 @@
 			dependencies = (
 			);
 			name = "EFQRCode tvOS";
+			packageProductDependencies = (
+				128481FB2C9CB98D0044C409 /* QRCodeSwift */,
+			);
 			productName = "Alamofire tvOS";
 			productReference = 4CF626EF1BA7CB3E0011A099 /* EFQRCode.framework */;
 			productType = "com.apple.product-type.framework";
@@ -479,6 +488,9 @@
 			dependencies = (
 			);
 			name = "EFQRCode macOS";
+			packageProductDependencies = (
+				128481F92C9CB9880044C409 /* QRCodeSwift */,
+			);
 			productName = AlamofireOSX;
 			productReference = 4DD67C0B1A5C55C900ED2280 /* EFQRCode.framework */;
 			productType = "com.apple.product-type.framework";
@@ -498,7 +510,7 @@
 			);
 			name = "EFQRCode watchOS";
 			packageProductDependencies = (
-				D2483E81256E3D7F005899D8 /* QRCodeSwift */,
+				128481FD2C9CB9910044C409 /* QRCodeSwift */,
 			);
 			productName = "EFQRCode watchOS";
 			productReference = 5282BCAD1FF38F8100DFB36B /* EFQRCode.framework */;
@@ -519,6 +531,9 @@
 			dependencies = (
 			);
 			name = "EFQRCode iOS";
+			packageProductDependencies = (
+				128481F72C9CB9830044C409 /* QRCodeSwift */,
+			);
 			productName = Alamofire;
 			productReference = F8111E3319A95C8B0040E7D1 /* EFQRCode.framework */;
 			productType = "com.apple.product-type.framework";
@@ -614,7 +629,7 @@
 			);
 			mainGroup = F8111E2919A95C8B0040E7D1;
 			packageReferences = (
-				D2483E80256E3D7F005899D8 /* XCRemoteSwiftPackageReference "swift_qrcodejs" */,
+				128481F32C9CB8870044C409 /* XCRemoteSwiftPackageReference "swift_qrcodejs" */,
 			);
 			productRefGroup = F8111E3419A95C8B0040E7D1 /* Products */;
 			projectDirPath = "";
@@ -894,7 +909,7 @@
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
 			};
 			name = Debug;
 		};
@@ -924,7 +939,7 @@
 				SWIFT_SWIFT3_OBJC_INFERENCE = Default;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 3;
-				TVOS_DEPLOYMENT_TARGET = 9.0;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
 			};
 			name = Release;
 		};
@@ -945,6 +960,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_VERSION = 5.0;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
 			};
 			name = Debug;
 		};
@@ -965,6 +981,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SDKROOT = appletvos;
 				SWIFT_VERSION = 5.0;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
 			};
 			name = Release;
 		};
@@ -991,7 +1008,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MARKETING_VERSION = 6.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = org.eyrefree.EFQRCode;
 				PRODUCT_NAME = EFQRCode;
@@ -1021,7 +1038,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MARKETING_VERSION = 6.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = org.eyrefree.EFQRCode;
 				PRODUCT_NAME = EFQRCode;
@@ -1065,7 +1082,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+				WATCHOS_DEPLOYMENT_TARGET = 6.0;
 			};
 			name = Debug;
 		};
@@ -1101,7 +1118,7 @@
 				SKIP_INSTALL = YES;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+				WATCHOS_DEPLOYMENT_TARGET = 6.0;
 			};
 			name = Release;
 		};
@@ -1238,7 +1255,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1267,7 +1284,7 @@
 				DYLIB_INSTALL_NAME_BASE = "@rpath";
 				INFOPLIST_FILE = Source/Info.plist;
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1294,6 +1311,7 @@
 					"$(inherited)",
 				);
 				INFOPLIST_FILE = Tests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1313,6 +1331,7 @@
 				DEVELOPMENT_TEAM = "";
 				FRAMEWORK_SEARCH_PATHS = "$(inherited)";
 				INFOPLIST_FILE = Tests/Info.plist;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/Frameworks",
@@ -1347,6 +1366,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.eyrefree.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1375,6 +1395,7 @@
 					"@executable_path/../Frameworks",
 					"@loader_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				PRODUCT_BUNDLE_IDENTIFIER = "org.eyrefree.$(PRODUCT_NAME:rfc1034identifier)";
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1462,20 +1483,35 @@
 /* End XCConfigurationList section */
 
 /* Begin XCRemoteSwiftPackageReference section */
-		D2483E80256E3D7F005899D8 /* XCRemoteSwiftPackageReference "swift_qrcodejs" */ = {
+		128481F32C9CB8870044C409 /* XCRemoteSwiftPackageReference "swift_qrcodejs" */ = {
 			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/ApolloZhu/swift_qrcodejs";
+			repositoryURL = "https://github.com/EFPrefix/swift_qrcodejs.git";
 			requirement = {
-				kind = upToNextMinorVersion;
-				minimumVersion = 2.2.2;
+				kind = upToNextMajorVersion;
+				minimumVersion = 2.3.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */
 
 /* Begin XCSwiftPackageProductDependency section */
-		D2483E81256E3D7F005899D8 /* QRCodeSwift */ = {
+		128481F72C9CB9830044C409 /* QRCodeSwift */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 128481F32C9CB8870044C409 /* XCRemoteSwiftPackageReference "swift_qrcodejs" */;
+			productName = QRCodeSwift;
+		};
+		128481F92C9CB9880044C409 /* QRCodeSwift */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 128481F32C9CB8870044C409 /* XCRemoteSwiftPackageReference "swift_qrcodejs" */;
+			productName = QRCodeSwift;
+		};
+		128481FB2C9CB98D0044C409 /* QRCodeSwift */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = 128481F32C9CB8870044C409 /* XCRemoteSwiftPackageReference "swift_qrcodejs" */;
+			productName = QRCodeSwift;
+		};
+		128481FD2C9CB9910044C409 /* QRCodeSwift */ = {
 			isa = XCSwiftPackageProductDependency;
-			package = D2483E80256E3D7F005899D8 /* XCRemoteSwiftPackageReference "swift_qrcodejs" */;
+			package = 128481F32C9CB8870044C409 /* XCRemoteSwiftPackageReference "swift_qrcodejs" */;
 			productName = QRCodeSwift;
 		};
 /* End XCSwiftPackageProductDependency section */

diff --git a/EFQRCode.xcworkspace/xcshareddata/swiftpm/Package.resolved b/EFQRCode.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,16 +1,15 @@
 {
-  "object": {
-    "pins": [
-      {
-        "package": "swift_qrcodejs",
-        "repositoryURL": "https://github.com/ApolloZhu/swift_qrcodejs",
-        "state": {
-          "branch": null,
-          "revision": "374dc7f7b9e76c6aeb393f6a84590c6d387e1ecb",
-          "version": "2.2.2"
-        }
+  "originHash" : "69bdc03441e6dcf98a784130ca8edfd713d9489312b445b8eda35e9598bdc90a",
+  "pins" : [
+    {
+      "identity" : "swift_qrcodejs",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/EFPrefix/swift_qrcodejs.git",
+      "state" : {
+        "revision" : "817ba220a2eba840bae888e7eeb11207bec05f8c",
+        "version" : "2.3.0"
       }
-    ]
-  },
-  "version": 1
+    }
+  ],
+  "version" : 3
 }
diff --git a/Examples/Podfile.lock b/Examples/Podfile.lock
@@ -23,4 +23,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 27214a7a38fbdfb949113bc3e6a74b29450b2e4e
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.15.2
diff --git a/Examples/iOS/iOS Example.xcodeproj/project.pbxproj b/Examples/iOS/iOS Example.xcodeproj/project.pbxproj
@@ -1097,7 +1097,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+				WATCHOS_DEPLOYMENT_TARGET = 6.0;
 			};
 			name = Debug;
 		};
@@ -1130,7 +1130,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+				WATCHOS_DEPLOYMENT_TARGET = 6.0;
 			};
 			name = Release;
 		};
@@ -1158,7 +1158,7 @@
 				SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+				WATCHOS_DEPLOYMENT_TARGET = 6.0;
 			};
 			name = Debug;
 		};
@@ -1189,7 +1189,7 @@
 				SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 4;
-				WATCHOS_DEPLOYMENT_TARGET = 4.0;
+				WATCHOS_DEPLOYMENT_TARGET = 6.0;
 			};
 			name = Release;
 		};
@@ -1315,7 +1315,7 @@
 				CURRENT_PROJECT_VERSION = 1687385679;
 				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = Resources/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 6.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = AppStore.EFQRCode;
@@ -1336,7 +1336,7 @@
 				CURRENT_PROJECT_VERSION = 1687385679;
 				DEVELOPMENT_TEAM = P3X2725LYY;
 				INFOPLIST_FILE = Resources/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 9.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 11.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				MARKETING_VERSION = 6.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = AppStore.EFQRCode;

diff --git a/Examples/macOS/macOS Example.xcodeproj/project.pbxproj b/Examples/macOS/macOS Example.xcodeproj/project.pbxproj
@@ -859,7 +859,7 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "macOS Example/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MARKETING_VERSION = 6.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = MacAppStore.EFQRCode;
 				PRODUCT_MODULE_NAME = EFQRCode_Module;
@@ -880,7 +880,7 @@
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "macOS Example/Info.plist";
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
-				MACOSX_DEPLOYMENT_TARGET = 10.10;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MARKETING_VERSION = 6.2.2;
 				PRODUCT_BUNDLE_IDENTIFIER = MacAppStore.EFQRCode;
 				PRODUCT_MODULE_NAME = EFQRCode_Module;