From 26ff5ad4739529be9caeef533017fd09b14459a7 Mon Sep 17 00:00:00 2001 From: sbruens Date: Tue, 10 Dec 2024 10:52:00 -0500 Subject: [PATCH 1/2] fix(client/ios): update minimum deployment target to `15.5` --- client/go/Taskfile.yml | 2 +- client/src/cordova/apple/OutlineAppleLib/Package.swift | 2 +- .../apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/client/go/Taskfile.yml b/client/go/Taskfile.yml index 5994e02e1d..1542b6b3df 100644 --- a/client/go/Taskfile.yml +++ b/client/go/Taskfile.yml @@ -89,7 +89,7 @@ tasks: # MACOSX_DEPLOYMENT_TARGET must match the version the version set in the XCode project. MACOSX_DEPLOYMENT_TARGET: 12.0 # TARGET_IOS_VERSION must be at least 13.1 for macCatalyst and match the version set in the XCode project. - TARGET_IOS_VERSION: 13.1 + TARGET_IOS_VERSION: 15.5 cmds: - rm -rf "{{.TARGET_DIR}}" && mkdir -p "{{.TARGET_DIR}}" - export MACOSX_DEPLOYMENT_TARGET={{.MACOSX_DEPLOYMENT_TARGET}}; {{.GOMOBILE_BIND_CMD}} -target=ios,iossimulator,macos,maccatalyst -iosversion={{.TARGET_IOS_VERSION}} -bundleid org.outline.tun2socks -o '{{.TARGET_DIR}}/Tun2socks.xcframework' '{{.TASKFILE_DIR}}/outline/platerrors' '{{.TASKFILE_DIR}}/outline/tun2socks' '{{.TASKFILE_DIR}}/outline' diff --git a/client/src/cordova/apple/OutlineAppleLib/Package.swift b/client/src/cordova/apple/OutlineAppleLib/Package.swift index 20f122e5ee..ba3cc419d2 100644 --- a/client/src/cordova/apple/OutlineAppleLib/Package.swift +++ b/client/src/cordova/apple/OutlineAppleLib/Package.swift @@ -24,7 +24,7 @@ let package = Package( // CocoaLumberjack 3.8.0 dropped support for iOS < 11 and macOS < 10.13. // See https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/3.8.0. // These cannot be upgraded without also upgrading the entire project. - .iOS(.v13), + .iOS(.v15_5), .macOS(.v12), ], products: [ diff --git a/client/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj b/client/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj index e25ad25802..c4a0d2c286 100644 --- a/client/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj +++ b/client/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj @@ -416,7 +416,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.1; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MACOSX_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; @@ -476,7 +476,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 13.1; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MACOSX_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; @@ -500,7 +500,7 @@ INFOPLIST_FILE = VpnExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = VpnExtension; INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 13.1; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -537,7 +537,7 @@ INFOPLIST_FILE = VpnExtension/Info.plist; INFOPLIST_KEY_CFBundleDisplayName = VpnExtension; INFOPLIST_KEY_NSHumanReadableCopyright = ""; - IPHONEOS_DEPLOYMENT_TARGET = 13.1; + IPHONEOS_DEPLOYMENT_TARGET = 15.5; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", From 39fd37b582736fe805489853d8d750cf0161b156 Mon Sep 17 00:00:00 2001 From: sbruens Date: Tue, 10 Dec 2024 11:15:22 -0500 Subject: [PATCH 2/2] Fix iOS Swift reference: `15.5` doesn't have a type property. --- client/src/cordova/apple/OutlineAppleLib/Package.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/cordova/apple/OutlineAppleLib/Package.swift b/client/src/cordova/apple/OutlineAppleLib/Package.swift index ba3cc419d2..ba502d5d6c 100644 --- a/client/src/cordova/apple/OutlineAppleLib/Package.swift +++ b/client/src/cordova/apple/OutlineAppleLib/Package.swift @@ -24,7 +24,7 @@ let package = Package( // CocoaLumberjack 3.8.0 dropped support for iOS < 11 and macOS < 10.13. // See https://github.com/CocoaLumberjack/CocoaLumberjack/releases/tag/3.8.0. // These cannot be upgraded without also upgrading the entire project. - .iOS(.v15_5), + .iOS("15.5"), .macOS(.v12), ], products: [