From 1da3dbd8f6be41b99c58298635f5ec96f1037125 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 12:24:17 -0700 Subject: [PATCH 01/12] Get Package.swift building on all platforms --- Package.swift | 9 +-------- Sources/Valet/SinglePromptSecureEnclaveValet.swift | 4 ++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Package.swift b/Package.swift index 1fe775a8..0c04c516 100644 --- a/Package.swift +++ b/Package.swift @@ -20,14 +20,7 @@ let package = Package( .target( name: "Valet", dependencies: []), - .target( - name: "LegacyValet", - dependencies: [], - publicHeadersPath: "Public"), - .testTarget( - name: "ValetTests", - dependencies: ["Valet"]) ], swiftLanguageVersions: [.v4, .v4_2, .v5] ) -let version = Version(3, 2, 5) +let version = Version(3, 2, 7) diff --git a/Sources/Valet/SinglePromptSecureEnclaveValet.swift b/Sources/Valet/SinglePromptSecureEnclaveValet.swift index f7564199..d0bf24d7 100644 --- a/Sources/Valet/SinglePromptSecureEnclaveValet.swift +++ b/Sources/Valet/SinglePromptSecureEnclaveValet.swift @@ -18,6 +18,8 @@ // limitations under the License. // +#if os(iOS) || os(macOS) + import LocalAuthentication import Foundation @@ -312,3 +314,5 @@ extension SinglePromptSecureEnclaveValet { } } } + +#endif From ae112f43c994bd3a9a71b1c5f105229ee4d66198 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 12:24:46 -0700 Subject: [PATCH 02/12] Make manual Valet.xcodeproj more closely match Package.swift --- Valet.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Valet.xcodeproj/project.pbxproj b/Valet.xcodeproj/project.pbxproj index a49ddd03..79189d7d 100644 --- a/Valet.xcodeproj/project.pbxproj +++ b/Valet.xcodeproj/project.pbxproj @@ -191,6 +191,8 @@ 16DF6B0D204B496800F8E0A4 /* Valet watchOS Test Host App.app in Embed Watch Content */ = {isa = PBXBuildFile; fileRef = 16DF6AF3204B496800F8E0A4 /* Valet watchOS Test Host App.app */; }; 16DF6B1F204B4DA600F8E0A4 /* Valet.framework in Resources */ = {isa = PBXBuildFile; fileRef = 16DF6ADA204B45EB00F8E0A4 /* Valet.framework */; }; 3251BD06224C865E0007453B /* XCTest.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 16D77541215BFC1D004F060C /* XCTest.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; + 32E7115B2336B03800018E15 /* SinglePromptSecureEnclaveValet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD7922A9CAAB00FC1142 /* SinglePromptSecureEnclaveValet.swift */; }; + 32E7115C2336B03800018E15 /* SinglePromptSecureEnclaveValet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD7922A9CAAB00FC1142 /* SinglePromptSecureEnclaveValet.swift */; }; 371150A81E2962D8004A45D4 /* ValetIOSTestHostAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371150A71E2962D8004A45D4 /* ValetIOSTestHostAppDelegate.swift */; }; 371150AA1E2962D8004A45D4 /* ValetIOSTestHostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371150A91E2962D8004A45D4 /* ValetIOSTestHostViewController.swift */; }; 371150AD1E2962D8004A45D4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 371150AB1E2962D8004A45D4 /* Main.storyboard */; }; @@ -1698,6 +1700,7 @@ 1612FD8F22A9CAAB00FC1142 /* Valet.swift in Sources */, 1612FD9322A9CAAB00FC1142 /* SecItem.swift in Sources */, 1612FDB722A9CAAB00FC1142 /* SwiftCompatibility.swift in Sources */, + 32E7115B2336B03800018E15 /* SinglePromptSecureEnclaveValet.swift in Sources */, 1612FDBF22A9CAAB00FC1142 /* Identifier.swift in Sources */, 1612FD8B22A9CAAB00FC1142 /* CloudAccessibility.swift in Sources */, 1612FD9B22A9CAAB00FC1142 /* Keychain.swift in Sources */, @@ -1737,6 +1740,7 @@ 1612FD9022A9CAAB00FC1142 /* Valet.swift in Sources */, 1612FD9422A9CAAB00FC1142 /* SecItem.swift in Sources */, 1612FDB822A9CAAB00FC1142 /* SwiftCompatibility.swift in Sources */, + 32E7115C2336B03800018E15 /* SinglePromptSecureEnclaveValet.swift in Sources */, 1612FDC022A9CAAB00FC1142 /* Identifier.swift in Sources */, 1612FD8C22A9CAAB00FC1142 /* CloudAccessibility.swift in Sources */, 1612FD9C22A9CAAB00FC1142 /* Keychain.swift in Sources */, From 92edeebc9b88a6323609245bfebf6b12ea03ae00 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 12:35:58 -0700 Subject: [PATCH 03/12] Add Xcode11 CI for SPM --- .travis.yml | 9 +++++++++ Scripts/ci.sh | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/.travis.yml b/.travis.yml index de235850..16f97a7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,15 @@ script: - ./Scripts/ci.sh matrix: include: + - osx_image: xcode11 + env: ACTION="swift-package";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=13,name=iPhone 11" + - osx_image: xcode11 + env: ACTION="swift-package";SDK="appletvsimulator13.0";DESTINATION="platform=tvOS Simulator,name=Apple TV" + - osx_image: xcode11 + env: ACTION="swift-package";SDK="macosx10.15";DESTINATION="platform=OS X" + - osx_image: xcode11 + env: ACTION="swift-package";SDK="watchos6.0";DESTINATION="" + - osx_image: xcode10.2 env: ACTION="xcode";SCHEME="Valet iOS";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=12.2,name=iPhone X";XCODE_ACTION="build test" - osx_image: xcode10.2 diff --git a/Scripts/ci.sh b/Scripts/ci.sh index 450fba83..4382b25d 100755 --- a/Scripts/ci.sh +++ b/Scripts/ci.sh @@ -9,6 +9,15 @@ if [ $ACTION == "xcode" ]; then fi fi +if [ $ACTION == "swift-package" ]; then + swift package generate-xcodeproj --output generated/ + if [ -n "$DESTINATION" ]; then + xcodebuild -project generated/Valet.xcodeproj -scheme "Valet-Package" -sdk $SDK -destination "$DESTINATION" -configuration Release -PBXBuildsContinueAfterErrors=0 build + else + xcodebuild -project generated/Valet.xcodeproj -scheme "Valet-Package" -sdk $SDK -configuration Release -PBXBuildsContinueAfterErrors=0 build + fi +fi + if [ $ACTION == "pod-lint" ]; then bundle exec pod lib lint --verbose --fail-fast --swift-version=$SWIFT_VERSION fi From 5277538b692fe24ffa2c35aca3ce7d4ce2057781 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 12:37:14 -0700 Subject: [PATCH 04/12] Add more xcode11 CI jobs --- .travis.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.travis.yml b/.travis.yml index 16f97a7d..df1c397b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,6 +14,18 @@ matrix: env: ACTION="swift-package";SDK="macosx10.15";DESTINATION="platform=OS X" - osx_image: xcode11 env: ACTION="swift-package";SDK="watchos6.0";DESTINATION="" + - osx_image: xcode11 + env: ACTION="xcode";SCHEME="Valet iOS";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=13,name=iPhone 11";XCODE_ACTION="build test" + - osx_image: xcode11 + env: ACTION="xcode";SCHEME="Valet tvOS";SDK="appletvsimulator13.0";DESTINATION="platform=tvOS Simulator,name=Apple TV";XCODE_ACTION="build test" + - osx_image: xcode11 + env: ACTION="xcode";SCHEME="Valet Mac";SDK="macosx10.15";DESTINATION="platform=OS X";XCODE_ACTION="build test" + - osx_image: xcode11 + env: ACTION="xcode";SCHEME="Valet watchOS";SDK="watchos6.0";DESTINATION="";XCODE_ACTION="build" + - osx_image: xcode11 + env: ACTION="pod-lint";SWIFT_VERSION="5.0" + - osx_image: xcode11 + env: ACTION="carthage" - osx_image: xcode10.2 env: ACTION="xcode";SCHEME="Valet iOS";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=12.2,name=iPhone X";XCODE_ACTION="build test" From 430463030d8be164119eca8d126d85934d199646 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 12:37:56 -0700 Subject: [PATCH 05/12] swift-package comes first --- Scripts/ci.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Scripts/ci.sh b/Scripts/ci.sh index 4382b25d..8fefaef9 100755 --- a/Scripts/ci.sh +++ b/Scripts/ci.sh @@ -1,20 +1,20 @@ #!/bin/bash -l set -ex -if [ $ACTION == "xcode" ]; then +if [ $ACTION == "swift-package" ]; then + swift package generate-xcodeproj --output generated/ if [ -n "$DESTINATION" ]; then - xcodebuild -UseModernBuildSystem=NO -project Valet.xcodeproj -scheme "$SCHEME" -sdk $SDK -destination "$DESTINATION" -configuration Debug -PBXBuildsContinueAfterErrors=0 $XCODE_ACTION + xcodebuild -project generated/Valet.xcodeproj -scheme "Valet-Package" -sdk $SDK -destination "$DESTINATION" -configuration Release -PBXBuildsContinueAfterErrors=0 build else - xcodebuild -UseModernBuildSystem=NO -project Valet.xcodeproj -scheme "$SCHEME" -sdk $SDK -configuration Debug -PBXBuildsContinueAfterErrors=0 $XCODE_ACTION + xcodebuild -project generated/Valet.xcodeproj -scheme "Valet-Package" -sdk $SDK -configuration Release -PBXBuildsContinueAfterErrors=0 build fi fi -if [ $ACTION == "swift-package" ]; then - swift package generate-xcodeproj --output generated/ +if [ $ACTION == "xcode" ]; then if [ -n "$DESTINATION" ]; then - xcodebuild -project generated/Valet.xcodeproj -scheme "Valet-Package" -sdk $SDK -destination "$DESTINATION" -configuration Release -PBXBuildsContinueAfterErrors=0 build + xcodebuild -UseModernBuildSystem=NO -project Valet.xcodeproj -scheme "$SCHEME" -sdk $SDK -destination "$DESTINATION" -configuration Debug -PBXBuildsContinueAfterErrors=0 $XCODE_ACTION else - xcodebuild -project generated/Valet.xcodeproj -scheme "Valet-Package" -sdk $SDK -configuration Release -PBXBuildsContinueAfterErrors=0 build + xcodebuild -UseModernBuildSystem=NO -project Valet.xcodeproj -scheme "$SCHEME" -sdk $SDK -configuration Debug -PBXBuildsContinueAfterErrors=0 $XCODE_ACTION fi fi From 2e886073a93f21ec1f36a24d0f9b74cfc84e6c76 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 12:47:07 -0700 Subject: [PATCH 06/12] Update destination name for iOS 13 target --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index df1c397b..3995cfb3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ script: matrix: include: - osx_image: xcode11 - env: ACTION="swift-package";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=13,name=iPhone 11" + env: ACTION="swift-package";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=13,name=iPad Pro (12.9-inch) (3rd generation)" - osx_image: xcode11 env: ACTION="swift-package";SDK="appletvsimulator13.0";DESTINATION="platform=tvOS Simulator,name=Apple TV" - osx_image: xcode11 @@ -15,7 +15,7 @@ matrix: - osx_image: xcode11 env: ACTION="swift-package";SDK="watchos6.0";DESTINATION="" - osx_image: xcode11 - env: ACTION="xcode";SCHEME="Valet iOS";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=13,name=iPhone 11";XCODE_ACTION="build test" + env: ACTION="xcode";SCHEME="Valet iOS";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=13,name=iPad Pro (12.9-inch) (3rd generation)";XCODE_ACTION="build test" - osx_image: xcode11 env: ACTION="xcode";SCHEME="Valet tvOS";SDK="appletvsimulator13.0";DESTINATION="platform=tvOS Simulator,name=Apple TV";XCODE_ACTION="build test" - osx_image: xcode11 From 4d4e847126234521da07200a7406cae17bfc3b19 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 12:53:16 -0700 Subject: [PATCH 07/12] OS=13.0 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3995cfb3..af419f9a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ script: matrix: include: - osx_image: xcode11 - env: ACTION="swift-package";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=13,name=iPad Pro (12.9-inch) (3rd generation)" + env: ACTION="swift-package";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=13.0,name=iPad Pro (12.9-inch) (3rd generation)" - osx_image: xcode11 env: ACTION="swift-package";SDK="appletvsimulator13.0";DESTINATION="platform=tvOS Simulator,name=Apple TV" - osx_image: xcode11 @@ -15,7 +15,7 @@ matrix: - osx_image: xcode11 env: ACTION="swift-package";SDK="watchos6.0";DESTINATION="" - osx_image: xcode11 - env: ACTION="xcode";SCHEME="Valet iOS";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=13,name=iPad Pro (12.9-inch) (3rd generation)";XCODE_ACTION="build test" + env: ACTION="xcode";SCHEME="Valet iOS";SDK="iphonesimulator";DESTINATION="platform=iOS Simulator,OS=13.0,name=iPad Pro (12.9-inch) (3rd generation)";XCODE_ACTION="build test" - osx_image: xcode11 env: ACTION="xcode";SCHEME="Valet tvOS";SDK="appletvsimulator13.0";DESTINATION="platform=tvOS Simulator,name=Apple TV";XCODE_ACTION="build test" - osx_image: xcode11 From 0a74c6cecc563e3313ba43c5f845f06f146e65aa Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 13:09:21 -0700 Subject: [PATCH 08/12] Allow the file SinglePromptSecureEnclaveTests.swift to be included in tvOS tests --- Tests/ValetTests/SinglePromptSecureEnclaveTests.swift | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Tests/ValetTests/SinglePromptSecureEnclaveTests.swift b/Tests/ValetTests/SinglePromptSecureEnclaveTests.swift index 34925b62..bd8151d7 100644 --- a/Tests/ValetTests/SinglePromptSecureEnclaveTests.swift +++ b/Tests/ValetTests/SinglePromptSecureEnclaveTests.swift @@ -18,6 +18,8 @@ // limitations under the License. // +#if os(iOS) || os(macOS) + import Foundation @testable import Valet import XCTest @@ -66,3 +68,5 @@ class SinglePromptSecureEnclaveTests: XCTestCase XCTAssertTrue(valet === equivalentValet) } } + +#endif From 7ea68199128ff75e5e3d0848ff5164b7779e88b7 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 13:09:55 -0700 Subject: [PATCH 09/12] Remove LegacyValet targets for tvOS and watchOS, since those targets were never supported either OS --- Valet.xcodeproj/project.pbxproj | 362 +------------------------------- 1 file changed, 4 insertions(+), 358 deletions(-) diff --git a/Valet.xcodeproj/project.pbxproj b/Valet.xcodeproj/project.pbxproj index 79189d7d..63058f06 100644 --- a/Valet.xcodeproj/project.pbxproj +++ b/Valet.xcodeproj/project.pbxproj @@ -17,13 +17,10 @@ 1612FD1822A9C95500FC1142 /* SinglePromptSecureEnclaveBackwardsCompatibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0222A9C95400FC1142 /* SinglePromptSecureEnclaveBackwardsCompatibilityTests.swift */; }; 1612FD1A22A9C95500FC1142 /* SynchronizableBackwardsCompatibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0322A9C95400FC1142 /* SynchronizableBackwardsCompatibilityTests.swift */; }; 1612FD1B22A9C95500FC1142 /* SynchronizableBackwardsCompatibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0322A9C95400FC1142 /* SynchronizableBackwardsCompatibilityTests.swift */; }; - 1612FD1C22A9C95500FC1142 /* SynchronizableBackwardsCompatibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0322A9C95400FC1142 /* SynchronizableBackwardsCompatibilityTests.swift */; }; 1612FD1D22A9C95500FC1142 /* SecureEnclaveBackwardsCompatibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0422A9C95400FC1142 /* SecureEnclaveBackwardsCompatibilityTests.swift */; }; 1612FD1E22A9C95500FC1142 /* SecureEnclaveBackwardsCompatibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0422A9C95400FC1142 /* SecureEnclaveBackwardsCompatibilityTests.swift */; }; - 1612FD1F22A9C95500FC1142 /* SecureEnclaveBackwardsCompatibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0422A9C95400FC1142 /* SecureEnclaveBackwardsCompatibilityTests.swift */; }; 1612FD2022A9C95500FC1142 /* ValetBackwardsCompatibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0522A9C95400FC1142 /* ValetBackwardsCompatibilityTests.swift */; }; 1612FD2122A9C95500FC1142 /* ValetBackwardsCompatibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0522A9C95400FC1142 /* ValetBackwardsCompatibilityTests.swift */; }; - 1612FD2222A9C95500FC1142 /* ValetBackwardsCompatibilityTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0522A9C95400FC1142 /* ValetBackwardsCompatibilityTests.swift */; }; 1612FD2322A9C95500FC1142 /* SinglePromptSecureEnclaveIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0622A9C95400FC1142 /* SinglePromptSecureEnclaveIntegrationTests.swift */; }; 1612FD2422A9C95500FC1142 /* SinglePromptSecureEnclaveIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0622A9C95400FC1142 /* SinglePromptSecureEnclaveIntegrationTests.swift */; }; 1612FD2622A9C95500FC1142 /* ValetIntegrationTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0722A9C95400FC1142 /* ValetIntegrationTests.swift */; }; @@ -112,61 +109,32 @@ 1612FDC022A9CAAB00FC1142 /* Identifier.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD7C22A9CAAB00FC1142 /* Identifier.swift */; }; 1612FDDA22A9CB2200FC1142 /* LegacyValet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612FDD322A9CB2200FC1142 /* LegacyValet.framework */; }; 1612FDDB22A9CB2200FC1142 /* LegacyValet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1612FDD322A9CB2200FC1142 /* LegacyValet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 1612FDEC22A9CB4800FC1142 /* LegacyValet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612FDE422A9CB3100FC1142 /* LegacyValet.framework */; }; - 1612FDED22A9CB4800FC1142 /* LegacyValet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1612FDE422A9CB3100FC1142 /* LegacyValet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 1612FDFD22A9CC0700FC1142 /* LegacyValet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612FDF622A9CC0700FC1142 /* LegacyValet.framework */; }; - 1612FDFE22A9CC0700FC1142 /* LegacyValet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1612FDF622A9CC0700FC1142 /* LegacyValet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 1612FE0F22A9CC3E00FC1142 /* LegacyValet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612FE0822A9CC3E00FC1142 /* LegacyValet.framework */; }; 1612FE1022A9CC3E00FC1142 /* LegacyValet.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 1612FE0822A9CC3E00FC1142 /* LegacyValet.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 1612FE4722A9CD2000FC1142 /* LegacyValet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612FDD322A9CB2200FC1142 /* LegacyValet.framework */; }; 1612FE5022A9D2F600FC1142 /* LegacyValet.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1612FE0822A9CC3E00FC1142 /* LegacyValet.framework */; }; 16212CC323072C5D00C84B17 /* VALLegacySecureEnclaveValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CBF23072C5D00C84B17 /* VALLegacySecureEnclaveValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 16212CC423072C5D00C84B17 /* VALLegacySecureEnclaveValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CBF23072C5D00C84B17 /* VALLegacySecureEnclaveValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 16212CC523072C5D00C84B17 /* VALLegacySecureEnclaveValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CBF23072C5D00C84B17 /* VALLegacySecureEnclaveValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 16212CC623072C5D00C84B17 /* VALLegacySecureEnclaveValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CBF23072C5D00C84B17 /* VALLegacySecureEnclaveValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 16212CC723072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC023072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 16212CC823072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC023072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 16212CC923072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC023072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 16212CCA23072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC023072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 16212CCB23072C5D00C84B17 /* VALLegacyValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC123072C5D00C84B17 /* VALLegacyValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 16212CCC23072C5D00C84B17 /* VALLegacyValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC123072C5D00C84B17 /* VALLegacyValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 16212CCD23072C5D00C84B17 /* VALLegacyValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC123072C5D00C84B17 /* VALLegacyValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 16212CCE23072C5D00C84B17 /* VALLegacyValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC123072C5D00C84B17 /* VALLegacyValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 16212CCF23072C5D00C84B17 /* VALSynchronizableValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC223072C5D00C84B17 /* VALSynchronizableValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 16212CD023072C5D00C84B17 /* VALSynchronizableValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC223072C5D00C84B17 /* VALSynchronizableValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 16212CD123072C5D00C84B17 /* VALSynchronizableValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC223072C5D00C84B17 /* VALSynchronizableValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 16212CD223072C5D00C84B17 /* VALSynchronizableValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CC223072C5D00C84B17 /* VALSynchronizableValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 16212CDB23072C6F00C84B17 /* VALLegacySecureEnclaveValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD323072C6E00C84B17 /* VALLegacySecureEnclaveValet.m */; }; - 16212CDC23072C6F00C84B17 /* VALLegacySecureEnclaveValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD323072C6E00C84B17 /* VALLegacySecureEnclaveValet.m */; }; - 16212CDD23072C6F00C84B17 /* VALLegacySecureEnclaveValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD323072C6E00C84B17 /* VALLegacySecureEnclaveValet.m */; }; 16212CDE23072C6F00C84B17 /* VALLegacySecureEnclaveValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD323072C6E00C84B17 /* VALLegacySecureEnclaveValet.m */; }; 16212CDF23072C6F00C84B17 /* VALLegacyValet_Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CD423072C6E00C84B17 /* VALLegacyValet_Protected.h */; }; - 16212CE023072C6F00C84B17 /* VALLegacyValet_Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CD423072C6E00C84B17 /* VALLegacyValet_Protected.h */; }; - 16212CE123072C6F00C84B17 /* VALLegacyValet_Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CD423072C6E00C84B17 /* VALLegacyValet_Protected.h */; }; 16212CE223072C6F00C84B17 /* VALLegacyValet_Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CD423072C6E00C84B17 /* VALLegacyValet_Protected.h */; }; 16212CE723072C6F00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD623072C6E00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m */; }; - 16212CE823072C6F00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD623072C6E00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m */; }; - 16212CE923072C6F00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD623072C6E00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m */; }; - 16212CEA23072C6F00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD623072C6E00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m */; }; 16212CEB23072C6F00C84B17 /* VALSynchronizableValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD723072C6E00C84B17 /* VALSynchronizableValet.m */; }; - 16212CEC23072C6F00C84B17 /* VALSynchronizableValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD723072C6E00C84B17 /* VALSynchronizableValet.m */; }; - 16212CED23072C6F00C84B17 /* VALSynchronizableValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD723072C6E00C84B17 /* VALSynchronizableValet.m */; }; 16212CEE23072C6F00C84B17 /* VALSynchronizableValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD723072C6E00C84B17 /* VALSynchronizableValet.m */; }; 16212CEF23072C6F00C84B17 /* VALLegacyValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD823072C6E00C84B17 /* VALLegacyValet.m */; }; - 16212CF023072C6F00C84B17 /* VALLegacyValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD823072C6E00C84B17 /* VALLegacyValet.m */; }; - 16212CF123072C6F00C84B17 /* VALLegacyValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD823072C6E00C84B17 /* VALLegacyValet.m */; }; 16212CF223072C6F00C84B17 /* VALLegacyValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD823072C6E00C84B17 /* VALLegacyValet.m */; }; 16212CF323072C6F00C84B17 /* ValetDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CD923072C6F00C84B17 /* ValetDefines.h */; }; - 16212CF423072C6F00C84B17 /* ValetDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CD923072C6F00C84B17 /* ValetDefines.h */; }; - 16212CF523072C6F00C84B17 /* ValetDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CD923072C6F00C84B17 /* ValetDefines.h */; }; 16212CF623072C6F00C84B17 /* ValetDefines.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CD923072C6F00C84B17 /* ValetDefines.h */; }; 16212CF723072C6F00C84B17 /* VALLegacySecureEnclaveValet_Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CDA23072C6F00C84B17 /* VALLegacySecureEnclaveValet_Protected.h */; }; - 16212CF823072C6F00C84B17 /* VALLegacySecureEnclaveValet_Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CDA23072C6F00C84B17 /* VALLegacySecureEnclaveValet_Protected.h */; }; - 16212CF923072C6F00C84B17 /* VALLegacySecureEnclaveValet_Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CDA23072C6F00C84B17 /* VALLegacySecureEnclaveValet_Protected.h */; }; 16212CFA23072C6F00C84B17 /* VALLegacySecureEnclaveValet_Protected.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CDA23072C6F00C84B17 /* VALLegacySecureEnclaveValet_Protected.h */; }; 16212CFC23072CB700C84B17 /* LegacyValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CFB23072CB700C84B17 /* LegacyValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 16212CFD23072CB700C84B17 /* LegacyValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CFB23072CB700C84B17 /* LegacyValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; - 16212CFE23072CB700C84B17 /* LegacyValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CFB23072CB700C84B17 /* LegacyValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 16212CFF23072CB700C84B17 /* LegacyValet.h in Headers */ = {isa = PBXBuildFile; fileRef = 16212CFB23072CB700C84B17 /* LegacyValet.h */; settings = {ATTRIBUTES = (Public, ); }; }; 165CDDC9204B26D400C96C2E /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165CDDC8204B26D400C96C2E /* AppDelegate.swift */; }; 165CDDCB204B26D400C96C2E /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 165CDDCA204B26D400C96C2E /* ViewController.swift */; }; @@ -193,6 +161,8 @@ 3251BD06224C865E0007453B /* XCTest.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 16D77541215BFC1D004F060C /* XCTest.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 32E7115B2336B03800018E15 /* SinglePromptSecureEnclaveValet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD7922A9CAAB00FC1142 /* SinglePromptSecureEnclaveValet.swift */; }; 32E7115C2336B03800018E15 /* SinglePromptSecureEnclaveValet.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD7922A9CAAB00FC1142 /* SinglePromptSecureEnclaveValet.swift */; }; + 32E7115E2336B90800018E15 /* SinglePromptSecureEnclaveTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1612FD0A22A9C95500FC1142 /* SinglePromptSecureEnclaveTests.swift */; }; + 32E7115F2336B98800018E15 /* VALLegacySinglePromptSecureEnclaveValet.m in Sources */ = {isa = PBXBuildFile; fileRef = 16212CD623072C6E00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m */; }; 371150A81E2962D8004A45D4 /* ValetIOSTestHostAppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371150A71E2962D8004A45D4 /* ValetIOSTestHostAppDelegate.swift */; }; 371150AA1E2962D8004A45D4 /* ValetIOSTestHostViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 371150A91E2962D8004A45D4 /* ValetIOSTestHostViewController.swift */; }; 371150AD1E2962D8004A45D4 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 371150AB1E2962D8004A45D4 /* Main.storyboard */; }; @@ -213,20 +183,6 @@ remoteGlobalIDString = 1612FDD222A9CB2200FC1142; remoteInfo = "LegacyValet iOS"; }; - 1612FDEE22A9CB4800FC1142 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = EA1E1F7B1A8C46080067C991 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 1612FDE322A9CB3100FC1142; - remoteInfo = "LegacyValet watchOS"; - }; - 1612FDFB22A9CC0700FC1142 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = EA1E1F7B1A8C46080067C991 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 1612FDF522A9CC0700FC1142; - remoteInfo = "LegacyValet tvOS"; - }; 1612FE0D22A9CC3E00FC1142 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = EA1E1F7B1A8C46080067C991 /* Project object */; @@ -241,13 +197,6 @@ remoteGlobalIDString = 1612FDD222A9CB2200FC1142; remoteInfo = "LegacyValet iOS"; }; - 1612FE4522A9CD0700FC1142 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = EA1E1F7B1A8C46080067C991 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 1612FDF522A9CC0700FC1142; - remoteInfo = "LegacyValet tvOS"; - }; 1612FE4E22A9D2EF00FC1142 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = EA1E1F7B1A8C46080067C991 /* Project object */; @@ -341,7 +290,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 1612FDFE22A9CC0700FC1142 /* LegacyValet.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -375,7 +323,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 1612FDED22A9CB4800FC1142 /* LegacyValet.framework in Embed Frameworks */, 169FC991215ECFCE00C2D6BD /* Valet.framework in Embed Frameworks */, 3251BD06224C865E0007453B /* XCTest.framework in Embed Frameworks */, ); @@ -439,9 +386,7 @@ 1612FD7B22A9CAAB00FC1142 /* SecureEnclaveValet.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SecureEnclaveValet.swift; sourceTree = ""; }; 1612FD7C22A9CAAB00FC1142 /* Identifier.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = Identifier.swift; sourceTree = ""; }; 1612FDD322A9CB2200FC1142 /* LegacyValet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LegacyValet.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 1612FDE422A9CB3100FC1142 /* LegacyValet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LegacyValet.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1612FDF022A9CBC900FC1142 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; - 1612FDF622A9CC0700FC1142 /* LegacyValet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LegacyValet.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 1612FE0822A9CC3E00FC1142 /* LegacyValet.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = LegacyValet.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 16212CBF23072C5D00C84B17 /* VALLegacySecureEnclaveValet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VALLegacySecureEnclaveValet.h; path = LegacyValet/Public/VALLegacySecureEnclaveValet.h; sourceTree = ""; }; 16212CC023072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = VALLegacySinglePromptSecureEnclaveValet.h; path = LegacyValet/Public/VALLegacySinglePromptSecureEnclaveValet.h; sourceTree = ""; }; @@ -516,20 +461,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 1612FDE122A9CB3100FC1142 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1612FDF322A9CC0700FC1142 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 1612FE0522A9CC3E00FC1142 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; @@ -541,7 +472,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1612FDFD22A9CC0700FC1142 /* LegacyValet.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -579,7 +509,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1612FDEC22A9CB4800FC1142 /* LegacyValet.framework in Frameworks */, 169FC990215ECFCE00C2D6BD /* Valet.framework in Frameworks */, 169FC992215ECFCE00C2D6BD /* XCTest.framework in Frameworks */, ); @@ -862,8 +791,6 @@ 16DF6AF3204B496800F8E0A4 /* Valet watchOS Test Host App.app */, 16DF6AFF204B496800F8E0A4 /* Valet watchOS Test Host App Extension.appex */, 1612FDD322A9CB2200FC1142 /* LegacyValet.framework */, - 1612FDE422A9CB3100FC1142 /* LegacyValet.framework */, - 1612FDF622A9CC0700FC1142 /* LegacyValet.framework */, 1612FE0822A9CC3E00FC1142 /* LegacyValet.framework */, ); name = Products; @@ -901,36 +828,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 1612FDDF22A9CB3100FC1142 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 16212CD023072C5D00C84B17 /* VALSynchronizableValet.h in Headers */, - 16212CC823072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h in Headers */, - 16212CF423072C6F00C84B17 /* ValetDefines.h in Headers */, - 16212CC423072C5D00C84B17 /* VALLegacySecureEnclaveValet.h in Headers */, - 16212CFD23072CB700C84B17 /* LegacyValet.h in Headers */, - 16212CE023072C6F00C84B17 /* VALLegacyValet_Protected.h in Headers */, - 16212CCC23072C5D00C84B17 /* VALLegacyValet.h in Headers */, - 16212CF823072C6F00C84B17 /* VALLegacySecureEnclaveValet_Protected.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1612FDF122A9CC0700FC1142 /* Headers */ = { - isa = PBXHeadersBuildPhase; - buildActionMask = 2147483647; - files = ( - 16212CD123072C5D00C84B17 /* VALSynchronizableValet.h in Headers */, - 16212CC923072C5D00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.h in Headers */, - 16212CF523072C6F00C84B17 /* ValetDefines.h in Headers */, - 16212CC523072C5D00C84B17 /* VALLegacySecureEnclaveValet.h in Headers */, - 16212CFE23072CB700C84B17 /* LegacyValet.h in Headers */, - 16212CE123072C6F00C84B17 /* VALLegacyValet_Protected.h in Headers */, - 16212CCD23072C5D00C84B17 /* VALLegacyValet.h in Headers */, - 16212CF923072C6F00C84B17 /* VALLegacySecureEnclaveValet_Protected.h in Headers */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 1612FE0322A9CC3E00FC1142 /* Headers */ = { isa = PBXHeadersBuildPhase; buildActionMask = 2147483647; @@ -1013,42 +910,6 @@ productReference = 1612FDD322A9CB2200FC1142 /* LegacyValet.framework */; productType = "com.apple.product-type.framework"; }; - 1612FDE322A9CB3100FC1142 /* LegacyValet watchOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1612FDE922A9CB3200FC1142 /* Build configuration list for PBXNativeTarget "LegacyValet watchOS" */; - buildPhases = ( - 1612FDDF22A9CB3100FC1142 /* Headers */, - 1612FDE022A9CB3100FC1142 /* Sources */, - 1612FDE122A9CB3100FC1142 /* Frameworks */, - 1612FDE222A9CB3100FC1142 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "LegacyValet watchOS"; - productName = "LegacyValet watchOS"; - productReference = 1612FDE422A9CB3100FC1142 /* LegacyValet.framework */; - productType = "com.apple.product-type.framework"; - }; - 1612FDF522A9CC0700FC1142 /* LegacyValet tvOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 1612FDFF22A9CC0700FC1142 /* Build configuration list for PBXNativeTarget "LegacyValet tvOS" */; - buildPhases = ( - 1612FDF122A9CC0700FC1142 /* Headers */, - 1612FDF222A9CC0700FC1142 /* Sources */, - 1612FDF322A9CC0700FC1142 /* Frameworks */, - 1612FDF422A9CC0700FC1142 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "LegacyValet tvOS"; - productName = "LegacyValet tvOS"; - productReference = 1612FDF622A9CC0700FC1142 /* LegacyValet.framework */; - productType = "com.apple.product-type.framework"; - }; 1612FE0722A9CC3E00FC1142 /* LegacyValet macOS */ = { isa = PBXNativeTarget; buildConfigurationList = 1612FE1122A9CC3E00FC1142 /* Build configuration list for PBXNativeTarget "LegacyValet macOS" */; @@ -1079,7 +940,6 @@ buildRules = ( ); dependencies = ( - 1612FDFC22A9CC0700FC1142 /* PBXTargetDependency */, ); name = "Valet tvOS Test Host App"; productName = "Valet tvOS Test Host App"; @@ -1134,7 +994,6 @@ buildRules = ( ); dependencies = ( - 1612FE4622A9CD0700FC1142 /* PBXTargetDependency */, 16C3B09E204B1E4C00B4D0B4 /* PBXTargetDependency */, 165CDDD7204B275000C96C2E /* PBXTargetDependency */, ); @@ -1192,7 +1051,6 @@ dependencies = ( 16DF6B1D204B4AF800F8E0A4 /* PBXTargetDependency */, 169FC995215ECFCF00C2D6BD /* PBXTargetDependency */, - 1612FDEF22A9CB4800FC1142 /* PBXTargetDependency */, ); name = "Valet watchOS Test Host App Extension"; productName = "Valet watchOS Test Host App Extension"; @@ -1329,15 +1187,6 @@ CreatedOnToolsVersion = 11.0; ProvisioningStyle = Automatic; }; - 1612FDE322A9CB3100FC1142 = { - CreatedOnToolsVersion = 11.0; - DevelopmentTeam = 9XUJ7M53NG; - ProvisioningStyle = Automatic; - }; - 1612FDF522A9CC0700FC1142 = { - CreatedOnToolsVersion = 11.0; - ProvisioningStyle = Automatic; - }; 1612FE0722A9CC3E00FC1142 = { CreatedOnToolsVersion = 11.0; ProvisioningStyle = Automatic; @@ -1476,8 +1325,6 @@ 16DF6AF2204B496800F8E0A4 /* Valet watchOS Test Host App */, 16DF6AFE204B496800F8E0A4 /* Valet watchOS Test Host App Extension */, 1612FDD222A9CB2200FC1142 /* LegacyValet iOS */, - 1612FDE322A9CB3100FC1142 /* LegacyValet watchOS */, - 1612FDF522A9CC0700FC1142 /* LegacyValet tvOS */, 1612FE0722A9CC3E00FC1142 /* LegacyValet macOS */, ); }; @@ -1501,20 +1348,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 1612FDE222A9CB3100FC1142 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1612FDF422A9CC0700FC1142 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; 1612FE0622A9CC3E00FC1142 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -1641,35 +1474,13 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 1612FDE022A9CB3100FC1142 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 16212CEC23072C6F00C84B17 /* VALSynchronizableValet.m in Sources */, - 16212CDC23072C6F00C84B17 /* VALLegacySecureEnclaveValet.m in Sources */, - 16212CE823072C6F00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m in Sources */, - 16212CF023072C6F00C84B17 /* VALLegacyValet.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 1612FDF222A9CC0700FC1142 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 16212CED23072C6F00C84B17 /* VALSynchronizableValet.m in Sources */, - 16212CDD23072C6F00C84B17 /* VALLegacySecureEnclaveValet.m in Sources */, - 16212CE923072C6F00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m in Sources */, - 16212CF123072C6F00C84B17 /* VALLegacyValet.m in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 1612FE0422A9CC3E00FC1142 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( 16212CEE23072C6F00C84B17 /* VALSynchronizableValet.m in Sources */, + 32E7115F2336B98800018E15 /* VALLegacySinglePromptSecureEnclaveValet.m in Sources */, 16212CDE23072C6F00C84B17 /* VALLegacySecureEnclaveValet.m in Sources */, - 16212CEA23072C6F00C84B17 /* VALLegacySinglePromptSecureEnclaveValet.m in Sources */, 16212CF223072C6F00C84B17 /* VALLegacyValet.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1719,7 +1530,6 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 1612FD2222A9C95500FC1142 /* ValetBackwardsCompatibilityTests.swift in Sources */, 1612FD1322A9C95500FC1142 /* SecItemTests.swift in Sources */, 1612FD3122A9C95500FC1142 /* SecureEnclaveTests.swift in Sources */, 1612FD2B22A9C95500FC1142 /* SecureEnclaveIntegrationTests.swift in Sources */, @@ -1727,8 +1537,7 @@ 1612FD2822A9C95500FC1142 /* ValetIntegrationTests.swift in Sources */, 1612FD3722A9C95500FC1142 /* ValetTests.swift in Sources */, 1612FD3422A9C95500FC1142 /* CloudTests.swift in Sources */, - 1612FD1C22A9C95500FC1142 /* SynchronizableBackwardsCompatibilityTests.swift in Sources */, - 1612FD1F22A9C95500FC1142 /* SecureEnclaveBackwardsCompatibilityTests.swift in Sources */, + 32E7115E2336B90800018E15 /* SinglePromptSecureEnclaveTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1877,16 +1686,6 @@ target = 1612FDD222A9CB2200FC1142 /* LegacyValet iOS */; targetProxy = 1612FDD822A9CB2200FC1142 /* PBXContainerItemProxy */; }; - 1612FDEF22A9CB4800FC1142 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 1612FDE322A9CB3100FC1142 /* LegacyValet watchOS */; - targetProxy = 1612FDEE22A9CB4800FC1142 /* PBXContainerItemProxy */; - }; - 1612FDFC22A9CC0700FC1142 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 1612FDF522A9CC0700FC1142 /* LegacyValet tvOS */; - targetProxy = 1612FDFB22A9CC0700FC1142 /* PBXContainerItemProxy */; - }; 1612FE0E22A9CC3E00FC1142 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 1612FE0722A9CC3E00FC1142 /* LegacyValet macOS */; @@ -1897,11 +1696,6 @@ target = 1612FDD222A9CB2200FC1142 /* LegacyValet iOS */; targetProxy = 1612FE4122A9CCF400FC1142 /* PBXContainerItemProxy */; }; - 1612FE4622A9CD0700FC1142 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 1612FDF522A9CC0700FC1142 /* LegacyValet tvOS */; - targetProxy = 1612FE4522A9CD0700FC1142 /* PBXContainerItemProxy */; - }; 1612FE4F22A9D2EF00FC1142 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 1612FE0722A9CC3E00FC1142 /* LegacyValet macOS */; @@ -2083,136 +1877,6 @@ }; name = Release; }; - 1612FDEA22A9CB3200FC1142 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9XUJ7M53NG; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_C_LANGUAGE_STANDARD = gnu11; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.squareup.LegacyValet; - PRODUCT_NAME = LegacyValet; - SDKROOT = watchos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = 4; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Debug; - }; - 1612FDEB22A9CB3200FC1142 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - APPLICATION_EXTENSION_API_ONLY = YES; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = 9XUJ7M53NG; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_C_LANGUAGE_STANDARD = gnu11; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.squareup.LegacyValet; - PRODUCT_NAME = LegacyValet; - SDKROOT = watchos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = 4; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - WATCHOS_DEPLOYMENT_TARGET = 2.0; - }; - name = Release; - }; - 1612FE0022A9CC0700FC1142 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = dwarf; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_C_LANGUAGE_STANDARD = gnu11; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.squareup.LegacyValet; - PRODUCT_NAME = LegacyValet; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Debug; - }; - 1612FE0122A9CC0700FC1142 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CODE_SIGN_STYLE = Automatic; - COPY_PHASE_STRIP = NO; - CURRENT_PROJECT_VERSION = 1; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - DEFINES_MODULE = YES; - DEVELOPMENT_TEAM = ""; - DYLIB_COMPATIBILITY_VERSION = 1; - DYLIB_CURRENT_VERSION = 1; - DYLIB_INSTALL_NAME_BASE = "@rpath"; - GCC_C_LANGUAGE_STANDARD = gnu11; - INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; - LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; - MTL_FAST_MATH = YES; - PRODUCT_BUNDLE_IDENTIFIER = com.squareup.LegacyValet; - PRODUCT_NAME = LegacyValet; - SDKROOT = appletvos; - SKIP_INSTALL = YES; - TARGETED_DEVICE_FAMILY = 3; - TVOS_DEPLOYMENT_TARGET = 9.0; - VERSIONING_SYSTEM = "apple-generic"; - VERSION_INFO_PREFIX = ""; - }; - name = Release; - }; 1612FE1222A9CC3E00FC1142 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -3095,24 +2759,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 1612FDE922A9CB3200FC1142 /* Build configuration list for PBXNativeTarget "LegacyValet watchOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1612FDEA22A9CB3200FC1142 /* Debug */, - 1612FDEB22A9CB3200FC1142 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 1612FDFF22A9CC0700FC1142 /* Build configuration list for PBXNativeTarget "LegacyValet tvOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 1612FE0022A9CC0700FC1142 /* Debug */, - 1612FE0122A9CC0700FC1142 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 1612FE1122A9CC3E00FC1142 /* Build configuration list for PBXNativeTarget "LegacyValet macOS" */ = { isa = XCConfigurationList; buildConfigurations = ( From 168785574d06c8a24f10ffa3663fe82fd7067da8 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 13:13:45 -0700 Subject: [PATCH 10/12] Do not pod lint on Xcode 11 (Cocoapods 1.7 doesn't seem to support Xcode 11 yet) --- .travis.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index af419f9a..d0d43bda 100644 --- a/.travis.yml +++ b/.travis.yml @@ -22,8 +22,6 @@ matrix: env: ACTION="xcode";SCHEME="Valet Mac";SDK="macosx10.15";DESTINATION="platform=OS X";XCODE_ACTION="build test" - osx_image: xcode11 env: ACTION="xcode";SCHEME="Valet watchOS";SDK="watchos6.0";DESTINATION="";XCODE_ACTION="build" - - osx_image: xcode11 - env: ACTION="pod-lint";SWIFT_VERSION="5.0" - osx_image: xcode11 env: ACTION="carthage" From 28346084efb937d3e6bbbf3312b64ba1245e6504 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 13:36:56 -0700 Subject: [PATCH 11/12] Assume iOS and tvOS builds from Xcode 11 are not code-signed --- .../ValetIntegrationTests/ValetIntegrationTests.swift | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Tests/ValetIntegrationTests/ValetIntegrationTests.swift b/Tests/ValetIntegrationTests/ValetIntegrationTests.swift index d92f0e54..3ae732d6 100644 --- a/Tests/ValetIntegrationTests/ValetIntegrationTests.swift +++ b/Tests/ValetIntegrationTests/ValetIntegrationTests.swift @@ -36,8 +36,15 @@ func testEnvironmentIsSigned() -> Bool { return false } - - return true + + if let simulatorVersionInfo = ProcessInfo.processInfo.environment["SIMULATOR_VERSION_INFO"], + simulatorVersionInfo.contains("iOS 13") || simulatorVersionInfo.contains("tvOS 13") + { + // Xcode 11's simulator does not support code-signing in a unit-test environment. + return false + } else { + return true + } } From 30dd9e2c1c78a3a832435879d6d8870d4e0c5643 Mon Sep 17 00:00:00 2001 From: Dan Federman Date: Sat, 21 Sep 2019 13:50:06 -0700 Subject: [PATCH 12/12] Update comment --- Tests/ValetIntegrationTests/ValetIntegrationTests.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tests/ValetIntegrationTests/ValetIntegrationTests.swift b/Tests/ValetIntegrationTests/ValetIntegrationTests.swift index 3ae732d6..09adbdf8 100644 --- a/Tests/ValetIntegrationTests/ValetIntegrationTests.swift +++ b/Tests/ValetIntegrationTests/ValetIntegrationTests.swift @@ -40,7 +40,7 @@ func testEnvironmentIsSigned() -> Bool { if let simulatorVersionInfo = ProcessInfo.processInfo.environment["SIMULATOR_VERSION_INFO"], simulatorVersionInfo.contains("iOS 13") || simulatorVersionInfo.contains("tvOS 13") { - // Xcode 11's simulator does not support code-signing in a unit-test environment. + // Xcode 11's simulator does not support code-signing. return false } else { return true