From f3e10d6a5a9012bf1ceba165a04d53e39cc17915 Mon Sep 17 00:00:00 2001
From: Daniel LaCosse <3759828+daniellacosse@users.noreply.github.com>
Date: Tue, 27 Feb 2024 16:36:10 -0500
Subject: [PATCH] fix(client/cordova/apple/ios): fix failing release build for
the cordova ios target (#1840)
* fix(cordova/apple/ios): fix failing build for the cordova ios target
* update entitilements
* update makefile
---
Makefile | 2 +-
.../apple/xcode/ios/Outline.xcodeproj/project.pbxproj | 8 ++++----
src/cordova/apple/xcode/ios/Outline/Outline.entitlements | 1 -
.../apple/xcode/ios/Outline/VpnExtension.entitlements | 1 -
.../ios/OutlineLauncher/OutlineLauncher.entitlements | 4 ----
5 files changed, 5 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile
index ac8d75adcf..ad76fe1b8c 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@ $(BUILDDIR)/android/tun2socks.aar: $(GOMOBILE)
$(BUILDDIR)/ios/Tun2socks.xcframework: $(GOMOBILE)
# -iosversion should match what outline-client supports.
- $(GOBIND) -iosversion=11.0 -target=ios,iossimulator -o $@ -ldflags '-w' -bundleid org.outline.tun2socks $(IMPORT_PATH)/$(ROOT_PKG)/outline/tun2socks $(IMPORT_PATH)/$(ROOT_PKG)/outline/shadowsocks
+ $(GOBIND) -iosversion=12.0 -target=ios,iossimulator -o $@ -ldflags '-w' -bundleid org.outline.tun2socks $(IMPORT_PATH)/$(ROOT_PKG)/outline/tun2socks $(IMPORT_PATH)/$(ROOT_PKG)/outline/shadowsocks
$(BUILDDIR)/macos/Tun2socks.xcframework: $(GOMOBILE)
# MACOSX_DEPLOYMENT_TARGET and -iosversion should match what outline-client supports.
diff --git a/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj b/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj
index d2e873ee72..cdea364310 100755
--- a/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj
+++ b/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj
@@ -940,7 +940,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "Outline/Outline-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.outline.ios.client;
@@ -987,7 +987,7 @@
GCC_THUMB_SUPPORT = NO;
GCC_VERSION = "";
INFOPLIST_FILE = "Outline/Outline-Info.plist";
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = org.outline.ios.client;
@@ -1391,7 +1391,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -1435,7 +1435,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
- IPHONEOS_DEPLOYMENT_TARGET = 11.0;
+ IPHONEOS_DEPLOYMENT_TARGET = 12.0;
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
SDKROOT = iphoneos;
SKIP_INSTALL = NO;
diff --git a/src/cordova/apple/xcode/ios/Outline/Outline.entitlements b/src/cordova/apple/xcode/ios/Outline/Outline.entitlements
index 27ff72cb3a..9d88e9d506 100644
--- a/src/cordova/apple/xcode/ios/Outline/Outline.entitlements
+++ b/src/cordova/apple/xcode/ios/Outline/Outline.entitlements
@@ -11,7 +11,6 @@
com.apple.security.application-groups
group.org.outline.ios.client
- $(TeamIdentifierPrefix)org.outline.macos.client
com.apple.security.network.client
diff --git a/src/cordova/apple/xcode/ios/Outline/VpnExtension.entitlements b/src/cordova/apple/xcode/ios/Outline/VpnExtension.entitlements
index a11fc88663..fb4bf1a906 100644
--- a/src/cordova/apple/xcode/ios/Outline/VpnExtension.entitlements
+++ b/src/cordova/apple/xcode/ios/Outline/VpnExtension.entitlements
@@ -11,7 +11,6 @@
com.apple.security.application-groups
group.org.outline.ios.client
- $(TeamIdentifierPrefix)org.outline.macos.client
com.apple.security.network.client
diff --git a/src/cordova/apple/xcode/ios/OutlineLauncher/OutlineLauncher.entitlements b/src/cordova/apple/xcode/ios/OutlineLauncher/OutlineLauncher.entitlements
index bd0f317586..90b496c7de 100644
--- a/src/cordova/apple/xcode/ios/OutlineLauncher/OutlineLauncher.entitlements
+++ b/src/cordova/apple/xcode/ios/OutlineLauncher/OutlineLauncher.entitlements
@@ -8,10 +8,6 @@
com.apple.security.app-sandbox
- com.apple.security.application-groups
-
- $(TeamIdentifierPrefix)org.outline.macos.client
-
com.apple.security.files.user-selected.read-only