From 92062889d76338a2b51cc640a69339cbe51acd65 Mon Sep 17 00:00:00 2001 From: Vinicius Fortuna Date: Fri, 17 Nov 2023 18:02:03 -0500 Subject: [PATCH 1/2] Update target to iOS 12 --- src/cordova/apple/README.md | 2 +- .../apple/xcode/ios/Outline.xcodeproj/project.pbxproj | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/cordova/apple/README.md b/src/cordova/apple/README.md index a0fd2353fd..9c947a5a6f 100644 --- a/src/cordova/apple/README.md +++ b/src/cordova/apple/README.md @@ -7,7 +7,7 @@ This document describes how to develop and debug for macOS (formerly known as OS You will need: - An Apple Developer Account. You will need to be invited to your developer team as well. -- XCode 13.2+ ([download](https://developer.apple.com/xcode/)) +- XCode 15.0+ ([download](https://developer.apple.com/xcode/)) - XCode command line tools: `xcode-select --install` > NOTE: Should you encounter issues with your build, there may be apple-specific dependencies that are out of date. Run `npm run reset` and try again! diff --git a/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj b/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj index c4d27dcb8c..394c0a0200 100755 --- a/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj +++ b/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 52; + objectVersion = 54; objects = { /* Begin PBXBuildFile section */ @@ -669,7 +669,6 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = "Outline/Outline-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.outline.ios.client; @@ -716,7 +715,6 @@ GCC_THUMB_SUPPORT = NO; GCC_VERSION = ""; INFOPLIST_FILE = "Outline/Outline-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; ONLY_ACTIVE_ARCH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.outline.ios.client; @@ -1081,7 +1079,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 = 10.15; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -1124,7 +1122,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 = 10.15; SDKROOT = iphoneos; SKIP_INSTALL = NO; From b76c86dd3ab4b8c22e0ccf1a9c558c0594287dc8 Mon Sep 17 00:00:00 2001 From: Vinicius Fortuna Date: Tue, 21 Nov 2023 17:48:58 -0500 Subject: [PATCH 2/2] Move VPN Extension to subproject --- .../OutlineLib.xcodeproj/project.pbxproj | 455 ++++++++++++++++++ .../apple/OutlineLib/VpnExtension/Info.plist | 29 ++ .../VpnExtension/VpnExtension.entitlements | 20 + .../xcshareddata/swiftpm/Package.resolved | 4 +- .../ios/Outline.xcodeproj/project.pbxproj | 235 ++------- 5 files changed, 547 insertions(+), 196 deletions(-) create mode 100644 src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj create mode 100644 src/cordova/apple/OutlineLib/VpnExtension/Info.plist create mode 100644 src/cordova/apple/OutlineLib/VpnExtension/VpnExtension.entitlements diff --git a/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj b/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj new file mode 100644 index 0000000000..cced99be5f --- /dev/null +++ b/src/cordova/apple/OutlineLib/OutlineLib.xcodeproj/project.pbxproj @@ -0,0 +1,455 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 56; + objects = { + +/* Begin PBXBuildFile section */ + 522C98BC2B0D67AF00E6E4A9 /* PacketTunnelProvider in Frameworks */ = {isa = PBXBuildFile; productRef = 522C98BB2B0D67AF00E6E4A9 /* PacketTunnelProvider */; }; + 52334EAF2B0D58AD00817E56 /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52334EAE2B0D58AD00817E56 /* NetworkExtension.framework */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 522C98B62B0D673200E6E4A9 /* OutlineAppleLib */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = OutlineAppleLib; path = ../OutlineAppleLib; sourceTree = ""; }; + 52334EAC2B0D58AD00817E56 /* VpnExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = VpnExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; + 52334EAE2B0D58AD00817E56 /* NetworkExtension.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NetworkExtension.framework; path = System/Library/Frameworks/NetworkExtension.framework; sourceTree = SDKROOT; }; + 52334EB32B0D58AD00817E56 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + 52334EB42B0D58AD00817E56 /* VpnExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = VpnExtension.entitlements; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 52334EA92B0D58AD00817E56 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + 52334EAF2B0D58AD00817E56 /* NetworkExtension.framework in Frameworks */, + 522C98BC2B0D67AF00E6E4A9 /* PacketTunnelProvider in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 52334DE02B0D56D600817E56 = { + isa = PBXGroup; + children = ( + 522C98B62B0D673200E6E4A9 /* OutlineAppleLib */, + 52334EB02B0D58AD00817E56 /* VpnExtension */, + 52334EAD2B0D58AD00817E56 /* Frameworks */, + 52334DEB2B0D56D600817E56 /* Products */, + ); + sourceTree = ""; + }; + 52334DEB2B0D56D600817E56 /* Products */ = { + isa = PBXGroup; + children = ( + 52334EAC2B0D58AD00817E56 /* VpnExtension.appex */, + ); + name = Products; + sourceTree = ""; + }; + 52334EAD2B0D58AD00817E56 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 52334EAE2B0D58AD00817E56 /* NetworkExtension.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + 52334EB02B0D58AD00817E56 /* VpnExtension */ = { + isa = PBXGroup; + children = ( + 52334EB32B0D58AD00817E56 /* Info.plist */, + 52334EB42B0D58AD00817E56 /* VpnExtension.entitlements */, + ); + path = VpnExtension; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 52334EAB2B0D58AD00817E56 /* VpnExtension */ = { + isa = PBXNativeTarget; + buildConfigurationList = 52334EB52B0D58AD00817E56 /* Build configuration list for PBXNativeTarget "VpnExtension" */; + buildPhases = ( + 52334EA82B0D58AD00817E56 /* Sources */, + 52334EA92B0D58AD00817E56 /* Frameworks */, + 52334EAA2B0D58AD00817E56 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = VpnExtension; + packageProductDependencies = ( + 522C98BB2B0D67AF00E6E4A9 /* PacketTunnelProvider */, + ); + productName = VpnExtension; + productReference = 52334EAC2B0D58AD00817E56 /* VpnExtension.appex */; + productType = "com.apple.product-type.app-extension"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 52334DE12B0D56D600817E56 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = 1; + KnownAssetTags = ( + New, + ); + LastSwiftUpdateCheck = 1500; + LastUpgradeCheck = 1500; + TargetAttributes = { + 52334EAB2B0D58AD00817E56 = { + CreatedOnToolsVersion = 15.0.1; + }; + }; + }; + buildConfigurationList = 52334DE42B0D56D600817E56 /* Build configuration list for PBXProject "OutlineLib" */; + compatibilityVersion = "Xcode 14.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + de, + ur, + he, + ar, + el, + "zh-Hans", + ja, + fa, + mr, + mk, + sq, + uk, + "en-GB", + am, + es, + sw, + is, + sl, + da, + "es-419", + et, + it, + bg, + sk, + "sr-Latn", + kk, + sr, + ms, + si, + ta, + ne, + sv, + cs, + km, + ko, + fil, + hy, + "zh-Hant", + mn, + my, + no, + nb, + hu, + ka, + tr, + pl, + "pt-BR", + vi, + lv, + lo, + lt, + ru, + af, + fr, + fi, + id, + nl, + th, + az, + bn, + "pt-PT", + ro, + bs, + hr, + hi, + ca, + ); + mainGroup = 52334DE02B0D56D600817E56; + packageReferences = ( + 52334EB92B0D59FA00817E56 /* XCRemoteSwiftPackageReference "CocoaLumberjack" */, + 52334EFA2B0D619D00817E56 /* XCRemoteSwiftPackageReference "sentry-cocoa" */, + ); + productRefGroup = 52334DEB2B0D56D600817E56 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 52334EAB2B0D58AD00817E56 /* VpnExtension */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 52334EAA2B0D58AD00817E56 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 52334EA82B0D58AD00817E56 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 52334DFC2B0D56D600817E56 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Debug; + }; + 52334DFD2B0D56D600817E56 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++20"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + CURRENT_PROJECT_VERSION = 1; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MACOSX_DEPLOYMENT_TARGET = 10.15; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SWIFT_COMPILATION_MODE = wholemodule; + VERSIONING_SYSTEM = "apple-generic"; + VERSION_INFO_PREFIX = ""; + }; + name = Release; + }; + 52334EB62B0D58AD00817E56 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_ENTITLEMENTS = VpnExtension/VpnExtension.entitlements; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = QT8Z3Q9V3A; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = VpnExtension/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = VpnExtension; + INFOPLIST_KEY_NSHumanReadableCopyright = ""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = org.outline.ios.client.VpnExtension; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = org.outline.macos.client.VpnExtension; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = YES; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 52334EB72B0D58AD00817E56 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_ENTITLEMENTS = VpnExtension/VpnExtension.entitlements; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + DEVELOPMENT_TEAM = QT8Z3Q9V3A; + GENERATE_INFOPLIST_FILE = YES; + INFOPLIST_FILE = VpnExtension/Info.plist; + INFOPLIST_KEY_CFBundleDisplayName = VpnExtension; + INFOPLIST_KEY_NSHumanReadableCopyright = ""; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + "@executable_path/../../Frameworks", + ); + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = org.outline.ios.client.VpnExtension; + "PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = org.outline.macos.client.VpnExtension; + PRODUCT_NAME = "$(TARGET_NAME)"; + SDKROOT = iphoneos; + SKIP_INSTALL = YES; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = YES; + SWIFT_EMIT_LOC_STRINGS = YES; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 52334DE42B0D56D600817E56 /* Build configuration list for PBXProject "OutlineLib" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 52334DFC2B0D56D600817E56 /* Debug */, + 52334DFD2B0D56D600817E56 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 52334EB52B0D58AD00817E56 /* Build configuration list for PBXNativeTarget "VpnExtension" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 52334EB62B0D58AD00817E56 /* Debug */, + 52334EB72B0D58AD00817E56 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + +/* Begin XCRemoteSwiftPackageReference section */ + 52334EB92B0D59FA00817E56 /* XCRemoteSwiftPackageReference "CocoaLumberjack" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/CocoaLumberjack/CocoaLumberjack"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 3.8.2; + }; + }; + 52334EFA2B0D619D00817E56 /* XCRemoteSwiftPackageReference "sentry-cocoa" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/getsentry/sentry-cocoa"; + requirement = { + kind = upToNextMajorVersion; + minimumVersion = 7.31.3; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + +/* Begin XCSwiftPackageProductDependency section */ + 522C98BB2B0D67AF00E6E4A9 /* PacketTunnelProvider */ = { + isa = XCSwiftPackageProductDependency; + productName = PacketTunnelProvider; + }; +/* End XCSwiftPackageProductDependency section */ + }; + rootObject = 52334DE12B0D56D600817E56 /* Project object */; +} diff --git a/src/cordova/apple/OutlineLib/VpnExtension/Info.plist b/src/cordova/apple/OutlineLib/VpnExtension/Info.plist new file mode 100644 index 0000000000..be5dcf9ee1 --- /dev/null +++ b/src/cordova/apple/OutlineLib/VpnExtension/Info.plist @@ -0,0 +1,29 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleDisplayName + VpnExtension + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + XPC! + ITSAppUsesNonExemptEncryption + + NSExtension + + NSExtensionPointIdentifier + com.apple.networkextension.packet-tunnel + NSExtensionPrincipalClass + PacketTunnelProvider + + + diff --git a/src/cordova/apple/OutlineLib/VpnExtension/VpnExtension.entitlements b/src/cordova/apple/OutlineLib/VpnExtension/VpnExtension.entitlements new file mode 100644 index 0000000000..fc1aedb9df --- /dev/null +++ b/src/cordova/apple/OutlineLib/VpnExtension/VpnExtension.entitlements @@ -0,0 +1,20 @@ + + + + + com.apple.developer.networking.networkextension + + packet-tunnel-provider + + com.apple.security.app-sandbox + + com.apple.security.application-groups + + group.org.outline.ios.client + + com.apple.security.network.client + + com.apple.security.network.server + + + diff --git a/src/cordova/apple/ios.xcworkspace/xcshareddata/swiftpm/Package.resolved b/src/cordova/apple/ios.xcworkspace/xcshareddata/swiftpm/Package.resolved index 0bd028c28b..e288394660 100644 --- a/src/cordova/apple/ios.xcworkspace/xcshareddata/swiftpm/Package.resolved +++ b/src/cordova/apple/ios.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -5,8 +5,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/CocoaLumberjack/CocoaLumberjack", "state" : { - "revision" : "0188d31089b5881a269e01777be74c7316924346", - "version" : "3.8.0" + "revision" : "363ed23d19a931809ea834a7d722da830353806a", + "version" : "3.8.2" } }, { diff --git a/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj b/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj index 394c0a0200..47a8062380 100755 --- a/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj +++ b/src/cordova/apple/xcode/ios/Outline.xcodeproj/project.pbxproj @@ -16,12 +16,11 @@ 301BF552109A68D80062928A /* libCordova.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 301BF535109A57CC0062928A /* libCordova.a */; }; 302D95F114D2391D003F00A1 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 302D95EF14D2391D003F00A1 /* MainViewController.m */; }; 302D95F214D2391D003F00A1 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = 302D95F014D2391D003F00A1 /* MainViewController.xib */; }; - 3B0347531F212F0200C8EF1F /* VpnExtension.appex in Embed App Extensions (2 items) */ = {isa = PBXBuildFile; fileRef = 3B0347481F212F0100C8EF1F /* VpnExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 52334EC82B0D5B1B00817E56 /* VpnExtension.appex in Embed App Extensions (2 items) */ = {isa = PBXBuildFile; fileRef = 52334EC62B0D5A7400817E56 /* VpnExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 52CE53E7295B6A310064D03D /* Sentry in Frameworks */ = {isa = PBXBuildFile; productRef = 52CE53E6295B6A310064D03D /* Sentry */; }; - 52E783062A5880CF00355E64 /* PacketTunnelProvider in Frameworks */ = {isa = PBXBuildFile; productRef = 52E783052A5880CF00355E64 /* PacketTunnelProvider */; }; 5F7F90AE0E924FD7B065C415 /* CDVStatusBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 0394302BA6114B2AB648D4FF /* CDVStatusBar.m */; }; 6AFF5BF91D6E424B00AB3073 /* CDVLaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */; }; - A271D4202A7069D8009981B2 /* OutlineLauncher in Frameworks */ = {isa = PBXBuildFile; productRef = A271D41F2A7069D8009981B2 /* OutlineLauncher */; }; + A271D4202A7069D8009981B2 /* OutlineLauncher in Frameworks */ = {isa = PBXBuildFile; platformFilter = maccatalyst; productRef = A271D41F2A7069D8009981B2 /* OutlineLauncher */; }; A271D4222A706CB9009981B2 /* OutlineAppKitBridge in Frameworks */ = {isa = PBXBuildFile; productRef = A271D4212A706CB9009981B2 /* OutlineAppKitBridge */; }; A271D42D2A708240009981B2 /* AppDelegate+Outline.m in Sources */ = {isa = PBXBuildFile; fileRef = A271D42C2A708240009981B2 /* AppDelegate+Outline.m */; }; A271D4302A708278009981B2 /* CocoaLumberjack in Frameworks */ = {isa = PBXBuildFile; productRef = A271D42F2A708278009981B2 /* CocoaLumberjack */; }; @@ -32,7 +31,6 @@ A2A83B392A1C5B2E00755F56 /* OutlineLauncher.app in Copy OutlineLauncher */ = {isa = PBXBuildFile; fileRef = A26D262D2A1C41B1009838E0 /* OutlineLauncher.app */; platformFilter = maccatalyst; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; A2B8C14D2A58B70E0054487E /* AppKitBridge.bundle in Embed PlugIns */ = {isa = PBXBuildFile; fileRef = A2DBB2F62A00D2DD0017E696 /* AppKitBridge.bundle */; platformFilter = maccatalyst; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; A2DBB2FB2A00D2F90017E696 /* AppKitBridge.bundle in Embed App Extensions (2 items) */ = {isa = PBXBuildFile; fileRef = A2DBB2F62A00D2DD0017E696 /* AppKitBridge.bundle */; platformFilter = maccatalyst; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - FC8C310B1FAA814A004262BE /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC8C310A1FAA814A004262BE /* NetworkExtension.framework */; }; FC8C310C1FAA88FB004262BE /* NetworkExtension.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FC8C310A1FAA814A004262BE /* NetworkExtension.framework */; }; /* End PBXBuildFile section */ @@ -51,13 +49,6 @@ remoteGlobalIDString = D2AAC07D0554694100DB518D; remoteInfo = CordovaLib; }; - 3B0347511F212F0200C8EF1F /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; - proxyType = 1; - remoteGlobalIDString = 3B0347471F212F0100C8EF1F; - remoteInfo = VpnExtension; - }; 3BE967001F211C7E0077C3AC /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */; @@ -65,6 +56,20 @@ remoteGlobalIDString = C0C01EB21E3911D50056E6CB; remoteInfo = Cordova; }; + 52334EC52B0D5A7400817E56 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 52334E042B0D56D600817E56 /* OutlineLib.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 52334EAC2B0D58AD00817E56; + remoteInfo = VpnExtension; + }; + 52334EC92B0D5B2D00817E56 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 52334E042B0D56D600817E56 /* OutlineLib.xcodeproj */; + proxyType = 1; + remoteGlobalIDString = 52334EAB2B0D58AD00817E56; + remoteInfo = VpnExtension; + }; A2B8C14E2A58B70E0054487E /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 29B97313FDCFA39411CA2CEA /* Project object */; @@ -96,7 +101,7 @@ dstSubfolderSpec = 13; files = ( A2DBB2FB2A00D2F90017E696 /* AppKitBridge.bundle in Embed App Extensions (2 items) */, - 3B0347531F212F0200C8EF1F /* VpnExtension.appex in Embed App Extensions (2 items) */, + 52334EC82B0D5B1B00817E56 /* VpnExtension.appex in Embed App Extensions (2 items) */, ); name = "Embed App Extensions (2 items)"; runOnlyForDeploymentPostprocessing = 0; @@ -154,8 +159,7 @@ 3047A5111AB8059700498E2A /* build.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = build.xcconfig; path = cordova/build.xcconfig; sourceTree = SOURCE_ROOT; }; 32CA4F630368D1EE00C91783 /* Outline-Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "Outline-Prefix.pch"; sourceTree = ""; }; 3B0347431F212E6500C8EF1F /* Outline.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Outline.entitlements; path = Outline/Outline.entitlements; sourceTree = ""; }; - 3B0347481F212F0100C8EF1F /* VpnExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = VpnExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; }; - 3B03475B1F212F2D00C8EF1F /* VpnExtension.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; name = VpnExtension.entitlements; path = Outline/VpnExtension.entitlements; sourceTree = SOURCE_ROOT; }; + 52334E042B0D56D600817E56 /* OutlineLib.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = OutlineLib.xcodeproj; path = ../../src/cordova/apple/OutlineLib/OutlineLib.xcodeproj; sourceTree = ""; }; 6AFF5BF81D6E424B00AB3073 /* CDVLaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = CDVLaunchScreen.storyboard; path = Outline/CDVLaunchScreen.storyboard; sourceTree = SOURCE_ROOT; }; 8D1107310486CEB800E47090 /* Outline-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = "Outline-Info.plist"; path = "Outline/Outline-Info.plist"; plistStructureDefinitionIdentifier = "com.apple.xcode.plist.structure-definition.iphone.info-plist"; sourceTree = SOURCE_ROOT; }; 91E45572BB494E9299D2DD41 /* CDVClipboard.m */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 4; includeInIndex = 0; lastKnownFileType = sourcecode.c.objc; name = CDVClipboard.m; path = "cordova-plugin-clipboard/CDVClipboard.m"; sourceTree = ""; }; @@ -191,15 +195,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3B0347451F212F0100C8EF1F /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - FC8C310B1FAA814A004262BE /* NetworkExtension.framework in Frameworks */, - 52E783062A5880CF00355E64 /* PacketTunnelProvider in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; A26D262A2A1C41B1009838E0 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -238,7 +233,6 @@ isa = PBXGroup; children = ( 1D6058910D05DD3D006BFB54 /* Outline.app */, - 3B0347481F212F0100C8EF1F /* VpnExtension.appex */, A2DBB2F62A00D2DD0017E696 /* AppKitBridge.bundle */, A26D262D2A1C41B1009838E0 /* OutlineLauncher.app */, ); @@ -248,6 +242,7 @@ 29B97314FDCFA39411CA2CEA /* CustomTemplate */ = { isa = PBXGroup; children = ( + 52334E042B0D56D600817E56 /* OutlineLib.xcodeproj */, F6D33648296CF46200AFD613 /* Packages */, 3B0347431F212E6500C8EF1F /* Outline.entitlements */, EB87FDF41871DAF40020F90C /* config.xml */, @@ -258,7 +253,6 @@ 307C750510C5A3420062BCA9 /* Plugins */, 29B97315FDCFA39411CA2CEA /* Other Sources */, 29B97317FDCFA39411CA2CEA /* Resources */, - 3B0347491F212F0200C8EF1F /* VpnExtension */, A26D262E2A1C41B1009838E0 /* OutlineLauncher */, 29B97323FDCFA39411CA2CEA /* Frameworks */, 19C28FACFE9D520D11CA2CBB /* Products */, @@ -331,13 +325,12 @@ path = Outline/Plugins; sourceTree = SOURCE_ROOT; }; - 3B0347491F212F0200C8EF1F /* VpnExtension */ = { + 52334E052B0D56D600817E56 /* Products */ = { isa = PBXGroup; children = ( - 3B03475B1F212F2D00C8EF1F /* VpnExtension.entitlements */, + 52334EC62B0D5A7400817E56 /* VpnExtension.appex */, ); - name = VpnExtension; - path = Outline/Resources/vpn; + name = Products; sourceTree = ""; }; A26D262E2A1C41B1009838E0 /* OutlineLauncher */ = { @@ -383,10 +376,10 @@ buildRules = ( ); dependencies = ( + 52334ECA2B0D5B2D00817E56 /* PBXTargetDependency */, A2F6068E2A1C6D4A0039183A /* PBXTargetDependency */, A2DBB3042A00D5F90017E696 /* PBXTargetDependency */, 301BF551109A68C00062928A /* PBXTargetDependency */, - 3B0347521F212F0200C8EF1F /* PBXTargetDependency */, ); name = Outline; packageProductDependencies = ( @@ -399,25 +392,6 @@ productReference = 1D6058910D05DD3D006BFB54 /* Outline.app */; productType = "com.apple.product-type.application"; }; - 3B0347471F212F0100C8EF1F /* VpnExtension */ = { - isa = PBXNativeTarget; - buildConfigurationList = 3B0347541F212F0200C8EF1F /* Build configuration list for PBXNativeTarget "VpnExtension" */; - buildPhases = ( - 3B0347441F212F0100C8EF1F /* Sources */, - 3B0347451F212F0100C8EF1F /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = VpnExtension; - packageProductDependencies = ( - 52E783052A5880CF00355E64 /* PacketTunnelProvider */, - ); - productName = VpnExtension; - productReference = 3B0347481F212F0100C8EF1F /* VpnExtension.appex */; - productType = "com.apple.product-type.app-extension"; - }; A26D262C2A1C41B1009838E0 /* OutlineLauncher */ = { isa = PBXNativeTarget; buildConfigurationList = A26D26392A1C41B4009838E0 /* Build configuration list for PBXNativeTarget "OutlineLauncher" */; @@ -475,15 +449,6 @@ }; }; }; - 3B0347471F212F0100C8EF1F = { - CreatedOnToolsVersion = 8.3.3; - LastSwiftMigration = 1130; - SystemCapabilities = { - com.apple.ApplicationGroups.iOS = { - enabled = 1; - }; - }; - }; A26D262C2A1C41B1009838E0 = { CreatedOnToolsVersion = 14.3; }; @@ -512,11 +477,14 @@ ProductGroup = 301BF52E109A57CC0062928A /* Products */; ProjectRef = 301BF52D109A57CC0062928A /* CordovaLib/CordovaLib.xcodeproj */; }, + { + ProductGroup = 52334E052B0D56D600817E56 /* Products */; + ProjectRef = 52334E042B0D56D600817E56 /* OutlineLib.xcodeproj */; + }, ); projectRoot = ""; targets = ( 1D6058900D05DD3D006BFB54 /* Outline */, - 3B0347471F212F0100C8EF1F /* VpnExtension */, A2DBB2F52A00D2DD0017E696 /* AppKitBridge */, A26D262C2A1C41B1009838E0 /* OutlineLauncher */, ); @@ -538,6 +506,13 @@ remoteRef = 3BE967001F211C7E0077C3AC /* PBXContainerItemProxy */; sourceTree = BUILT_PRODUCTS_DIR; }; + 52334EC62B0D5A7400817E56 /* VpnExtension.appex */ = { + isa = PBXReferenceProxy; + fileType = "wrapper.app-extension"; + path = VpnExtension.appex; + remoteRef = 52334EC52B0D5A7400817E56 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; /* End PBXReferenceProxy section */ /* Begin PBXResourcesBuildPhase section */ @@ -585,13 +560,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 3B0347441F212F0100C8EF1F /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; A25EB8812A8437D700B92EE0 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -614,10 +582,10 @@ name = CordovaLib; targetProxy = 301BF550109A68C00062928A /* PBXContainerItemProxy */; }; - 3B0347521F212F0200C8EF1F /* PBXTargetDependency */ = { + 52334ECA2B0D5B2D00817E56 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 3B0347471F212F0100C8EF1F /* VpnExtension */; - targetProxy = 3B0347511F212F0200C8EF1F /* PBXContainerItemProxy */; + name = VpnExtension; + targetProxy = 52334EC92B0D5B2D00817E56 /* PBXContainerItemProxy */; }; A2B8C14F2A58B70E0054487E /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -680,7 +648,7 @@ STRIP_BITCODE_FROM_COPIED_FILES = NO; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = YES; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,6"; VALIDATE_WORKSPACE = NO; @@ -725,123 +693,13 @@ STRIP_BITCODE_FROM_COPIED_FILES = NO; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; SUPPORTS_MACCATALYST = YES; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,6"; VALIDATE_WORKSPACE = NO; }; name = Release; }; - 3B0347551F212F0200C8EF1F /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3047A50F1AB8059700498E2A /* build-debug.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Outline/VpnExtension.entitlements"; - CODE_SIGN_IDENTITY = "iPhone Developer"; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - DEVELOPMENT_TEAM = QT8Z3Q9V3A; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Outline/Plugins/cordova-plugin-outline", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "$(SRCROOT)/Outline/VpnExtension-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = YES; - PRODUCT_BUNDLE_IDENTIFIER = org.outline.ios.client.VpnExtension; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = org.outline.macos.client.VpnExtension; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SKIP_INSTALL = YES; - STRIP_BITCODE_FROM_COPIED_FILES = NO; - SUPPORTS_MACCATALYST = YES; - SWIFT_INSTALL_OBJC_HEADER = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 3B0347561F212F0200C8EF1F /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = 3047A5101AB8059700498E2A /* build-release.xcconfig */; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNREACHABLE_CODE = YES; - CODE_SIGN_ENTITLEMENTS = "$(SRCROOT)/Outline/VpnExtension.entitlements"; - CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEVELOPMENT_TEAM = QT8Z3Q9V3A; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Outline/Plugins/cordova-plugin-outline", - ); - GCC_C_LANGUAGE_STANDARD = gnu99; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_64_TO_32_BIT_CONVERSION = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - INFOPLIST_FILE = "$(SRCROOT)/Outline/VpnExtension-Info.plist"; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@executable_path/../../Frameworks", - ); - MTL_ENABLE_DEBUG_INFO = NO; - PRODUCT_BUNDLE_IDENTIFIER = org.outline.ios.client.VpnExtension; - "PRODUCT_BUNDLE_IDENTIFIER[sdk=macosx*]" = org.outline.macos.client.VpnExtension; - PRODUCT_NAME = "$(TARGET_NAME)"; - PROVISIONING_PROFILE_SPECIFIER = ""; - SKIP_INSTALL = YES; - STRIP_BITCODE_FROM_COPIED_FILES = NO; - SUPPORTS_MACCATALYST = YES; - SWIFT_INSTALL_OBJC_HEADER = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; A26D263A2A1C41B4009838E0 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -887,6 +745,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.outline.macos.client.launcher3; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -940,6 +799,7 @@ MTL_FAST_MATH = YES; PRODUCT_BUNDLE_IDENTIFIER = org.outline.macos.client.launcher3; PRODUCT_NAME = "$(TARGET_NAME)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = macosx; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -1142,15 +1002,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 3B0347541F212F0200C8EF1F /* Build configuration list for PBXNativeTarget "VpnExtension" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 3B0347551F212F0200C8EF1F /* Debug */, - 3B0347561F212F0200C8EF1F /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; A26D26392A1C41B4009838E0 /* Build configuration list for PBXNativeTarget "OutlineLauncher" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -1205,10 +1056,6 @@ package = 52CE53E5295B6A310064D03D /* XCRemoteSwiftPackageReference "sentry-cocoa" */; productName = Sentry; }; - 52E783052A5880CF00355E64 /* PacketTunnelProvider */ = { - isa = XCSwiftPackageProductDependency; - productName = PacketTunnelProvider; - }; A271D41F2A7069D8009981B2 /* OutlineLauncher */ = { isa = XCSwiftPackageProductDependency; productName = OutlineLauncher;