Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(client/ios): update minimum deployment target to 15.5 #2309

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+6 −6
Open

fix(client/ios): update minimum deployment target to 15.5 #2309

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
26ff5ad
fix(client/ios): update minimum deployment target to `15.5`
sbruens Dec 10, 2024
39fd37b
Fix iOS Swift reference: `15.5` doesn't have a type property.
sbruens Dec 10, 2024
452de08
Merge branch 'master' into sbruens/ios-min-version
sbruens Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion client/go/Taskfile.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion client/src/cordova/apple/OutlineAppleLib/Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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("15.5"),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you can also use .15_5, but I guess it doesn't matter.

Copy link
Contributor Author

@sbruens sbruens Dec 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's what I thought but you can't. I had it in a previous commit, but it failed to build:

  /Users/runner/work/outline-apps/outline-apps/client/src/cordova/apple/OutlineAppleLib/Package.swift:28:14: error: reference to member 'v15_5' cannot be resolved without a contextual type
         .iOS(.v15_5),

Turns out only v15 exists: http://go/appledoc/packagedescription/supportedplatform/iosversion/v15. I guess only the v10_X macOS versions specified more granular version types.

.macOS(.v12),
],
products: [
Expand Down
8 changes: 4 additions & 4 deletions client/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand All @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
Loading