From 5a33466f0c261de0a309ca32698d1b654f1c9f25 Mon Sep 17 00:00:00 2001 From: Matthew Mathias Date: Fri, 8 Dec 2023 15:51:32 -0800 Subject: [PATCH 01/10] Update AppCheckExample unit test target to pass during continuous integration --- .../project.pbxproj | 232 ++++++++++-------- .../xcschemes/AppAttestExample.xcscheme | 11 + .../AppAttestExample.xctestplan | 9 +- 3 files changed, 138 insertions(+), 114 deletions(-) diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj index 2309bd41..4e65db3b 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 73080B2B2AAF9BDE00DEF667 /* AppAttestExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73080B2A2AAF9BDE00DEF667 /* AppAttestExampleTests.swift */; }; - 73080B392AAF9F1400DEF667 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 73080B382AAF9F1400DEF667 /* GoogleSignIn */; }; 738B4A322AA8FE800056885D /* AppCheckSecretReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738B4A312AA8FE800056885D /* AppCheckSecretReader.swift */; }; 738D5F732A26BC3B00A7F11B /* BirthdayLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738D5F722A26BC3B00A7F11B /* BirthdayLoader.swift */; }; 73A464042A1C3B3400BA8528 /* AppAttestExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73A464032A1C3B3400BA8528 /* AppAttestExampleApp.swift */; }; @@ -16,10 +14,11 @@ 73A4640B2A1C3B3500BA8528 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 73A4640A2A1C3B3500BA8528 /* Preview Assets.xcassets */; }; 73CD4AB22AAF915900642462 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 73CD4AB12AAF915900642462 /* GoogleSignIn */; }; 73CD4AB42AAF915F00642462 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 73CD4AB32AAF915F00642462 /* GoogleSignInSwift */; }; + 73DB85ED2B23DE3B00D051BA /* AppAttestExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73DB85EC2B23DE3B00D051BA /* AppAttestExampleTests.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 73080B352AAF9EAD00DEF667 /* PBXContainerItemProxy */ = { + 73DB85EE2B23DE3B00D051BA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 73A463F82A1C3B3400BA8528 /* Project object */; proxyType = 1; @@ -29,8 +28,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 73080B282AAF9BDE00DEF667 /* AppAttestExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppAttestExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 73080B2A2AAF9BDE00DEF667 /* AppAttestExampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAttestExampleTests.swift; sourceTree = ""; }; 73443A232A55F56900A4932E /* AppAttestExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AppAttestExample.entitlements; sourceTree = ""; }; 734555752AB167B80068F2B0 /* AppCheckDefaultSecrets.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppCheckDefaultSecrets.xcconfig; sourceTree = ""; }; 738B4A312AA8FE800056885D /* AppCheckSecretReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCheckSecretReader.swift; sourceTree = ""; }; @@ -42,38 +39,32 @@ 73A4640A2A1C3B3500BA8528 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; 73CD4AB02AAF8C8500642462 /* GoogleSignIn-iOS */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "GoogleSignIn-iOS"; path = ../../..; sourceTree = ""; }; 73D87D512AAFE0FE002D841C /* AppAttestExample.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AppAttestExample.xctestplan; sourceTree = ""; }; + 73DB85BB2B23DAEC00D051BA /* CoreAudioTypes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioTypes.framework; path = System/Library/Frameworks/CoreAudioTypes.framework; sourceTree = SDKROOT; }; + 73DB85EA2B23DE3B00D051BA /* AppAttestExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppAttestExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 73DB85EC2B23DE3B00D051BA /* AppAttestExampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAttestExampleTests.swift; sourceTree = ""; }; 91F3A930BB86D9E0648046BC /* Pods_AppAttestExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppAttestExample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 73080B252AAF9BDE00DEF667 /* Frameworks */ = { + 73A463FD2A1C3B3400BA8528 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 73080B392AAF9F1400DEF667 /* GoogleSignIn in Frameworks */, + 73CD4AB22AAF915900642462 /* GoogleSignIn in Frameworks */, + 73CD4AB42AAF915F00642462 /* GoogleSignInSwift in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 73A463FD2A1C3B3400BA8528 /* Frameworks */ = { + 73DB85E72B23DE3B00D051BA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 73CD4AB22AAF915900642462 /* GoogleSignIn in Frameworks */, - 73CD4AB42AAF915F00642462 /* GoogleSignInSwift in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 73080B292AAF9BDE00DEF667 /* AppAttestExampleTests */ = { - isa = PBXGroup; - children = ( - 73080B2A2AAF9BDE00DEF667 /* AppAttestExampleTests.swift */, - ); - path = AppAttestExampleTests; - sourceTree = ""; - }; 7345556B2AB127B00068F2B0 /* Secrets */ = { isa = PBXGroup; children = ( @@ -88,7 +79,7 @@ 73D87D512AAFE0FE002D841C /* AppAttestExample.xctestplan */, 73CD4AAF2AAF8C8500642462 /* Packages */, 73A464022A1C3B3400BA8528 /* AppAttestExample */, - 73080B292AAF9BDE00DEF667 /* AppAttestExampleTests */, + 73DB85EB2B23DE3B00D051BA /* AppAttestExampleTests */, 73A464012A1C3B3400BA8528 /* Products */, A73FBC2B93918F4B411815A1 /* Frameworks */, ); @@ -98,7 +89,7 @@ isa = PBXGroup; children = ( 73A464002A1C3B3400BA8528 /* AppAttestExample.app */, - 73080B282AAF9BDE00DEF667 /* AppAttestExampleTests.xctest */, + 73DB85EA2B23DE3B00D051BA /* AppAttestExampleTests.xctest */, ); name = Products; sourceTree = ""; @@ -134,9 +125,18 @@ name = Packages; sourceTree = ""; }; + 73DB85EB2B23DE3B00D051BA /* AppAttestExampleTests */ = { + isa = PBXGroup; + children = ( + 73DB85EC2B23DE3B00D051BA /* AppAttestExampleTests.swift */, + ); + path = AppAttestExampleTests; + sourceTree = ""; + }; A73FBC2B93918F4B411815A1 /* Frameworks */ = { isa = PBXGroup; children = ( + 73DB85BB2B23DAEC00D051BA /* CoreAudioTypes.framework */, 91F3A930BB86D9E0648046BC /* Pods_AppAttestExample.framework */, ); name = Frameworks; @@ -145,27 +145,6 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 73080B272AAF9BDE00DEF667 /* AppAttestExampleTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 73080B302AAF9BDE00DEF667 /* Build configuration list for PBXNativeTarget "AppAttestExampleTests" */; - buildPhases = ( - 73080B242AAF9BDE00DEF667 /* Sources */, - 73080B252AAF9BDE00DEF667 /* Frameworks */, - 73080B262AAF9BDE00DEF667 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 73080B362AAF9EAD00DEF667 /* PBXTargetDependency */, - ); - name = AppAttestExampleTests; - packageProductDependencies = ( - 73080B382AAF9F1400DEF667 /* GoogleSignIn */, - ); - productName = AppAttestExampleTests; - productReference = 73080B282AAF9BDE00DEF667 /* AppAttestExampleTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; 73A463FF2A1C3B3400BA8528 /* AppAttestExample */ = { isa = PBXNativeTarget; buildConfigurationList = 73A4640E2A1C3B3500BA8528 /* Build configuration list for PBXNativeTarget "AppAttestExample" */; @@ -187,6 +166,24 @@ productReference = 73A464002A1C3B3400BA8528 /* AppAttestExample.app */; productType = "com.apple.product-type.application"; }; + 73DB85E92B23DE3B00D051BA /* AppAttestExampleTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 73DB85F02B23DE3B00D051BA /* Build configuration list for PBXNativeTarget "AppAttestExampleTests" */; + buildPhases = ( + 73DB85E62B23DE3B00D051BA /* Sources */, + 73DB85E72B23DE3B00D051BA /* Frameworks */, + 73DB85E82B23DE3B00D051BA /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 73DB85EF2B23DE3B00D051BA /* PBXTargetDependency */, + ); + name = AppAttestExampleTests; + productName = "AppAttestExampleTests(2)"; + productReference = 73DB85EA2B23DE3B00D051BA /* AppAttestExampleTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -194,16 +191,16 @@ isa = PBXProject; attributes = { BuildIndependentTargetsInParallel = 1; - LastSwiftUpdateCheck = 1430; + LastSwiftUpdateCheck = 1500; LastUpgradeCheck = 1430; TargetAttributes = { - 73080B272AAF9BDE00DEF667 = { - CreatedOnToolsVersion = 14.3; - TestTargetID = 73A463FF2A1C3B3400BA8528; - }; 73A463FF2A1C3B3400BA8528 = { CreatedOnToolsVersion = 14.3; }; + 73DB85E92B23DE3B00D051BA = { + CreatedOnToolsVersion = 15.0.1; + TestTargetID = 73A463FF2A1C3B3400BA8528; + }; }; }; buildConfigurationList = 73A463FB2A1C3B3400BA8528 /* Build configuration list for PBXProject "AppAttestExample" */; @@ -220,99 +217,62 @@ projectRoot = ""; targets = ( 73A463FF2A1C3B3400BA8528 /* AppAttestExample */, - 73080B272AAF9BDE00DEF667 /* AppAttestExampleTests */, + 73DB85E92B23DE3B00D051BA /* AppAttestExampleTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 73080B262AAF9BDE00DEF667 /* Resources */ = { + 73A463FE2A1C3B3400BA8528 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 73A4640B2A1C3B3500BA8528 /* Preview Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 73A463FE2A1C3B3400BA8528 /* Resources */ = { + 73DB85E82B23DE3B00D051BA /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 73A4640B2A1C3B3500BA8528 /* Preview Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 73080B242AAF9BDE00DEF667 /* Sources */ = { + 73A463FC2A1C3B3400BA8528 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 73080B2B2AAF9BDE00DEF667 /* AppAttestExampleTests.swift in Sources */, + 738D5F732A26BC3B00A7F11B /* BirthdayLoader.swift in Sources */, + 738B4A322AA8FE800056885D /* AppCheckSecretReader.swift in Sources */, + 73A464062A1C3B3400BA8528 /* ContentView.swift in Sources */, + 73A464042A1C3B3400BA8528 /* AppAttestExampleApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 73A463FC2A1C3B3400BA8528 /* Sources */ = { + 73DB85E62B23DE3B00D051BA /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 738D5F732A26BC3B00A7F11B /* BirthdayLoader.swift in Sources */, - 738B4A322AA8FE800056885D /* AppCheckSecretReader.swift in Sources */, - 73A464062A1C3B3400BA8528 /* ContentView.swift in Sources */, - 73A464042A1C3B3400BA8528 /* AppAttestExampleApp.swift in Sources */, + 73DB85ED2B23DE3B00D051BA /* AppAttestExampleTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 73080B362AAF9EAD00DEF667 /* PBXTargetDependency */ = { + 73DB85EF2B23DE3B00D051BA /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 73A463FF2A1C3B3400BA8528 /* AppAttestExample */; - targetProxy = 73080B352AAF9EAD00DEF667 /* PBXContainerItemProxy */; + targetProxy = 73DB85EE2B23DE3B00D051BA /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ - 73080B2E2AAF9BDE00DEF667 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.google.AppAttestExampleTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AppAttestExample.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/AppAttestExample"; - }; - name = Debug; - }; - 73080B2F2AAF9BDE00DEF667 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.google.AppAttestExampleTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AppAttestExample.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/AppAttestExample"; - }; - name = Release; - }; 73A4640C2A1C3B3500BA8528 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 734555752AB167B80068F2B0 /* AppCheckDefaultSecrets.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -429,6 +389,7 @@ }; 73A4640F2A1C3B3500BA8528 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 734555752AB167B80068F2B0 /* AppCheckDefaultSecrets.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; @@ -459,6 +420,9 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Experimental App 0 Dev"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; @@ -497,24 +461,69 @@ PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; "PROVISIONING_PROFILE_SPECIFIER[sdk=iphoneos*]" = "Experimental App 0 Dev"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; name = Release; }; + 73DB85F12B23DE3B00D051BA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.AppAttestExampleTests-2-"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AppAttestExample.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/AppAttestExample"; + }; + name = Debug; + }; + 73DB85F22B23DE3B00D051BA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 16.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = "com.google.AppAttestExampleTests-2-"; + PRODUCT_NAME = "$(TARGET_NAME)"; + SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; + SUPPORTS_MACCATALYST = NO; + SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AppAttestExample.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/AppAttestExample"; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 73080B302AAF9BDE00DEF667 /* Build configuration list for PBXNativeTarget "AppAttestExampleTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 73080B2E2AAF9BDE00DEF667 /* Debug */, - 73080B2F2AAF9BDE00DEF667 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 73A463FB2A1C3B3400BA8528 /* Build configuration list for PBXProject "AppAttestExample" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -533,13 +542,18 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; + 73DB85F02B23DE3B00D051BA /* Build configuration list for PBXNativeTarget "AppAttestExampleTests" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 73DB85F12B23DE3B00D051BA /* Debug */, + 73DB85F22B23DE3B00D051BA /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - 73080B382AAF9F1400DEF667 /* GoogleSignIn */ = { - isa = XCSwiftPackageProductDependency; - productName = GoogleSignIn; - }; 73CD4AB12AAF915900642462 /* GoogleSignIn */ = { isa = XCSwiftPackageProductDependency; productName = GoogleSignIn; diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme index d6cfaf2a..84c5dec1 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme @@ -45,6 +45,17 @@ ReferencedContainer = "container:AppAttestExample.xcodeproj"> + + + + Date: Fri, 8 Dec 2023 16:06:07 -0800 Subject: [PATCH 02/10] Add required library (GoogleSignIn) to AppCheckExample unit test target --- .../AppAttestExample.xcodeproj/project.pbxproj | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj index 4e65db3b..9a5812bb 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj @@ -15,6 +15,7 @@ 73CD4AB22AAF915900642462 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 73CD4AB12AAF915900642462 /* GoogleSignIn */; }; 73CD4AB42AAF915F00642462 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 73CD4AB32AAF915F00642462 /* GoogleSignInSwift */; }; 73DB85ED2B23DE3B00D051BA /* AppAttestExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73DB85EC2B23DE3B00D051BA /* AppAttestExampleTests.swift */; }; + 73DB85F42B23E68A00D051BA /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 73DB85F32B23E68A00D051BA /* GoogleSignIn */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -59,6 +60,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 73DB85F42B23E68A00D051BA /* GoogleSignIn in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -180,6 +182,9 @@ 73DB85EF2B23DE3B00D051BA /* PBXTargetDependency */, ); name = AppAttestExampleTests; + packageProductDependencies = ( + 73DB85F32B23E68A00D051BA /* GoogleSignIn */, + ); productName = "AppAttestExampleTests(2)"; productReference = 73DB85EA2B23DE3B00D051BA /* AppAttestExampleTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -562,6 +567,10 @@ isa = XCSwiftPackageProductDependency; productName = GoogleSignInSwift; }; + 73DB85F32B23E68A00D051BA /* GoogleSignIn */ = { + isa = XCSwiftPackageProductDependency; + productName = GoogleSignIn; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 73A463F82A1C3B3400BA8528 /* Project object */; From b8b2f81d1c43480ea2e933677161017c892e393b Mon Sep 17 00:00:00 2001 From: Matthew Mathias Date: Wed, 13 Dec 2023 14:04:50 -0800 Subject: [PATCH 03/10] Remove GoogleSignIn from test target deps --- .../AppAttestExample.xcodeproj/project.pbxproj | 15 ++++++--------- .../xcschemes/AppAttestExample.xcscheme | 2 +- .../AppAttestExample/AppAttestExample.xctestplan | 2 +- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj index 9a5812bb..ee5244ab 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj @@ -15,7 +15,6 @@ 73CD4AB22AAF915900642462 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 73CD4AB12AAF915900642462 /* GoogleSignIn */; }; 73CD4AB42AAF915F00642462 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 73CD4AB32AAF915F00642462 /* GoogleSignInSwift */; }; 73DB85ED2B23DE3B00D051BA /* AppAttestExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73DB85EC2B23DE3B00D051BA /* AppAttestExampleTests.swift */; }; - 73DB85F42B23E68A00D051BA /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 73DB85F32B23E68A00D051BA /* GoogleSignIn */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -60,7 +59,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 73DB85F42B23E68A00D051BA /* GoogleSignIn in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -183,7 +181,6 @@ ); name = AppAttestExampleTests; packageProductDependencies = ( - 73DB85F32B23E68A00D051BA /* GoogleSignIn */, ); productName = "AppAttestExampleTests(2)"; productReference = 73DB85EA2B23DE3B00D051BA /* AppAttestExampleTests.xctest */; @@ -312,6 +309,7 @@ DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; @@ -331,6 +329,7 @@ MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; + OTHER_LDFLAGS = ""; SDKROOT = iphoneos; SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; SWIFT_OPTIMIZATION_LEVEL = "-Onone"; @@ -373,6 +372,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; + FRAMEWORK_SEARCH_PATHS = ""; GCC_C_LANGUAGE_STANDARD = gnu11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; @@ -385,6 +385,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 16.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; + OTHER_LDFLAGS = ""; SDKROOT = iphoneos; SWIFT_COMPILATION_MODE = wholemodule; SWIFT_OPTIMIZATION_LEVEL = "-O"; @@ -403,7 +404,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"AppAttestExample/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = EQHXZ8M8AV; ENABLE_PREVIEWS = YES; @@ -444,7 +445,7 @@ "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; CODE_SIGN_STYLE = Manual; CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"AppAttestExample/Preview Content\""; + DEVELOPMENT_ASSET_PATHS = ""; DEVELOPMENT_TEAM = ""; "DEVELOPMENT_TEAM[sdk=iphoneos*]" = EQHXZ8M8AV; ENABLE_PREVIEWS = YES; @@ -567,10 +568,6 @@ isa = XCSwiftPackageProductDependency; productName = GoogleSignInSwift; }; - 73DB85F32B23E68A00D051BA /* GoogleSignIn */ = { - isa = XCSwiftPackageProductDependency; - productName = GoogleSignIn; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = 73A463F82A1C3B3400BA8528 /* Project object */; diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme index 84c5dec1..b74cb11f 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme @@ -39,7 +39,7 @@ parallelizable = "YES"> diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xctestplan b/Samples/Swift/AppAttestExample/AppAttestExample.xctestplan index 115592b9..5f7a478f 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xctestplan +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xctestplan @@ -31,7 +31,7 @@ "target" : { "containerPath" : "container:AppAttestExample.xcodeproj", "identifier" : "73DB85E92B23DE3B00D051BA", - "name" : "AppAttestExampleTests(2)" + "name" : "AppAttestExampleTests" } } ], From 1cc734e8db70736ce6a53ec394b9787117a77a0f Mon Sep 17 00:00:00 2001 From: Matthew Mathias Date: Wed, 13 Dec 2023 15:40:12 -0800 Subject: [PATCH 04/10] Use github branch for GoogleSignIn dep --- .../project.pbxproj | 26 ++++++++++++------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj index ee5244ab..195be8ad 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj @@ -37,7 +37,6 @@ 73A464032A1C3B3400BA8528 /* AppAttestExampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAttestExampleApp.swift; sourceTree = ""; }; 73A464052A1C3B3400BA8528 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 73A4640A2A1C3B3500BA8528 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 73CD4AB02AAF8C8500642462 /* GoogleSignIn-iOS */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "GoogleSignIn-iOS"; path = ../../..; sourceTree = ""; }; 73D87D512AAFE0FE002D841C /* AppAttestExample.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AppAttestExample.xctestplan; sourceTree = ""; }; 73DB85BB2B23DAEC00D051BA /* CoreAudioTypes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioTypes.framework; path = System/Library/Frameworks/CoreAudioTypes.framework; sourceTree = SDKROOT; }; 73DB85EA2B23DE3B00D051BA /* AppAttestExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppAttestExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -77,7 +76,6 @@ isa = PBXGroup; children = ( 73D87D512AAFE0FE002D841C /* AppAttestExample.xctestplan */, - 73CD4AAF2AAF8C8500642462 /* Packages */, 73A464022A1C3B3400BA8528 /* AppAttestExample */, 73DB85EB2B23DE3B00D051BA /* AppAttestExampleTests */, 73A464012A1C3B3400BA8528 /* Products */, @@ -117,14 +115,6 @@ path = "Preview Content"; sourceTree = ""; }; - 73CD4AAF2AAF8C8500642462 /* Packages */ = { - isa = PBXGroup; - children = ( - 73CD4AB02AAF8C8500642462 /* GoogleSignIn-iOS */, - ); - name = Packages; - sourceTree = ""; - }; 73DB85EB2B23DE3B00D051BA /* AppAttestExampleTests */ = { isa = PBXGroup; children = ( @@ -214,6 +204,9 @@ Base, ); mainGroup = 73A463F72A1C3B3400BA8528; + packageReferences = ( + 73BEB7E82B2A753000479453 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, + ); productRefGroup = 73A464012A1C3B3400BA8528 /* Products */; projectDirPath = ""; projectRoot = ""; @@ -489,6 +482,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 16.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.google.AppAttestExampleTests-2-"; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -515,6 +509,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 16.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = "com.google.AppAttestExampleTests-2-"; PRODUCT_NAME = "$(TARGET_NAME)"; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; @@ -559,6 +554,17 @@ }; /* End XCConfigurationList section */ +/* Begin XCRemoteSwiftPackageReference section */ + 73BEB7E82B2A753000479453 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = { + isa = XCRemoteSwiftPackageReference; + repositoryURL = "https://github.com/google/GoogleSignIn-iOS"; + requirement = { + branch = "fac-eap"; + kind = branch; + }; + }; +/* End XCRemoteSwiftPackageReference section */ + /* Begin XCSwiftPackageProductDependency section */ 73CD4AB12AAF915900642462 /* GoogleSignIn */ = { isa = XCSwiftPackageProductDependency; From 6e3ba1c63534bb91c228a8c3a6604ff0a6c14ed6 Mon Sep 17 00:00:00 2001 From: Matthew Mathias Date: Wed, 13 Dec 2023 17:48:05 -0800 Subject: [PATCH 05/10] Tinker with test plan config --- .../project.pbxproj | 228 +++++++++--------- .../xcschemes/AppAttestExample.xcscheme | 4 +- .../AppAttestExample.xctestplan | 23 +- 3 files changed, 123 insertions(+), 132 deletions(-) diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj index 195be8ad..0129e0e8 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 736434232B2A914B00DA67DA /* AppAttestExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 736434222B2A914B00DA67DA /* AppAttestExampleTests.swift */; }; 738B4A322AA8FE800056885D /* AppCheckSecretReader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738B4A312AA8FE800056885D /* AppCheckSecretReader.swift */; }; 738D5F732A26BC3B00A7F11B /* BirthdayLoader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 738D5F722A26BC3B00A7F11B /* BirthdayLoader.swift */; }; 73A464042A1C3B3400BA8528 /* AppAttestExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73A464032A1C3B3400BA8528 /* AppAttestExampleApp.swift */; }; @@ -14,11 +15,10 @@ 73A4640B2A1C3B3500BA8528 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 73A4640A2A1C3B3500BA8528 /* Preview Assets.xcassets */; }; 73CD4AB22AAF915900642462 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = 73CD4AB12AAF915900642462 /* GoogleSignIn */; }; 73CD4AB42AAF915F00642462 /* GoogleSignInSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 73CD4AB32AAF915F00642462 /* GoogleSignInSwift */; }; - 73DB85ED2B23DE3B00D051BA /* AppAttestExampleTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 73DB85EC2B23DE3B00D051BA /* AppAttestExampleTests.swift */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 73DB85EE2B23DE3B00D051BA /* PBXContainerItemProxy */ = { + 736434242B2A914B00DA67DA /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 73A463F82A1C3B3400BA8528 /* Project object */; proxyType = 1; @@ -30,6 +30,9 @@ /* Begin PBXFileReference section */ 73443A232A55F56900A4932E /* AppAttestExample.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AppAttestExample.entitlements; sourceTree = ""; }; 734555752AB167B80068F2B0 /* AppCheckDefaultSecrets.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppCheckDefaultSecrets.xcconfig; sourceTree = ""; }; + 736434202B2A914A00DA67DA /* AppAttestExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppAttestExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; + 736434222B2A914B00DA67DA /* AppAttestExampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAttestExampleTests.swift; sourceTree = ""; }; + 736434292B2A923C00DA67DA /* AppAttestExample.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = file; path = AppAttestExample.xctestplan; sourceTree = SOURCE_ROOT; }; 738B4A312AA8FE800056885D /* AppCheckSecretReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCheckSecretReader.swift; sourceTree = ""; }; 738D5F722A26BC3B00A7F11B /* BirthdayLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BirthdayLoader.swift; sourceTree = ""; }; 73A065612A786D10007BC7FC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -37,27 +40,24 @@ 73A464032A1C3B3400BA8528 /* AppAttestExampleApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAttestExampleApp.swift; sourceTree = ""; }; 73A464052A1C3B3400BA8528 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 73A4640A2A1C3B3500BA8528 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - 73D87D512AAFE0FE002D841C /* AppAttestExample.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AppAttestExample.xctestplan; sourceTree = ""; }; 73DB85BB2B23DAEC00D051BA /* CoreAudioTypes.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudioTypes.framework; path = System/Library/Frameworks/CoreAudioTypes.framework; sourceTree = SDKROOT; }; - 73DB85EA2B23DE3B00D051BA /* AppAttestExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppAttestExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 73DB85EC2B23DE3B00D051BA /* AppAttestExampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAttestExampleTests.swift; sourceTree = ""; }; 91F3A930BB86D9E0648046BC /* Pods_AppAttestExample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_AppAttestExample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 73A463FD2A1C3B3400BA8528 /* Frameworks */ = { + 7364341D2B2A914A00DA67DA /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 73CD4AB22AAF915900642462 /* GoogleSignIn in Frameworks */, - 73CD4AB42AAF915F00642462 /* GoogleSignInSwift in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; - 73DB85E72B23DE3B00D051BA /* Frameworks */ = { + 73A463FD2A1C3B3400BA8528 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 73CD4AB22AAF915900642462 /* GoogleSignIn in Frameworks */, + 73CD4AB42AAF915F00642462 /* GoogleSignInSwift in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,12 +72,20 @@ path = Secrets; sourceTree = ""; }; + 736434212B2A914B00DA67DA /* AppAttestExampleTests */ = { + isa = PBXGroup; + children = ( + 736434222B2A914B00DA67DA /* AppAttestExampleTests.swift */, + 736434292B2A923C00DA67DA /* AppAttestExample.xctestplan */, + ); + path = AppAttestExampleTests; + sourceTree = ""; + }; 73A463F72A1C3B3400BA8528 = { isa = PBXGroup; children = ( - 73D87D512AAFE0FE002D841C /* AppAttestExample.xctestplan */, 73A464022A1C3B3400BA8528 /* AppAttestExample */, - 73DB85EB2B23DE3B00D051BA /* AppAttestExampleTests */, + 736434212B2A914B00DA67DA /* AppAttestExampleTests */, 73A464012A1C3B3400BA8528 /* Products */, A73FBC2B93918F4B411815A1 /* Frameworks */, ); @@ -87,7 +95,7 @@ isa = PBXGroup; children = ( 73A464002A1C3B3400BA8528 /* AppAttestExample.app */, - 73DB85EA2B23DE3B00D051BA /* AppAttestExampleTests.xctest */, + 736434202B2A914A00DA67DA /* AppAttestExampleTests.xctest */, ); name = Products; sourceTree = ""; @@ -115,14 +123,6 @@ path = "Preview Content"; sourceTree = ""; }; - 73DB85EB2B23DE3B00D051BA /* AppAttestExampleTests */ = { - isa = PBXGroup; - children = ( - 73DB85EC2B23DE3B00D051BA /* AppAttestExampleTests.swift */, - ); - path = AppAttestExampleTests; - sourceTree = ""; - }; A73FBC2B93918F4B411815A1 /* Frameworks */ = { isa = PBXGroup; children = ( @@ -135,6 +135,24 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ + 7364341F2B2A914A00DA67DA /* AppAttestExampleTests */ = { + isa = PBXNativeTarget; + buildConfigurationList = 736434262B2A914B00DA67DA /* Build configuration list for PBXNativeTarget "AppAttestExampleTests" */; + buildPhases = ( + 7364341C2B2A914A00DA67DA /* Sources */, + 7364341D2B2A914A00DA67DA /* Frameworks */, + 7364341E2B2A914A00DA67DA /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + 736434252B2A914B00DA67DA /* PBXTargetDependency */, + ); + name = AppAttestExampleTests; + productName = AppAttestExampleTests; + productReference = 736434202B2A914A00DA67DA /* AppAttestExampleTests.xctest */; + productType = "com.apple.product-type.bundle.unit-test"; + }; 73A463FF2A1C3B3400BA8528 /* AppAttestExample */ = { isa = PBXNativeTarget; buildConfigurationList = 73A4640E2A1C3B3500BA8528 /* Build configuration list for PBXNativeTarget "AppAttestExample" */; @@ -156,26 +174,6 @@ productReference = 73A464002A1C3B3400BA8528 /* AppAttestExample.app */; productType = "com.apple.product-type.application"; }; - 73DB85E92B23DE3B00D051BA /* AppAttestExampleTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 73DB85F02B23DE3B00D051BA /* Build configuration list for PBXNativeTarget "AppAttestExampleTests" */; - buildPhases = ( - 73DB85E62B23DE3B00D051BA /* Sources */, - 73DB85E72B23DE3B00D051BA /* Frameworks */, - 73DB85E82B23DE3B00D051BA /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 73DB85EF2B23DE3B00D051BA /* PBXTargetDependency */, - ); - name = AppAttestExampleTests; - packageProductDependencies = ( - ); - productName = "AppAttestExampleTests(2)"; - productReference = 73DB85EA2B23DE3B00D051BA /* AppAttestExampleTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -186,13 +184,13 @@ LastSwiftUpdateCheck = 1500; LastUpgradeCheck = 1430; TargetAttributes = { - 73A463FF2A1C3B3400BA8528 = { - CreatedOnToolsVersion = 14.3; - }; - 73DB85E92B23DE3B00D051BA = { + 7364341F2B2A914A00DA67DA = { CreatedOnToolsVersion = 15.0.1; TestTargetID = 73A463FF2A1C3B3400BA8528; }; + 73A463FF2A1C3B3400BA8528 = { + CreatedOnToolsVersion = 14.3; + }; }; }; buildConfigurationList = 73A463FB2A1C3B3400BA8528 /* Build configuration list for PBXProject "AppAttestExample" */; @@ -212,60 +210,105 @@ projectRoot = ""; targets = ( 73A463FF2A1C3B3400BA8528 /* AppAttestExample */, - 73DB85E92B23DE3B00D051BA /* AppAttestExampleTests */, + 7364341F2B2A914A00DA67DA /* AppAttestExampleTests */, ); }; /* End PBXProject section */ /* Begin PBXResourcesBuildPhase section */ - 73A463FE2A1C3B3400BA8528 /* Resources */ = { + 7364341E2B2A914A00DA67DA /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 73A4640B2A1C3B3500BA8528 /* Preview Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 73DB85E82B23DE3B00D051BA /* Resources */ = { + 73A463FE2A1C3B3400BA8528 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 73A4640B2A1C3B3500BA8528 /* Preview Assets.xcassets in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 73A463FC2A1C3B3400BA8528 /* Sources */ = { + 7364341C2B2A914A00DA67DA /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 738D5F732A26BC3B00A7F11B /* BirthdayLoader.swift in Sources */, - 738B4A322AA8FE800056885D /* AppCheckSecretReader.swift in Sources */, - 73A464062A1C3B3400BA8528 /* ContentView.swift in Sources */, - 73A464042A1C3B3400BA8528 /* AppAttestExampleApp.swift in Sources */, + 736434232B2A914B00DA67DA /* AppAttestExampleTests.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 73DB85E62B23DE3B00D051BA /* Sources */ = { + 73A463FC2A1C3B3400BA8528 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 73DB85ED2B23DE3B00D051BA /* AppAttestExampleTests.swift in Sources */, + 738D5F732A26BC3B00A7F11B /* BirthdayLoader.swift in Sources */, + 738B4A322AA8FE800056885D /* AppCheckSecretReader.swift in Sources */, + 73A464062A1C3B3400BA8528 /* ContentView.swift in Sources */, + 73A464042A1C3B3400BA8528 /* AppAttestExampleApp.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 73DB85EF2B23DE3B00D051BA /* PBXTargetDependency */ = { + 736434252B2A914B00DA67DA /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = 73A463FF2A1C3B3400BA8528 /* AppAttestExample */; - targetProxy = 73DB85EE2B23DE3B00D051BA /* PBXContainerItemProxy */; + targetProxy = 736434242B2A914B00DA67DA /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ + 736434272B2A914B00DA67DA /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.google.AppAttestExampleTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AppAttestExample.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/AppAttestExample"; + }; + name = Debug; + }; + 736434282B2A914B00DA67DA /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; + BUNDLE_LOADER = "$(TEST_HOST)"; + CODE_SIGN_STYLE = Automatic; + CURRENT_PROJECT_VERSION = 1; + ENABLE_USER_SCRIPT_SANDBOXING = YES; + GCC_C_LANGUAGE_STANDARD = gnu17; + GENERATE_INFOPLIST_FILE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 17.0; + LOCALIZATION_PREFERS_STRING_CATALOGS = YES; + MARKETING_VERSION = 1.0; + PRODUCT_BUNDLE_IDENTIFIER = com.google.AppAttestExampleTests; + PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_EMIT_LOC_STRINGS = NO; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AppAttestExample.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/AppAttestExample"; + }; + name = Release; + }; 73A4640C2A1C3B3500BA8528 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -469,85 +512,32 @@ }; name = Release; }; - 73DB85F12B23DE3B00D051BA /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = "com.google.AppAttestExampleTests-2-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AppAttestExample.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/AppAttestExample"; - }; - name = Debug; - }; - 73DB85F22B23DE3B00D051BA /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES; - BUNDLE_LOADER = "$(TEST_HOST)"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - ENABLE_USER_SCRIPT_SANDBOXING = YES; - GCC_C_LANGUAGE_STANDARD = gnu17; - GENERATE_INFOPLIST_FILE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 16.0; - LOCALIZATION_PREFERS_STRING_CATALOGS = YES; - MARKETING_VERSION = 1.0; - OTHER_LDFLAGS = ""; - PRODUCT_BUNDLE_IDENTIFIER = "com.google.AppAttestExampleTests-2-"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator"; - SUPPORTS_MACCATALYST = NO; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AppAttestExample.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/AppAttestExample"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 73A463FB2A1C3B3400BA8528 /* Build configuration list for PBXProject "AppAttestExample" */ = { + 736434262B2A914B00DA67DA /* Build configuration list for PBXNativeTarget "AppAttestExampleTests" */ = { isa = XCConfigurationList; buildConfigurations = ( - 73A4640C2A1C3B3500BA8528 /* Debug */, - 73A4640D2A1C3B3500BA8528 /* Release */, + 736434272B2A914B00DA67DA /* Debug */, + 736434282B2A914B00DA67DA /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 73A4640E2A1C3B3500BA8528 /* Build configuration list for PBXNativeTarget "AppAttestExample" */ = { + 73A463FB2A1C3B3400BA8528 /* Build configuration list for PBXProject "AppAttestExample" */ = { isa = XCConfigurationList; buildConfigurations = ( - 73A4640F2A1C3B3500BA8528 /* Debug */, - 73A464102A1C3B3500BA8528 /* Release */, + 73A4640C2A1C3B3500BA8528 /* Debug */, + 73A4640D2A1C3B3500BA8528 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 73DB85F02B23DE3B00D051BA /* Build configuration list for PBXNativeTarget "AppAttestExampleTests" */ = { + 73A4640E2A1C3B3500BA8528 /* Build configuration list for PBXNativeTarget "AppAttestExample" */ = { isa = XCConfigurationList; buildConfigurations = ( - 73DB85F12B23DE3B00D051BA /* Debug */, - 73DB85F22B23DE3B00D051BA /* Release */, + 73A4640F2A1C3B3500BA8528 /* Debug */, + 73A464102A1C3B3500BA8528 /* Release */, ); defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme index b74cb11f..5679a777 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/xcshareddata/xcschemes/AppAttestExample.xcscheme @@ -39,7 +39,7 @@ parallelizable = "YES"> @@ -50,7 +50,7 @@ parallelizable = "YES"> diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xctestplan b/Samples/Swift/AppAttestExample/AppAttestExample.xctestplan index 5f7a478f..74185c6d 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xctestplan +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xctestplan @@ -1,15 +1,21 @@ { "configurations" : [ { - "id" : "BE893D88-5ECF-4AF1-95E1-CE186B02A525", - "name" : "Test Scheme Action", + "id" : "CBD3C208-A37F-4B73-9881-D0EBF17004C2", + "name" : "Configuration 1", "options" : { - + "targetForVariableExpansion" : { + "containerPath" : "container:AppAttestExample.xcodeproj", + "identifier" : "7364341F2B2A914A00DA67DA", + "name" : "AppAttestExampleTests" + } } } ], "defaultOptions" : { - "codeCoverage" : false, + "commandLineArgumentEntries" : [ + + ], "environmentVariableEntries" : [ { "key" : "AppCheckDebugToken", @@ -19,18 +25,13 @@ "key" : "APP_CHECK_WEB_API_KEY", "value" : "$(APP_CHECK_WEB_API_KEY)" } - ], - "targetForVariableExpansion" : { - "containerPath" : "container:AppAttestExample.xcodeproj", - "identifier" : "73A463FF2A1C3B3400BA8528", - "name" : "AppAttestExample" - } + ] }, "testTargets" : [ { "target" : { "containerPath" : "container:AppAttestExample.xcodeproj", - "identifier" : "73DB85E92B23DE3B00D051BA", + "identifier" : "7364341F2B2A914A00DA67DA", "name" : "AppAttestExampleTests" } } From 313cf90c007c4cfb70192082ed28620e1e8c9e99 Mon Sep 17 00:00:00 2001 From: Matthew Mathias Date: Thu, 14 Dec 2023 16:27:52 -0800 Subject: [PATCH 06/10] Update to local path for GSI --- .../project.pbxproj | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj index 0129e0e8..8f3a188f 100644 --- a/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj +++ b/Samples/Swift/AppAttestExample/AppAttestExample.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 56; + objectVersion = 60; objects = { /* Begin PBXBuildFile section */ @@ -32,7 +32,7 @@ 734555752AB167B80068F2B0 /* AppCheckDefaultSecrets.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppCheckDefaultSecrets.xcconfig; sourceTree = ""; }; 736434202B2A914A00DA67DA /* AppAttestExampleTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AppAttestExampleTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 736434222B2A914B00DA67DA /* AppAttestExampleTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppAttestExampleTests.swift; sourceTree = ""; }; - 736434292B2A923C00DA67DA /* AppAttestExample.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = file; path = AppAttestExample.xctestplan; sourceTree = SOURCE_ROOT; }; + 736434292B2A923C00DA67DA /* AppAttestExample.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = AppAttestExample.xctestplan; sourceTree = SOURCE_ROOT; }; 738B4A312AA8FE800056885D /* AppCheckSecretReader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppCheckSecretReader.swift; sourceTree = ""; }; 738D5F722A26BC3B00A7F11B /* BirthdayLoader.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BirthdayLoader.swift; sourceTree = ""; }; 73A065612A786D10007BC7FC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -149,6 +149,8 @@ 736434252B2A914B00DA67DA /* PBXTargetDependency */, ); name = AppAttestExampleTests; + packageProductDependencies = ( + ); productName = AppAttestExampleTests; productReference = 736434202B2A914A00DA67DA /* AppAttestExampleTests.xctest */; productType = "com.apple.product-type.bundle.unit-test"; @@ -203,7 +205,7 @@ ); mainGroup = 73A463F72A1C3B3400BA8528; packageReferences = ( - 73BEB7E82B2A753000479453 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */, + 73A0EE262B2BD381001595C9 /* XCLocalSwiftPackageReference "../../.." */, ); productRefGroup = 73A464012A1C3B3400BA8528 /* Products */; projectDirPath = ""; @@ -277,6 +279,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 17.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.google.AppAttestExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_ACTIVE_COMPILATION_CONDITIONS = "DEBUG $(inherited)"; @@ -300,6 +303,7 @@ IPHONEOS_DEPLOYMENT_TARGET = 17.0; LOCALIZATION_PREFERS_STRING_CATALOGS = YES; MARKETING_VERSION = 1.0; + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.google.AppAttestExampleTests; PRODUCT_NAME = "$(TARGET_NAME)"; SWIFT_EMIT_LOC_STRINGS = NO; @@ -458,6 +462,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.google.experimental0.dev; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -499,6 +504,7 @@ "@executable_path/Frameworks", ); MARKETING_VERSION = 1.0; + OTHER_LDFLAGS = ""; PRODUCT_BUNDLE_IDENTIFIER = com.google.experimental0.dev; PRODUCT_NAME = "$(TARGET_NAME)"; PROVISIONING_PROFILE_SPECIFIER = ""; @@ -544,16 +550,12 @@ }; /* End XCConfigurationList section */ -/* Begin XCRemoteSwiftPackageReference section */ - 73BEB7E82B2A753000479453 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/google/GoogleSignIn-iOS"; - requirement = { - branch = "fac-eap"; - kind = branch; - }; +/* Begin XCLocalSwiftPackageReference section */ + 73A0EE262B2BD381001595C9 /* XCLocalSwiftPackageReference "../../.." */ = { + isa = XCLocalSwiftPackageReference; + relativePath = ../../..; }; -/* End XCRemoteSwiftPackageReference section */ +/* End XCLocalSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ 73CD4AB12AAF915900642462 /* GoogleSignIn */ = { From fe433a23c8bbe074f52cfe4d0f1147a61ec5117b Mon Sep 17 00:00:00 2001 From: Matthew Mathias Date: Thu, 14 Dec 2023 16:33:20 -0800 Subject: [PATCH 07/10] Update to macos-14 runner --- .github/workflows/integration_tests.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index deb3d29e..a7690d69 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -42,7 +42,7 @@ jobs: PASSWORD_SECRET=$PASSWORD_SECRET app-check-api-token-tests: - runs-on: macOS-12 + runs-on: macOS-14 # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: "!github.event.pull_request.head.repo.fork" defaults: @@ -58,7 +58,7 @@ jobs: build-for-testing \ -scheme AppAttestExample \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 11' + -destination 'platform=iOS Simulator,name=iPhone 15' - name: Run test target for App Check Example env: AppCheckDebugToken : ${{ secrets.APP_CHECK_DEBUG_TOKEN }} From 6880a3c0136bf83a213af12dde0c81286658be72 Mon Sep 17 00:00:00 2001 From: Matthew Mathias Date: Thu, 14 Dec 2023 17:42:32 -0800 Subject: [PATCH 08/10] Use macos-13 --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index a7690d69..1a7044c4 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -42,7 +42,7 @@ jobs: PASSWORD_SECRET=$PASSWORD_SECRET app-check-api-token-tests: - runs-on: macOS-14 + runs-on: macOS-13 # Don't run if triggered by a PR from a fork since our Secrets won't be provided to the runner. if: "!github.event.pull_request.head.repo.fork" defaults: From 96407c7607ad173be3525a4579bd8a4b817741f5 Mon Sep 17 00:00:00 2001 From: Matthew Mathias Date: Mon, 18 Dec 2023 10:15:03 -0800 Subject: [PATCH 09/10] Select Xcode 15.0.1 in workflow for AppCheck tests --- .github/workflows/integration_tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 1a7044c4..1aba365f 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -51,6 +51,9 @@ jobs: steps: - name: Checkout uses: actions/checkout@v3 + - name: Use Xcode 15.0.1 + run: | + sudo xcode-select -s /Applications/Xcode_15.0.1.app - name: Build test target for App Check Example run: | xcodebuild \ From b232fdaa6d2685b08565d6fabb8a40f4415cf33c Mon Sep 17 00:00:00 2001 From: Matthew Mathias Date: Mon, 18 Dec 2023 10:24:52 -0800 Subject: [PATCH 10/10] Use iPhone 15 in AppCheck integration test --- .github/workflows/integration_tests.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/integration_tests.yml b/.github/workflows/integration_tests.yml index 1aba365f..92ae37eb 100644 --- a/.github/workflows/integration_tests.yml +++ b/.github/workflows/integration_tests.yml @@ -72,6 +72,6 @@ jobs: test-without-building \ -scheme AppAttestExample \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,name=iPhone 11' \ + -destination 'platform=iOS Simulator,name=iPhone 15' \ AppCheckDebugToken=$AppCheckDebugToken \ APP_CHECK_WEB_API_KEY=$APP_CHECK_WEB_API_KEY