From ed5661a80901bd65bac63273f5db4d3f7de098a1 Mon Sep 17 00:00:00 2001 From: Nandan Prabhu Date: Wed, 7 May 2025 11:00:12 +0530 Subject: [PATCH 1/2] SDK-5963 migrated to swift 6 --- Gemfile.lock | 1 + SimpleKeychain.podspec | 1 - SimpleKeychain.xcodeproj/project.pbxproj | 52 ++++++++++++------------ SimpleKeychainApp/AppDelegate.swift | 2 +- 4 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 566d9378..987e7160 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -309,6 +309,7 @@ GEM PLATFORMS arm64-darwin-22 arm64-darwin-23 + arm64-darwin-24 x86_64-darwin-19 x86_64-darwin-20 diff --git a/SimpleKeychain.podspec b/SimpleKeychain.podspec index 6ffe566c..fc8efdf8 100644 --- a/SimpleKeychain.podspec +++ b/SimpleKeychain.podspec @@ -19,5 +19,4 @@ Pod::Spec.new do |s| s.visionos.deployment_target = '1.0' s.source_files = 'SimpleKeychain/*.swift' - s.swift_versions = ['6.0', '6.1'] end diff --git a/SimpleKeychain.xcodeproj/project.pbxproj b/SimpleKeychain.xcodeproj/project.pbxproj index a2e6ff86..68277f4d 100644 --- a/SimpleKeychain.xcodeproj/project.pbxproj +++ b/SimpleKeychain.xcodeproj/project.pbxproj @@ -1127,7 +1127,7 @@ SDKROOT = appletvos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 3; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tvOSTestHost.app/tvOSTestHost"; TVOS_DEPLOYMENT_TARGET = 14.0; @@ -1151,7 +1151,7 @@ PRODUCT_NAME = SimpleKeychainTests; PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 3; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/tvOSTestHost.app/tvOSTestHost"; TVOS_DEPLOYMENT_TARGET = 14.0; @@ -1187,7 +1187,7 @@ SDKROOT = watchos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 7.0; }; @@ -1216,7 +1216,7 @@ PRODUCT_NAME = SimpleKeychain; SDKROOT = watchos; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 4; WATCHOS_DEPLOYMENT_TARGET = 7.0; }; @@ -1245,7 +1245,7 @@ SDKROOT = appletvos; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 14.0; }; @@ -1273,7 +1273,7 @@ PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = appletvos; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 14.0; }; @@ -1305,7 +1305,7 @@ SDKROOT = appletvos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 14.0; }; @@ -1333,7 +1333,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.auth0.simplekeychain.tvOSTestHost; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = appletvos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = 3; TVOS_DEPLOYMENT_TARGET = 14.0; }; @@ -1354,7 +1354,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.auth0.SimpleKeychainTests; PRODUCT_NAME = SimpleKeychainTests; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SimpleKeychainApp.app/SimpleKeychainApp"; }; name = Debug; @@ -1372,7 +1372,7 @@ ); PRODUCT_BUNDLE_IDENTIFIER = com.auth0.SimpleKeychainTests; PRODUCT_NAME = SimpleKeychainTests; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/SimpleKeychainApp.app/SimpleKeychainApp"; }; name = Release; @@ -1394,7 +1394,7 @@ PRODUCT_NAME = SimpleKeychainTests; SDKROOT = macosx; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; }; name = Debug; }; @@ -1413,7 +1413,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.auth0.SimpleKeychainTests; PRODUCT_NAME = SimpleKeychainTests; SDKROOT = macosx; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; }; name = Release; }; @@ -1438,7 +1438,7 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; }; name = Debug; }; @@ -1458,7 +1458,7 @@ PRODUCT_BUNDLE_IDENTIFIER = com.auth0.simplekeychain; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; }; name = Release; }; @@ -1517,7 +1517,7 @@ MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; VERSIONING_SYSTEM = "apple-generic"; VERSION_INFO_PREFIX = ""; @@ -1573,7 +1573,7 @@ SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; VERSIONING_SYSTEM = "apple-generic"; @@ -1602,7 +1602,7 @@ PRODUCT_NAME = SimpleKeychain; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; }; name = Debug; }; @@ -1626,7 +1626,7 @@ PRODUCT_BUNDLE_IDENTIFIER = "com.auth0.$(PRODUCT_NAME:rfc1034identifier)"; PRODUCT_NAME = SimpleKeychain; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; }; name = Release; }; @@ -1660,7 +1660,7 @@ SDKROOT = macosx; SKIP_INSTALL = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; }; name = Debug; }; @@ -1688,7 +1688,7 @@ PRODUCT_NAME = SimpleKeychain; SDKROOT = macosx; SKIP_INSTALL = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; }; name = Release; }; @@ -1728,7 +1728,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2,7"; XROS_DEPLOYMENT_TARGET = 1.0; }; @@ -1766,7 +1766,7 @@ SDKROOT = xros; SUPPORTED_PLATFORMS = "xros xrsimulator"; SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2,7"; XROS_DEPLOYMENT_TARGET = 1.0; }; @@ -1819,7 +1819,7 @@ SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_INSTALL_OBJC_HEADER = YES; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2,7"; XROS_DEPLOYMENT_TARGET = 1.0; }; @@ -1868,7 +1868,7 @@ SUPPORTED_PLATFORMS = "xros xrsimulator"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_INSTALL_OBJC_HEADER = YES; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2,7"; XROS_DEPLOYMENT_TARGET = 1.0; }; @@ -1909,7 +1909,7 @@ SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2,7"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/visionOSTestHost.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/visionOSTestHost"; XROS_DEPLOYMENT_TARGET = 1.0; @@ -1947,7 +1947,7 @@ SDKROOT = xros; SUPPORTED_PLATFORMS = "xros xrsimulator"; SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; + SWIFT_VERSION = 6.0; TARGETED_DEVICE_FAMILY = "1,2,7"; TEST_HOST = "$(BUILT_PRODUCTS_DIR)/visionOSTestHost.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/visionOSTestHost"; XROS_DEPLOYMENT_TARGET = 1.0; diff --git a/SimpleKeychainApp/AppDelegate.swift b/SimpleKeychainApp/AppDelegate.swift index 2bbcc6ee..dad68226 100644 --- a/SimpleKeychainApp/AppDelegate.swift +++ b/SimpleKeychainApp/AppDelegate.swift @@ -1,7 +1,7 @@ import UIKit import SimpleKeychain -@UIApplicationMain +@main class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? From 16f69d9553acf565b2d986086de246321197b0e4 Mon Sep 17 00:00:00 2001 From: Nandan Prabhu Date: Thu, 29 May 2025 11:25:06 +0530 Subject: [PATCH 2/2] podspec swift versions reverted --- SimpleKeychain.podspec | 1 + 1 file changed, 1 insertion(+) diff --git a/SimpleKeychain.podspec b/SimpleKeychain.podspec index fc8efdf8..6ffe566c 100644 --- a/SimpleKeychain.podspec +++ b/SimpleKeychain.podspec @@ -19,4 +19,5 @@ Pod::Spec.new do |s| s.visionos.deployment_target = '1.0' s.source_files = 'SimpleKeychain/*.swift' + s.swift_versions = ['6.0', '6.1'] end