From 4d8a316e21a211dd17a5353bc5eb06f276f70d8c Mon Sep 17 00:00:00 2001 From: Jamil Date: Mon, 1 May 2023 13:08:56 -0700 Subject: [PATCH] Remove code signing; connlibTests to simplify (#17) simplify info.plist I hope --- apple/Cargo.lock | 4 +- apple/connlib.xcodeproj/project.pbxproj | 122 +----------------------- 2 files changed, 6 insertions(+), 120 deletions(-) diff --git a/apple/Cargo.lock b/apple/Cargo.lock index 357a511..14afc01 100644 --- a/apple/Cargo.lock +++ b/apple/Cargo.lock @@ -179,7 +179,7 @@ dependencies = [ [[package]] name = "connlib-apple" -version = "0.1.4" +version = "0.1.6" dependencies = [ "firezone-connlib", "libc", @@ -286,7 +286,7 @@ checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "firezone-connlib" -version = "0.1.4" +version = "0.1.6" dependencies = [ "android_logger", "boringtun", diff --git a/apple/connlib.xcodeproj/project.pbxproj b/apple/connlib.xcodeproj/project.pbxproj index 1789b97..cfa7514 100644 --- a/apple/connlib.xcodeproj/project.pbxproj +++ b/apple/connlib.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ 8D46EDDF29DBC29800FF01CA /* Adapter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D46EDD729DBC29800FF01CA /* Adapter.swift */; }; 8D46EDE029DBC29800FF01CA /* CallbackHandler.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8D46EDD829DBC29800FF01CA /* CallbackHandler.swift */; }; - 8D7D983C29DB8437007B8198 /* connlib.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D7D983129DB8437007B8198 /* connlib.framework */; }; 8D967B2B29DBA064000B9D58 /* libconnlib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D967B2A29DBA03F000B9D58 /* libconnlib.a */; }; 8DA207F829DBD80C00703A4A /* connlib-apple.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8DA207F329DBD80C00703A4A /* connlib-apple.swift */; }; 8DA207F929DBD80C00703A4A /* connlib-apple.h in Headers */ = {isa = PBXBuildFile; fileRef = 8DA207F429DBD80C00703A4A /* connlib-apple.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -20,16 +19,6 @@ 8DA207FF29DBD86100703A4A /* BridgingHeader.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D46EDD629DBC29800FF01CA /* BridgingHeader.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ -/* Begin PBXContainerItemProxy section */ - 8D7D983D29DB8437007B8198 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 8D7D982829DB8437007B8198 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 8D7D983029DB8437007B8198; - remoteInfo = connlib; - }; -/* End PBXContainerItemProxy section */ - /* Begin PBXFileReference section */ 8D209DCE29DBE96B00B68D27 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS16.4.sdk/System/Library/Frameworks/Security.framework; sourceTree = DEVELOPER_DIR; }; 8D46EDD629DBC29800FF01CA /* BridgingHeader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BridgingHeader.h; sourceTree = ""; }; @@ -37,7 +26,6 @@ 8D46EDD829DBC29800FF01CA /* CallbackHandler.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallbackHandler.swift; sourceTree = ""; }; 8D4BADD129DBD6CC00940F0D /* connlib.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = connlib.h; sourceTree = ""; }; 8D7D983129DB8437007B8198 /* connlib.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = connlib.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 8D7D983B29DB8437007B8198 /* connlibTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = connlibTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 8D967B2629DB9A3B000B9D58 /* build-rust.sh */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.sh; path = "build-rust.sh"; sourceTree = ""; }; 8D967B2A29DBA03F000B9D58 /* libconnlib.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libconnlib.a; path = target/universal/debug/libconnlib.a; sourceTree = ""; }; 8DA207F329DBD80C00703A4A /* connlib-apple.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "connlib-apple.swift"; sourceTree = ""; }; @@ -56,14 +44,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 8D7D983829DB8437007B8198 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - 8D7D983C29DB8437007B8198 /* connlib.framework in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -94,7 +74,6 @@ isa = PBXGroup; children = ( 8D7D983129DB8437007B8198 /* connlib.framework */, - 8D7D983B29DB8437007B8198 /* connlibTests.xctest */, ); name = Products; sourceTree = ""; @@ -179,24 +158,6 @@ productReference = 8D7D983129DB8437007B8198 /* connlib.framework */; productType = "com.apple.product-type.framework"; }; - 8D7D983A29DB8437007B8198 /* connlibTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 8D7D984829DB8437007B8198 /* Build configuration list for PBXNativeTarget "connlibTests" */; - buildPhases = ( - 8D7D983729DB8437007B8198 /* Sources */, - 8D7D983829DB8437007B8198 /* Frameworks */, - 8D7D983929DB8437007B8198 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 8D7D983E29DB8437007B8198 /* PBXTargetDependency */, - ); - name = connlibTests; - productName = connlibTests; - productReference = 8D7D983B29DB8437007B8198 /* connlibTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -210,9 +171,6 @@ 8D7D983029DB8437007B8198 = { CreatedOnToolsVersion = 14.3; }; - 8D7D983A29DB8437007B8198 = { - CreatedOnToolsVersion = 14.3; - }; }; }; buildConfigurationList = 8D7D982B29DB8437007B8198 /* Build configuration list for PBXProject "connlib" */; @@ -229,7 +187,6 @@ projectRoot = ""; targets = ( 8D7D983029DB8437007B8198 /* connlib */, - 8D7D983A29DB8437007B8198 /* connlibTests */, ); }; /* End PBXProject section */ @@ -243,13 +200,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 8D7D983929DB8437007B8198 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ @@ -284,23 +234,8 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 8D7D983729DB8437007B8198 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ -/* Begin PBXTargetDependency section */ - 8D7D983E29DB8437007B8198 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 8D7D983029DB8437007B8198 /* connlib */; - targetProxy = 8D7D983D29DB8437007B8198 /* PBXContainerItemProxy */; - }; -/* End PBXTargetDependency section */ - /* Begin XCBuildConfiguration section */ 8D7D984329DB8437007B8198 /* Debug */ = { isa = XCBuildConfiguration; @@ -425,7 +360,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 47R2M6779T; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -449,6 +384,7 @@ MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; PRODUCT_BUNDLE_IDENTIFIER = dev.firezone.connlib; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = auto; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -466,7 +402,7 @@ CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 1; DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 47R2M6779T; + DEVELOPMENT_TEAM = ""; DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; @@ -493,6 +429,7 @@ MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu11 gnu++20"; PRODUCT_BUNDLE_IDENTIFIER = dev.firezone.connlib; PRODUCT_NAME = "$(TARGET_NAME:c99extidentifier)"; + PROVISIONING_PROFILE_SPECIFIER = ""; SDKROOT = auto; SKIP_INSTALL = YES; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -502,48 +439,6 @@ }; name = Release; }; - 8D7D984929DB8437007B8198 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 47R2M6779T; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; - MACOSX_DEPLOYMENT_TARGET = 13.3; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "dev.firezone.connlib-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - 8D7D984A29DB8437007B8198 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_TEAM = 47R2M6779T; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.4; - MACOSX_DEPLOYMENT_TARGET = 13.3; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "dev.firezone.connlib-tests"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -565,15 +460,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 8D7D984829DB8437007B8198 /* Build configuration list for PBXNativeTarget "connlibTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 8D7D984929DB8437007B8198 /* Debug */, - 8D7D984A29DB8437007B8198 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 8D7D982829DB8437007B8198 /* Project object */;