From 629dceb0aedc8d32586b351b3cdf4c57e123eb97 Mon Sep 17 00:00:00 2001 From: Jesus Crespo Date: Wed, 25 Aug 2021 19:37:17 -0500 Subject: [PATCH 1/7] Remove macOS from project --- .../project.pbxproj | 300 ++---------------- .../Tests_iOS.swift => Shared/UITests.swift} | 2 +- 2 files changed, 25 insertions(+), 277 deletions(-) rename abtesting/{Tests_iOS/Tests_iOS.swift => Shared/UITests.swift} (99%) diff --git a/abtesting/ABTestingExample.xcodeproj/project.pbxproj b/abtesting/ABTestingExample.xcodeproj/project.pbxproj index 91c772032..1ef9d724e 100644 --- a/abtesting/ABTestingExample.xcodeproj/project.pbxproj +++ b/abtesting/ABTestingExample.xcodeproj/project.pbxproj @@ -3,26 +3,20 @@ archiveVersion = 1; classes = { }; - objectVersion = 54; + objectVersion = 55; objects = { /* Begin PBXBuildFile section */ 2F6D8D480CB9F0E7420B50D3 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 8052DFC0B0123902D171FEAB /* GoogleService-Info.plist */; }; - 4125B7D7268E2E7C00232B67 /* Tests_iOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4125B7D6268E2E7C00232B67 /* Tests_iOS.swift */; }; - 4125B7E1268E2E7C00232B67 /* Tests_macOS.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4125B7E0268E2E7C00232B67 /* Tests_macOS.swift */; }; + 4125B7D7268E2E7C00232B67 /* UITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4125B7D6268E2E7C00232B67 /* UITests.swift */; }; 4125B7E2268E2E7C00232B67 /* ABTestingExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4125B7C0268E2E7A00232B67 /* ABTestingExampleApp.swift */; }; - 4125B7E3268E2E7C00232B67 /* ABTestingExampleApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4125B7C0268E2E7A00232B67 /* ABTestingExampleApp.swift */; }; 4125B7E4268E2E7C00232B67 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4125B7C1268E2E7A00232B67 /* ContentView.swift */; }; - 4125B7E5268E2E7C00232B67 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4125B7C1268E2E7A00232B67 /* ContentView.swift */; }; 4125B7E6268E2E7C00232B67 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4125B7C2268E2E7C00232B67 /* Assets.xcassets */; }; - 4125B7E7268E2E7C00232B67 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4125B7C2268E2E7C00232B67 /* Assets.xcassets */; }; - 4125B7F8268E319D00232B67 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 4125B7F7268E319D00232B67 /* SwiftPackageProductDependency */; }; - 4125B7FA268E319D00232B67 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 4125B7F9268E319D00232B67 /* SwiftPackageProductDependency */; }; - 4125B7FC268E319D00232B67 /* BuildFile in Frameworks */ = {isa = PBXBuildFile; productRef = 4125B7FB268E319D00232B67 /* SwiftPackageProductDependency */; }; + 4125B7F8268E319D00232B67 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = 4125B7F7268E319D00232B67 /* FirebaseAnalytics */; }; + 4125B7FA268E319D00232B67 /* FirebaseInstallations in Frameworks */ = {isa = PBXBuildFile; productRef = 4125B7F9268E319D00232B67 /* FirebaseInstallations */; }; + 4125B7FC268E319D00232B67 /* FirebaseRemoteConfig in Frameworks */ = {isa = PBXBuildFile; productRef = 4125B7FB268E319D00232B67 /* FirebaseRemoteConfig */; }; 4125B84E268E7EF000232B67 /* AppConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4125B84D268E7EF000232B67 /* AppConfig.swift */; }; - 4B6CE8F73728DBC5D7C30EA8 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 8052DFC0B0123902D171FEAB /* GoogleService-Info.plist */; }; B58DA86066D02ECF1088F391 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 8052DFC0B0123902D171FEAB /* GoogleService-Info.plist */; }; - D6FD81AB0668389829F585D1 /* GoogleService-Info.plist in Sources */ = {isa = PBXBuildFile; fileRef = 8052DFC0B0123902D171FEAB /* GoogleService-Info.plist */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -33,13 +27,6 @@ remoteGlobalIDString = 4125B7C6268E2E7C00232B67; remoteInfo = "ABTestingExample (iOS)"; }; - 4125B7DD268E2E7C00232B67 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 4125B7BB268E2E7A00232B67 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 4125B7CC268E2E7C00232B67; - remoteInfo = "ABTestingExample (macOS)"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ @@ -47,11 +34,8 @@ 4125B7C1268E2E7A00232B67 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 4125B7C2268E2E7C00232B67 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 4125B7C7268E2E7C00232B67 /* ABTestingExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ABTestingExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 4125B7CD268E2E7C00232B67 /* ABTestingExample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ABTestingExample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 4125B7D2268E2E7C00232B67 /* Tests iOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests iOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 4125B7D6268E2E7C00232B67 /* Tests_iOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests_iOS.swift; sourceTree = ""; }; - 4125B7DC268E2E7C00232B67 /* Tests macOS.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "Tests macOS.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; - 4125B7E0268E2E7C00232B67 /* Tests_macOS.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tests_macOS.swift; sourceTree = ""; }; + 4125B7D6268E2E7C00232B67 /* UITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UITests.swift; sourceTree = ""; }; 4125B848268E507100232B67 /* ABTestingExample--iOS--Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "ABTestingExample--iOS--Info.plist"; sourceTree = ""; }; 4125B84D268E7EF000232B67 /* AppConfig.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppConfig.swift; sourceTree = ""; }; 8052DFC0B0123902D171FEAB /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; @@ -62,16 +46,9 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4125B7FC268E319D00232B67 /* BuildFile in Frameworks */, - 4125B7F8268E319D00232B67 /* BuildFile in Frameworks */, - 4125B7FA268E319D00232B67 /* BuildFile in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - 4125B7CA268E2E7C00232B67 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( + 4125B7FC268E319D00232B67 /* FirebaseRemoteConfig in Frameworks */, + 4125B7F8268E319D00232B67 /* FirebaseAnalytics in Frameworks */, + 4125B7FA268E319D00232B67 /* FirebaseInstallations in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -82,13 +59,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4125B7D9268E2E7C00232B67 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -97,8 +67,6 @@ children = ( 4125B848268E507100232B67 /* ABTestingExample--iOS--Info.plist */, 4125B7BF268E2E7A00232B67 /* Shared */, - 4125B7D5268E2E7C00232B67 /* Tests_iOS */, - 4125B7DF268E2E7C00232B67 /* Tests_macOS */, 4125B7C8268E2E7C00232B67 /* Products */, 8052DFC0B0123902D171FEAB /* GoogleService-Info.plist */, ); @@ -110,6 +78,7 @@ 4125B7C0268E2E7A00232B67 /* ABTestingExampleApp.swift */, 4125B7C1268E2E7A00232B67 /* ContentView.swift */, 4125B84D268E7EF000232B67 /* AppConfig.swift */, + 4125B7D6268E2E7C00232B67 /* UITests.swift */, 4125B7C2268E2E7C00232B67 /* Assets.xcassets */, ); path = Shared; @@ -119,29 +88,11 @@ isa = PBXGroup; children = ( 4125B7C7268E2E7C00232B67 /* ABTestingExample.app */, - 4125B7CD268E2E7C00232B67 /* ABTestingExample.app */, 4125B7D2268E2E7C00232B67 /* Tests iOS.xctest */, - 4125B7DC268E2E7C00232B67 /* Tests macOS.xctest */, ); name = Products; sourceTree = ""; }; - 4125B7D5268E2E7C00232B67 /* Tests_iOS */ = { - isa = PBXGroup; - children = ( - 4125B7D6268E2E7C00232B67 /* Tests_iOS.swift */, - ); - path = Tests_iOS; - sourceTree = ""; - }; - 4125B7DF268E2E7C00232B67 /* Tests_macOS */ = { - isa = PBXGroup; - children = ( - 4125B7E0268E2E7C00232B67 /* Tests_macOS.swift */, - ); - path = Tests_macOS; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -159,31 +110,14 @@ ); name = "ABTestingExample (iOS)"; packageProductDependencies = ( - 4125B7F7268E319D00232B67 /* SwiftPackageProductDependency */, - 4125B7F9268E319D00232B67 /* SwiftPackageProductDependency */, - 4125B7FB268E319D00232B67 /* SwiftPackageProductDependency */, + 4125B7F7268E319D00232B67 /* FirebaseAnalytics */, + 4125B7F9268E319D00232B67 /* FirebaseInstallations */, + 4125B7FB268E319D00232B67 /* FirebaseRemoteConfig */, ); productName = "ABTestingExample (iOS)"; productReference = 4125B7C7268E2E7C00232B67 /* ABTestingExample.app */; productType = "com.apple.product-type.application"; }; - 4125B7CC268E2E7C00232B67 /* ABTestingExample (macOS) */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4125B7ED268E2E7C00232B67 /* Build configuration list for PBXNativeTarget "ABTestingExample (macOS)" */; - buildPhases = ( - 4125B7C9268E2E7C00232B67 /* Sources */, - 4125B7CA268E2E7C00232B67 /* Frameworks */, - 4125B7CB268E2E7C00232B67 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "ABTestingExample (macOS)"; - productName = "ABTestingExample (macOS)"; - productReference = 4125B7CD268E2E7C00232B67 /* ABTestingExample.app */; - productType = "com.apple.product-type.application"; - }; 4125B7D1268E2E7C00232B67 /* Tests iOS */ = { isa = PBXNativeTarget; buildConfigurationList = 4125B7F0268E2E7C00232B67 /* Build configuration list for PBXNativeTarget "Tests iOS" */; @@ -202,24 +136,6 @@ productReference = 4125B7D2268E2E7C00232B67 /* Tests iOS.xctest */; productType = "com.apple.product-type.bundle.ui-testing"; }; - 4125B7DB268E2E7C00232B67 /* Tests macOS */ = { - isa = PBXNativeTarget; - buildConfigurationList = 4125B7F3268E2E7C00232B67 /* Build configuration list for PBXNativeTarget "Tests macOS" */; - buildPhases = ( - 4125B7D8268E2E7C00232B67 /* Sources */, - 4125B7D9268E2E7C00232B67 /* Frameworks */, - 4125B7DA268E2E7C00232B67 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - 4125B7DE268E2E7C00232B67 /* PBXTargetDependency */, - ); - name = "Tests macOS"; - productName = "Tests macOS"; - productReference = 4125B7DC268E2E7C00232B67 /* Tests macOS.xctest */; - productType = "com.apple.product-type.bundle.ui-testing"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -233,20 +149,13 @@ 4125B7C6268E2E7C00232B67 = { CreatedOnToolsVersion = 13.0; }; - 4125B7CC268E2E7C00232B67 = { - CreatedOnToolsVersion = 13.0; - }; 4125B7D1268E2E7C00232B67 = { CreatedOnToolsVersion = 13.0; TestTargetID = 4125B7C6268E2E7C00232B67; }; - 4125B7DB268E2E7C00232B67 = { - CreatedOnToolsVersion = 13.0; - TestTargetID = 4125B7CC268E2E7C00232B67; - }; }; }; - buildConfigurationList = 4125B7BE268E2E7A00232B67 /* Build configuration list for PBXProject "abtestingExample" */; + buildConfigurationList = 4125B7BE268E2E7A00232B67 /* Build configuration list for PBXProject "ABTestingExample" */; compatibilityVersion = "Xcode 13.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -256,16 +165,14 @@ ); mainGroup = 4125B7BA268E2E7A00232B67; packageReferences = ( - 4125B7F6268E319D00232B67 /* RemoteSwiftPackageReference */, + 4125B7F6268E319D00232B67 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */, ); productRefGroup = 4125B7C8268E2E7C00232B67 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( 4125B7C6268E2E7C00232B67 /* ABTestingExample (iOS) */, - 4125B7CC268E2E7C00232B67 /* ABTestingExample (macOS) */, 4125B7D1268E2E7C00232B67 /* Tests iOS */, - 4125B7DB268E2E7C00232B67 /* Tests macOS */, ); }; /* End PBXProject section */ @@ -279,14 +186,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4125B7CB268E2E7C00232B67 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4125B7E7268E2E7C00232B67 /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4125B7D0268E2E7C00232B67 /* Resources */ = { isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; @@ -294,13 +193,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4125B7DA268E2E7C00232B67 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -315,34 +207,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - 4125B7C9268E2E7C00232B67 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4125B7E5268E2E7C00232B67 /* ContentView.swift in Sources */, - 4125B7E3268E2E7C00232B67 /* ABTestingExampleApp.swift in Sources */, - 4B6CE8F73728DBC5D7C30EA8 /* GoogleService-Info.plist in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 4125B7CE268E2E7C00232B67 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 4125B7D7268E2E7C00232B67 /* Tests_iOS.swift in Sources */, + 4125B7D7268E2E7C00232B67 /* UITests.swift in Sources */, 2F6D8D480CB9F0E7420B50D3 /* GoogleService-Info.plist in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; - 4125B7D8268E2E7C00232B67 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 4125B7E1268E2E7C00232B67 /* Tests_macOS.swift in Sources */, - D6FD81AB0668389829F585D1 /* GoogleService-Info.plist in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ @@ -351,11 +224,6 @@ target = 4125B7C6268E2E7C00232B67 /* ABTestingExample (iOS) */; targetProxy = 4125B7D3268E2E7C00232B67 /* PBXContainerItemProxy */; }; - 4125B7DE268E2E7C00232B67 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = 4125B7CC268E2E7C00232B67 /* ABTestingExample (macOS) */; - targetProxy = 4125B7DD268E2E7C00232B67 /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -537,60 +405,6 @@ }; name = Release; }; - 4125B7EE268E2E7C00232B67 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - ENABLE_APP_SANDBOX = YES; - ENABLE_PREVIEWS = YES; - ENABLE_USER_SELECTED_FILES = readonly; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.firebase.ABTestingExample; - PRODUCT_NAME = ABTestingExample; - SDKROOT = macosx; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - }; - name = Debug; - }; - 4125B7EF268E2E7C00232B67 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - ENABLE_APP_SANDBOX = YES; - ENABLE_PREVIEWS = YES; - ENABLE_USER_SELECTED_FILES = readonly; - GENERATE_INFOPLIST_FILE = YES; - INFOPLIST_KEY_NSHumanReadableCopyright = ""; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 11.0; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.firebase.ABTestingExample; - PRODUCT_NAME = ABTestingExample; - SDKROOT = macosx; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - }; - name = Release; - }; 4125B7F1268E2E7C00232B67 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { @@ -640,58 +454,10 @@ }; name = Release; }; - 4125B7F4268E2E7C00232B67 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 11.4; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.firebase.Tests-macOS"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TEST_TARGET_NAME = "ABTestingExample (macOS)"; - }; - name = Debug; - }; - 4125B7F5268E2E7C00232B67 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES; - CODE_SIGN_STYLE = Automatic; - COMBINE_HIDPI_IMAGES = YES; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/../Frameworks", - "@loader_path/../Frameworks", - ); - MACOSX_DEPLOYMENT_TARGET = 11.4; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.firebase.Tests-macOS"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = macosx; - SWIFT_EMIT_LOC_STRINGS = NO; - SWIFT_VERSION = 5.0; - TEST_TARGET_NAME = "ABTestingExample (macOS)"; - }; - name = Release; - }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 4125B7BE268E2E7A00232B67 /* Build configuration list for PBXProject "abtestingExample" */ = { + 4125B7BE268E2E7A00232B67 /* Build configuration list for PBXProject "ABTestingExample" */ = { isa = XCConfigurationList; buildConfigurations = ( 4125B7E8268E2E7C00232B67 /* Debug */, @@ -709,15 +475,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4125B7ED268E2E7C00232B67 /* Build configuration list for PBXNativeTarget "ABTestingExample (macOS)" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4125B7EE268E2E7C00232B67 /* Debug */, - 4125B7EF268E2E7C00232B67 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; 4125B7F0268E2E7C00232B67 /* Build configuration list for PBXNativeTarget "Tests iOS" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -727,19 +484,10 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 4125B7F3268E2E7C00232B67 /* Build configuration list for PBXNativeTarget "Tests macOS" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 4125B7F4268E2E7C00232B67 /* Debug */, - 4125B7F5268E2E7C00232B67 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - 4125B7F6268E319D00232B67 /* RemoteSwiftPackageReference */ = { + 4125B7F6268E319D00232B67 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */ = { isa = XCRemoteSwiftPackageReference; repositoryURL = "https://github.com/firebase/firebase-ios-sdk.git"; requirement = { @@ -750,19 +498,19 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ - 4125B7F7268E319D00232B67 /* SwiftPackageProductDependency */ = { + 4125B7F7268E319D00232B67 /* FirebaseAnalytics */ = { isa = XCSwiftPackageProductDependency; - package = 4125B7F6268E319D00232B67 /* RemoteSwiftPackageReference */; + package = 4125B7F6268E319D00232B67 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; productName = FirebaseAnalytics; }; - 4125B7F9268E319D00232B67 /* SwiftPackageProductDependency */ = { + 4125B7F9268E319D00232B67 /* FirebaseInstallations */ = { isa = XCSwiftPackageProductDependency; - package = 4125B7F6268E319D00232B67 /* RemoteSwiftPackageReference */; + package = 4125B7F6268E319D00232B67 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; productName = FirebaseInstallations; }; - 4125B7FB268E319D00232B67 /* SwiftPackageProductDependency */ = { + 4125B7FB268E319D00232B67 /* FirebaseRemoteConfig */ = { isa = XCSwiftPackageProductDependency; - package = 4125B7F6268E319D00232B67 /* RemoteSwiftPackageReference */; + package = 4125B7F6268E319D00232B67 /* XCRemoteSwiftPackageReference "firebase-ios-sdk" */; productName = FirebaseRemoteConfig; }; /* End XCSwiftPackageProductDependency section */ diff --git a/abtesting/Tests_iOS/Tests_iOS.swift b/abtesting/Shared/UITests.swift similarity index 99% rename from abtesting/Tests_iOS/Tests_iOS.swift rename to abtesting/Shared/UITests.swift index 012e4569b..2029d1d66 100644 --- a/abtesting/Tests_iOS/Tests_iOS.swift +++ b/abtesting/Shared/UITests.swift @@ -17,7 +17,7 @@ import XCTest import CoreGraphics -class Tests_iOS: XCTestCase { +class UITests: XCTestCase { override func setUpWithError() throws { // Put setup code here. This method is called before the invocation of each test method in // the class. From aafee4b9347dc261a8eb1b9c08f08a1c398dc558 Mon Sep 17 00:00:00 2001 From: Jesus Crespo Date: Wed, 25 Aug 2021 19:38:09 -0500 Subject: [PATCH 2/7] Fix background thread runtime warning --- abtesting/Shared/AppConfig.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abtesting/Shared/AppConfig.swift b/abtesting/Shared/AppConfig.swift index 7c20a00be..f539a729a 100644 --- a/abtesting/Shared/AppConfig.swift +++ b/abtesting/Shared/AppConfig.swift @@ -55,7 +55,7 @@ class AppConfig: ObservableObject { } #if swift(>=5.5) - @MainActor @available(iOS 15, *) + @available(iOS 15, *) func updateFromRemoteConfigAsync() async { let remoteConfig = RemoteConfig.remoteConfig() let oldValue = remoteConfig["color_scheme"].stringValue ?? "nil" @@ -65,7 +65,7 @@ class AppConfig: ObservableObject { let newValue = remoteConfig["color_scheme"].stringValue ?? "nil" if newValue != oldValue { print("Remote Config changed to: \(newValue)") - colorScheme = ColorScheme(newValue) + Task.detached { @MainActor in self.colorScheme = ColorScheme(newValue) } } else { print("Remote Config did not change from: \(oldValue)") } From f446999b57bc54a703d5ea5813ba7d3d9c3c8510 Mon Sep 17 00:00:00 2001 From: Jesus Crespo Date: Wed, 25 Aug 2021 19:49:04 -0500 Subject: [PATCH 3/7] Enforce consistent styling --- abtesting/Shared/ContentView.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/abtesting/Shared/ContentView.swift b/abtesting/Shared/ContentView.swift index c6f13eefc..500a58102 100644 --- a/abtesting/Shared/ContentView.swift +++ b/abtesting/Shared/ContentView.swift @@ -44,6 +44,7 @@ struct ContentView: View { .navigationTitle("Firenotes") .navigationBarTitleDisplayMode(.inline) } + .navigationViewStyle(.stack) .preferredColorScheme(appConfig.colorScheme) .onAppear { appConfig.updateFromRemoteConfig() } } From 4916cef3316f590fae8bcfdf0b1c0f29759bcdd4 Mon Sep 17 00:00:00 2001 From: Jesus Crespo Date: Wed, 25 Aug 2021 20:03:22 -0500 Subject: [PATCH 4/7] Fix backward compatiblity --- abtesting/Shared/ContentView.swift | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/abtesting/Shared/ContentView.swift b/abtesting/Shared/ContentView.swift index 500a58102..95ce9eabe 100644 --- a/abtesting/Shared/ContentView.swift +++ b/abtesting/Shared/ContentView.swift @@ -44,7 +44,7 @@ struct ContentView: View { .navigationTitle("Firenotes") .navigationBarTitleDisplayMode(.inline) } - .navigationViewStyle(.stack) + .navigationViewStyle(StackNavigationViewStyle.stack) .preferredColorScheme(appConfig.colorScheme) .onAppear { appConfig.updateFromRemoteConfig() } } From 27fa760517c41c97ab26ee31dee7663a172fb8cc Mon Sep 17 00:00:00 2001 From: Jesus Crespo Date: Wed, 25 Aug 2021 20:03:47 -0500 Subject: [PATCH 5/7] Enforce consistent styling --- abtesting/Shared/ContentView.swift | 1 + 1 file changed, 1 insertion(+) diff --git a/abtesting/Shared/ContentView.swift b/abtesting/Shared/ContentView.swift index 95ce9eabe..0e745dbe9 100644 --- a/abtesting/Shared/ContentView.swift +++ b/abtesting/Shared/ContentView.swift @@ -59,6 +59,7 @@ struct BasicList: View { Text(item.subtitle).font(.subheadline) } } + .listStyle(InsetGroupedListStyle.insetGrouped) } } From 33f3b09c48fa7a88223f5e39bf1c4b225c4d89bd Mon Sep 17 00:00:00 2001 From: Jesus Crespo Date: Wed, 25 Aug 2021 20:08:01 -0500 Subject: [PATCH 6/7] Fix backward compatibility --- abtesting/Shared/ContentView.swift | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/abtesting/Shared/ContentView.swift b/abtesting/Shared/ContentView.swift index 0e745dbe9..558cf01a6 100644 --- a/abtesting/Shared/ContentView.swift +++ b/abtesting/Shared/ContentView.swift @@ -44,7 +44,7 @@ struct ContentView: View { .navigationTitle("Firenotes") .navigationBarTitleDisplayMode(.inline) } - .navigationViewStyle(StackNavigationViewStyle.stack) + .navigationViewStyle(StackNavigationViewStyle()) .preferredColorScheme(appConfig.colorScheme) .onAppear { appConfig.updateFromRemoteConfig() } } @@ -59,7 +59,7 @@ struct BasicList: View { Text(item.subtitle).font(.subheadline) } } - .listStyle(InsetGroupedListStyle.insetGrouped) + .listStyle(InsetGroupedListStyle()) } } From f2a5a9c3cd91ce2475807778baab1e28067c6b11 Mon Sep 17 00:00:00 2001 From: Jesus Crespo Date: Wed, 25 Aug 2021 20:16:26 -0500 Subject: [PATCH 7/7] Remove macOS files --- abtesting/Tests_macOS/Tests_macOS.swift | 53 ------------------------- 1 file changed, 53 deletions(-) delete mode 100644 abtesting/Tests_macOS/Tests_macOS.swift diff --git a/abtesting/Tests_macOS/Tests_macOS.swift b/abtesting/Tests_macOS/Tests_macOS.swift deleted file mode 100644 index 630847a21..000000000 --- a/abtesting/Tests_macOS/Tests_macOS.swift +++ /dev/null @@ -1,53 +0,0 @@ -// -// Copyright 2021 Google LLC -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -import XCTest - -class Tests_macOS: XCTestCase { - override func setUpWithError() throws { - // Put setup code here. This method is called before the invocation of each test method in - // the class. - - // In UI tests it is usually best to stop immediately when a failure occurs. - continueAfterFailure = false - - // In UI tests it’s important to set the initial state - such as interface orientation - - // required for your tests before they run. The setUp method is a good place to do this. - } - - override func tearDownWithError() throws { - // Put teardown code here. This method is called after the invocation of each test method in - // the class. - } - - func testExample() throws { - // UI tests must launch the application that they test. - let app = XCUIApplication() - app.launch() - - // Use recording to get started writing UI tests. - // Use XCTAssert and related functions to verify your tests produce the correct results. - } - - func testLaunchPerformance() throws { - if #available(macOS 10.15, iOS 13.0, tvOS 13.0, watchOS 7.0, *) { - // This measures how long it takes to launch your application. - measure(metrics: [XCTApplicationLaunchMetric()]) { - XCUIApplication().launch() - } - } - } -}