From 8ec15fd79b2b33b93c3e791de450eb7824ddb935 Mon Sep 17 00:00:00 2001 From: Nick Cooke <36927374+ncooke3@users.noreply.github.com> Date: Mon, 13 Jan 2025 12:08:39 -0500 Subject: [PATCH] [Infra] Simplify Client app schemes (#14333) --- .github/workflows/client_app.yml | 8 +- .../ClientApp.xcodeproj/project.pbxproj | 418 +----------------- IntegrationTesting/ClientApp/Podfile | 15 +- .../Shared-iOS13+/objc-header-import-test.m | 45 -- .../Shared-iOS13+/objc-module-import-test.m | 28 -- .../objcxx-header-import-test.mm | 46 -- .../Shared-iOS13+/swift-import-test.swift | 23 - .../objc-header-import-test.m | 18 +- .../objc-module-import-test.m | 11 +- .../objcxx-header-import-test.mm | 15 + .../swift-import-test.swift | 5 + 11 files changed, 60 insertions(+), 572 deletions(-) delete mode 100644 IntegrationTesting/ClientApp/Shared-iOS13+/objc-header-import-test.m delete mode 100644 IntegrationTesting/ClientApp/Shared-iOS13+/objc-module-import-test.m delete mode 100644 IntegrationTesting/ClientApp/Shared-iOS13+/objcxx-header-import-test.mm delete mode 100644 IntegrationTesting/ClientApp/Shared-iOS13+/swift-import-test.swift rename IntegrationTesting/ClientApp/{Shared-iOS12+ => Shared}/objc-header-import-test.m (89%) rename IntegrationTesting/ClientApp/{Shared-iOS12+ => Shared}/objc-module-import-test.m (96%) rename IntegrationTesting/ClientApp/{Shared-iOS12+ => Shared}/objcxx-header-import-test.mm (89%) rename IntegrationTesting/ClientApp/{Shared-iOS12+ => Shared}/swift-import-test.swift (93%) diff --git a/.github/workflows/client_app.yml b/.github/workflows/client_app.yml index 68f35f2fbdb..99ece4dcf14 100644 --- a/.github/workflows/client_app.yml +++ b/.github/workflows/client_app.yml @@ -30,9 +30,7 @@ jobs: matrix: #TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst platform: [iOS] - scheme: [ClientApp-iOS13] - # TODO(ncooke3): Re-enable after updating Firestore binary. - #scheme: [ClientApp, ClientApp-iOS13] + scheme: [ClientApp] steps: - uses: actions/checkout@v4 - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 @@ -53,7 +51,7 @@ jobs: matrix: #TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst platform: [iOS] - scheme: [ClientApp, ClientApp-iOS13] + scheme: [ClientApp] steps: - uses: actions/checkout@v4 - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 @@ -70,7 +68,7 @@ jobs: runs-on: macos-14 strategy: matrix: - scheme: [ClientApp-CocoaPods, ClientApp-CocoaPods-iOS13] + scheme: [ClientApp-CocoaPods] steps: - uses: actions/checkout@v4 - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126 diff --git a/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj b/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj index 33c556f5c23..645924782b1 100644 --- a/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj +++ b/IntegrationTesting/ClientApp/ClientApp.xcodeproj/project.pbxproj @@ -7,19 +7,13 @@ objects = { /* Begin PBXBuildFile section */ - DE305B702B7BE0B5000595B3 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = DE305B6F2B7BE0B5000595B3 /* FirebaseStorage */; }; - DE99626B2B44C96C0038ED6B /* objc-module-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = DE9962682B44C96B0038ED6B /* objc-module-import-test.m */; }; - DE99626C2B44C96C0038ED6B /* objc-module-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = DE9962682B44C96B0038ED6B /* objc-module-import-test.m */; }; - DE99626D2B44C96C0038ED6B /* objcxx-header-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = DE9962692B44C96B0038ED6B /* objcxx-header-import-test.mm */; }; - DE99626E2B44C96C0038ED6B /* objcxx-header-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = DE9962692B44C96B0038ED6B /* objcxx-header-import-test.mm */; }; - DE99626F2B44C96C0038ED6B /* objc-header-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = DE99626A2B44C96B0038ED6B /* objc-header-import-test.m */; }; - DE9962702B44C96C0038ED6B /* objc-header-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = DE99626A2B44C96B0038ED6B /* objc-header-import-test.m */; }; EA05C7DE29F08D4B00D1014F /* objc-module-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DD29F08D4B00D1014F /* objc-module-import-test.m */; }; EA05C7E029F0911400D1014F /* objc-header-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DF29F0911400D1014F /* objc-header-import-test.m */; }; EA0BC0FF29F06D5B005B8AEE /* FirebaseAnalyticsOnDeviceConversion in Frameworks */ = {isa = PBXBuildFile; platformFilter = ios; productRef = EA0BC0FE29F06D5B005B8AEE /* FirebaseAnalyticsOnDeviceConversion */; }; EA1269B429EDF98800D79E66 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B329EDF98800D79E66 /* AppDelegate.swift */; }; EA1269B829EDF98A00D79E66 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269B729EDF98A00D79E66 /* Assets.xcassets */; }; EA1269BC29EDF98A00D79E66 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269BB29EDF98A00D79E66 /* Preview Assets.xcassets */; }; + EA1FA0D12D31A8EE00DF3C07 /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = EA1FA0D02D31A8EE00DF3C07 /* FirebaseAuth */; }; EA501B1129F09594009C4DBC /* objcxx-header-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */; }; EA5A62942A9914F300F5711A /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA5A62932A9914F300F5711A /* Preview Assets.xcassets */; }; EA5A62992A99498500F5711A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269B729EDF98A00D79E66 /* Assets.xcassets */; }; @@ -47,24 +41,9 @@ EA7DF5AF29EF3328005664A7 /* FirebasePerformance in Frameworks */ = {isa = PBXBuildFile; platformFilters = (ios, tvos, ); productRef = EA7DF5AE29EF3328005664A7 /* FirebasePerformance */; }; EA7DF5B129EF3328005664A7 /* FirebaseRemoteConfig in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF5B029EF3328005664A7 /* FirebaseRemoteConfig */; }; EA7DF5B729EF3328005664A7 /* FirebaseStorageCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF5B629EF3328005664A7 /* FirebaseStorageCombine-Community */; }; - EAA0A99A2AD8495000C28FCD /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EAA0A9992AD8495000C28FCD /* Preview Assets.xcassets */; }; - EAA0A9A52AD849E600C28FCD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B329EDF98800D79E66 /* AppDelegate.swift */; }; - EAA0A9A92AD84C2A00C28FCD /* swift-import-test.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA0A9A82AD84C2A00C28FCD /* swift-import-test.swift */; }; - EAA0A9AC2AD84CFC00C28FCD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269B729EDF98A00D79E66 /* Assets.xcassets */; }; - EAA0A9BC2AD84E0900C28FCD /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EAA0A9BB2AD84E0900C28FCD /* Preview Assets.xcassets */; }; - EAA0A9C12AD84E5600C28FCD /* FirebaseInAppMessaging-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = EAA0A9C02AD84E5600C28FCD /* FirebaseInAppMessaging-Beta */; }; - EAA0A9C52AD84E5D00C28FCD /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = EAA0A9C42AD84E5D00C28FCD /* FirebaseAnalytics */; }; - EAA0A9C82AD84E6A00C28FCD /* swift-import-test.swift in Sources */ = {isa = PBXBuildFile; fileRef = EAA0A9A82AD84C2A00C28FCD /* swift-import-test.swift */; }; - EAA0A9C92AD84E7000C28FCD /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269B729EDF98A00D79E66 /* Assets.xcassets */; }; - EAA0A9CA2AD84E7000C28FCD /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B329EDF98800D79E66 /* AppDelegate.swift */; }; - EABBCF6D2B45B44100232BAF /* FirebaseAuth in Frameworks */ = {isa = PBXBuildFile; productRef = EABBCF6C2B45B44100232BAF /* FirebaseAuth */; }; - EABBCF6F2B45B46500232BAF /* FirebaseAuthCombine-Community in Frameworks */ = {isa = PBXBuildFile; productRef = EABBCF6E2B45B46500232BAF /* FirebaseAuthCombine-Community */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ - DE9962682B44C96B0038ED6B /* objc-module-import-test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "objc-module-import-test.m"; sourceTree = ""; }; - DE9962692B44C96B0038ED6B /* objcxx-header-import-test.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = "objcxx-header-import-test.mm"; sourceTree = ""; }; - DE99626A2B44C96B0038ED6B /* objc-header-import-test.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "objc-header-import-test.m"; sourceTree = ""; }; EA05C7DD29F08D4B00D1014F /* objc-module-import-test.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "objc-module-import-test.m"; sourceTree = ""; }; EA05C7DF29F0911400D1014F /* objc-header-import-test.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "objc-header-import-test.m"; sourceTree = ""; }; EA1269B029EDF98800D79E66 /* ClientApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ClientApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -78,13 +57,6 @@ EA5A62932A9914F300F5711A /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; EA7DF54229EF20B9005664A7 /* swift-import-test.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "swift-import-test.swift"; sourceTree = ""; }; EA7DF54929EF2A92005664A7 /* firebase-ios-sdk */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "firebase-ios-sdk"; path = ../../; sourceTree = ""; }; - EAA0A98F2AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ClientApp-CocoaPods-iOS13.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - EAA0A9972AD8495000C28FCD /* ClientApp_CocoaPods_iOS13.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClientApp_CocoaPods_iOS13.entitlements; sourceTree = ""; }; - EAA0A9992AD8495000C28FCD /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; - EAA0A9A82AD84C2A00C28FCD /* swift-import-test.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "swift-import-test.swift"; sourceTree = ""; }; - EAA0A9B12AD84E0800C28FCD /* ClientApp-iOS13.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "ClientApp-iOS13.app"; sourceTree = BUILT_PRODUCTS_DIR; }; - EAA0A9B92AD84E0900C28FCD /* ClientApp_iOS13.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClientApp_iOS13.entitlements; sourceTree = ""; }; - EAA0A9BB2AD84E0900C28FCD /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -103,6 +75,7 @@ EA7DF5AB29EF3327005664A7 /* FirebaseMessaging in Frameworks */, EA7DF59329EF3326005664A7 /* FirebaseCrashlytics in Frameworks */, EA7DF5A529EF3327005664A7 /* FirebaseInAppMessaging-Beta in Frameworks */, + EA1FA0D12D31A8EE00DF3C07 /* FirebaseAuth in Frameworks */, EA7DF5B729EF3328005664A7 /* FirebaseStorageCombine-Community in Frameworks */, EA7DF5B129EF3328005664A7 /* FirebaseRemoteConfig in Frameworks */, EA7DF5A129EF3327005664A7 /* FirebaseFunctions in Frameworks */, @@ -121,25 +94,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - EAA0A98C2AD8494F00C28FCD /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; - EAA0A9AE2AD84E0800C28FCD /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - EABBCF6F2B45B46500232BAF /* FirebaseAuthCombine-Community in Frameworks */, - EABBCF6D2B45B44100232BAF /* FirebaseAuth in Frameworks */, - DE305B702B7BE0B5000595B3 /* FirebaseStorage in Frameworks */, - EAA0A9C12AD84E5600C28FCD /* FirebaseInAppMessaging-Beta in Frameworks */, - EAA0A9C52AD84E5D00C28FCD /* FirebaseAnalytics in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ @@ -153,14 +107,10 @@ EA1269A729EDF98800D79E66 = { isa = PBXGroup; children = ( - EAA0A9A72AD84BF100C28FCD /* Shared-iOS12+ */, - EAA0A9A62AD84BCC00C28FCD /* Shared-iOS13+ */, EA5A62982A99151F00F5711A /* Shared */, EA1269C229EDF9DD00D79E66 /* Packages */, EA1269B229EDF98800D79E66 /* ClientApp */, EA5A628A2A9914F000F5711A /* ClientApp-CocoaPods */, - EAA0A9902AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13 */, - EAA0A9B22AD84E0800C28FCD /* ClientApp-iOS13 */, EA1269B129EDF98800D79E66 /* Products */, DE305B6E2B7BE0B5000595B3 /* Frameworks */, ); @@ -171,8 +121,6 @@ children = ( EA1269B029EDF98800D79E66 /* ClientApp.app */, EA5A62892A9914F000F5711A /* ClientApp-CocoaPods.app */, - EAA0A98F2AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13.app */, - EAA0A9B12AD84E0800C28FCD /* ClientApp-iOS13.app */, ); name = Products; sourceTree = ""; @@ -222,68 +170,16 @@ EA5A62982A99151F00F5711A /* Shared */ = { isa = PBXGroup; children = ( + EA05C7DF29F0911400D1014F /* objc-header-import-test.m */, + EA05C7DD29F08D4B00D1014F /* objc-module-import-test.m */, + EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */, + EA7DF54229EF20B9005664A7 /* swift-import-test.swift */, EA1269B329EDF98800D79E66 /* AppDelegate.swift */, EA1269B729EDF98A00D79E66 /* Assets.xcassets */, ); path = Shared; sourceTree = ""; }; - EAA0A9902AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13 */ = { - isa = PBXGroup; - children = ( - EAA0A9972AD8495000C28FCD /* ClientApp_CocoaPods_iOS13.entitlements */, - EAA0A9982AD8495000C28FCD /* Preview Content */, - ); - path = "ClientApp-CocoaPods-iOS13"; - sourceTree = ""; - }; - EAA0A9982AD8495000C28FCD /* Preview Content */ = { - isa = PBXGroup; - children = ( - EAA0A9992AD8495000C28FCD /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; - EAA0A9A62AD84BCC00C28FCD /* Shared-iOS13+ */ = { - isa = PBXGroup; - children = ( - DE99626A2B44C96B0038ED6B /* objc-header-import-test.m */, - DE9962682B44C96B0038ED6B /* objc-module-import-test.m */, - DE9962692B44C96B0038ED6B /* objcxx-header-import-test.mm */, - EAA0A9A82AD84C2A00C28FCD /* swift-import-test.swift */, - ); - path = "Shared-iOS13+"; - sourceTree = ""; - }; - EAA0A9A72AD84BF100C28FCD /* Shared-iOS12+ */ = { - isa = PBXGroup; - children = ( - EA7DF54229EF20B9005664A7 /* swift-import-test.swift */, - EA05C7DD29F08D4B00D1014F /* objc-module-import-test.m */, - EA05C7DF29F0911400D1014F /* objc-header-import-test.m */, - EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */, - ); - path = "Shared-iOS12+"; - sourceTree = ""; - }; - EAA0A9B22AD84E0800C28FCD /* ClientApp-iOS13 */ = { - isa = PBXGroup; - children = ( - EAA0A9B92AD84E0900C28FCD /* ClientApp_iOS13.entitlements */, - EAA0A9BA2AD84E0900C28FCD /* Preview Content */, - ); - path = "ClientApp-iOS13"; - sourceTree = ""; - }; - EAA0A9BA2AD84E0900C28FCD /* Preview Content */ = { - isa = PBXGroup; - children = ( - EAA0A9BB2AD84E0900C28FCD /* Preview Assets.xcassets */, - ); - path = "Preview Content"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -320,6 +216,7 @@ EA7DF5B029EF3328005664A7 /* FirebaseRemoteConfig */, EA7DF5B629EF3328005664A7 /* FirebaseStorageCombine-Community */, EA0BC0FE29F06D5B005B8AEE /* FirebaseAnalyticsOnDeviceConversion */, + EA1FA0D02D31A8EE00DF3C07 /* FirebaseAuth */, ); productName = ClientApp; productReference = EA1269B029EDF98800D79E66 /* ClientApp.app */; @@ -342,47 +239,6 @@ productReference = EA5A62892A9914F000F5711A /* ClientApp-CocoaPods.app */; productType = "com.apple.product-type.application"; }; - EAA0A98E2AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13 */ = { - isa = PBXNativeTarget; - buildConfigurationList = EAA0A99B2AD8495000C28FCD /* Build configuration list for PBXNativeTarget "ClientApp-CocoaPods-iOS13" */; - buildPhases = ( - EAA0A98B2AD8494F00C28FCD /* Sources */, - EAA0A98C2AD8494F00C28FCD /* Frameworks */, - EAA0A98D2AD8494F00C28FCD /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "ClientApp-CocoaPods-iOS13"; - productName = "ClientApp-CocoaPods-iOS13"; - productReference = EAA0A98F2AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13.app */; - productType = "com.apple.product-type.application"; - }; - EAA0A9B02AD84E0800C28FCD /* ClientApp-iOS13 */ = { - isa = PBXNativeTarget; - buildConfigurationList = EAA0A9BD2AD84E0900C28FCD /* Build configuration list for PBXNativeTarget "ClientApp-iOS13" */; - buildPhases = ( - EAA0A9AD2AD84E0800C28FCD /* Sources */, - EAA0A9AE2AD84E0800C28FCD /* Frameworks */, - EAA0A9AF2AD84E0800C28FCD /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = "ClientApp-iOS13"; - packageProductDependencies = ( - EAA0A9C02AD84E5600C28FCD /* FirebaseInAppMessaging-Beta */, - EAA0A9C42AD84E5D00C28FCD /* FirebaseAnalytics */, - EABBCF6C2B45B44100232BAF /* FirebaseAuth */, - EABBCF6E2B45B46500232BAF /* FirebaseAuthCombine-Community */, - DE305B6F2B7BE0B5000595B3 /* FirebaseStorage */, - ); - productName = "ClientApp-iOS13"; - productReference = EAA0A9B12AD84E0800C28FCD /* ClientApp-iOS13.app */; - productType = "com.apple.product-type.application"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -400,14 +256,6 @@ EA5A62882A9914F000F5711A = { CreatedOnToolsVersion = 14.1; }; - EAA0A98E2AD8494F00C28FCD = { - CreatedOnToolsVersion = 14.1; - LastSwiftMigration = 1510; - }; - EAA0A9B02AD84E0800C28FCD = { - CreatedOnToolsVersion = 14.1; - LastSwiftMigration = 1510; - }; }; }; buildConfigurationList = EA1269AB29EDF98800D79E66 /* Build configuration list for PBXProject "ClientApp" */; @@ -425,8 +273,6 @@ targets = ( EA1269AF29EDF98800D79E66 /* ClientApp */, EA5A62882A9914F000F5711A /* ClientApp-CocoaPods */, - EAA0A98E2AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13 */, - EAA0A9B02AD84E0800C28FCD /* ClientApp-iOS13 */, ); }; /* End PBXProject section */ @@ -450,24 +296,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - EAA0A98D2AD8494F00C28FCD /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - EAA0A99A2AD8495000C28FCD /* Preview Assets.xcassets in Resources */, - EAA0A9AC2AD84CFC00C28FCD /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - EAA0A9AF2AD84E0800C28FCD /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - EAA0A9BC2AD84E0900C28FCD /* Preview Assets.xcassets in Resources */, - EAA0A9C92AD84E7000C28FCD /* Assets.xcassets in Resources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXResourcesBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -495,30 +323,6 @@ ); runOnlyForDeploymentPostprocessing = 0; }; - EAA0A98B2AD8494F00C28FCD /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DE99626B2B44C96C0038ED6B /* objc-module-import-test.m in Sources */, - DE99626D2B44C96C0038ED6B /* objcxx-header-import-test.mm in Sources */, - EAA0A9A92AD84C2A00C28FCD /* swift-import-test.swift in Sources */, - DE99626F2B44C96C0038ED6B /* objc-header-import-test.m in Sources */, - EAA0A9A52AD849E600C28FCD /* AppDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; - EAA0A9AD2AD84E0800C28FCD /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - DE99626C2B44C96C0038ED6B /* objc-module-import-test.m in Sources */, - DE99626E2B44C96C0038ED6B /* objcxx-header-import-test.mm in Sources */, - EAA0A9C82AD84E6A00C28FCD /* swift-import-test.swift in Sources */, - DE9962702B44C96C0038ED6B /* objc-header-import-test.m in Sources */, - EAA0A9CA2AD84E7000C28FCD /* AppDelegate.swift in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -751,6 +555,7 @@ SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; + TVOS_DEPLOYMENT_TARGET = 13.0; }; name = Debug; }; @@ -787,170 +592,7 @@ SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - EAA0A99C2AD8495000C28FCD /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = "ClientApp-CocoaPods-iOS13/ClientApp_CocoaPods_iOS13.entitlements"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"ClientApp-CocoaPods-iOS13/Preview Content\""; - DEVELOPMENT_TEAM = K2A6VGGX23; - ENABLE_HARDENED_RUNTIME = YES; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.nickcooke.ClientApp-CocoaPods-iOS13"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Debug; - }; - EAA0A99D2AD8495000C28FCD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = "ClientApp-CocoaPods-iOS13/ClientApp_CocoaPods_iOS13.entitlements"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"ClientApp-CocoaPods-iOS13/Preview Content\""; - DEVELOPMENT_TEAM = K2A6VGGX23; - ENABLE_HARDENED_RUNTIME = YES; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.nickcooke.ClientApp-CocoaPods-iOS13"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - }; - name = Release; - }; - EAA0A9BE2AD84E0900C28FCD /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = "ClientApp-iOS13/ClientApp_iOS13.entitlements"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"ClientApp-iOS13/Preview Content\""; - DEVELOPMENT_TEAM = K2A6VGGX23; - ENABLE_HARDENED_RUNTIME = YES; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.nickcooke.ClientApp-iOS13"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; - SUPPORTS_MACCATALYST = YES; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_OPTIMIZATION_LEVEL = "-Onone"; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 1; - }; - name = Debug; - }; - EAA0A9BF2AD84E0900C28FCD /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; - CLANG_ENABLE_MODULES = YES; - CODE_SIGN_ENTITLEMENTS = "ClientApp-iOS13/ClientApp_iOS13.entitlements"; - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - DEVELOPMENT_ASSET_PATHS = "\"ClientApp-iOS13/Preview Content\""; - DEVELOPMENT_TEAM = K2A6VGGX23; - ENABLE_HARDENED_RUNTIME = YES; - ENABLE_PREVIEWS = YES; - GENERATE_INFOPLIST_FILE = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSceneManifest_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphoneos*]" = YES; - "INFOPLIST_KEY_UILaunchScreen_Generation[sdk=iphonesimulator*]" = YES; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphoneos*]" = UIStatusBarStyleDefault; - "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 13.0; - LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; - "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 10.15; - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = "com.nickcooke.ClientApp-iOS13"; - PRODUCT_NAME = "$(TARGET_NAME)"; - SDKROOT = auto; - SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; - SUPPORTS_MACCATALYST = YES; - SUPPORTS_MAC_DESIGNED_FOR_IPHONE_IPAD = NO; - SWIFT_EMIT_LOC_STRINGS = YES; - SWIFT_VERSION = 5.0; - TARGETED_DEVICE_FAMILY = "1,2"; - TVOS_DEPLOYMENT_TARGET = 1; + TVOS_DEPLOYMENT_TARGET = 13.0; }; name = Release; }; @@ -984,35 +626,17 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - EAA0A99B2AD8495000C28FCD /* Build configuration list for PBXNativeTarget "ClientApp-CocoaPods-iOS13" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - EAA0A99C2AD8495000C28FCD /* Debug */, - EAA0A99D2AD8495000C28FCD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - EAA0A9BD2AD84E0900C28FCD /* Build configuration list for PBXNativeTarget "ClientApp-iOS13" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - EAA0A9BE2AD84E0900C28FCD /* Debug */, - EAA0A9BF2AD84E0900C28FCD /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ /* Begin XCSwiftPackageProductDependency section */ - DE305B6F2B7BE0B5000595B3 /* FirebaseStorage */ = { - isa = XCSwiftPackageProductDependency; - productName = FirebaseStorage; - }; EA0BC0FE29F06D5B005B8AEE /* FirebaseAnalyticsOnDeviceConversion */ = { isa = XCSwiftPackageProductDependency; productName = FirebaseAnalyticsOnDeviceConversion; }; + EA1FA0D02D31A8EE00DF3C07 /* FirebaseAuth */ = { + isa = XCSwiftPackageProductDependency; + productName = FirebaseAuth; + }; EA7DF58229EF3326005664A7 /* FirebaseAnalytics */ = { isa = XCSwiftPackageProductDependency; productName = FirebaseAnalytics; @@ -1085,22 +709,6 @@ isa = XCSwiftPackageProductDependency; productName = "FirebaseStorageCombine-Community"; }; - EAA0A9C02AD84E5600C28FCD /* FirebaseInAppMessaging-Beta */ = { - isa = XCSwiftPackageProductDependency; - productName = "FirebaseInAppMessaging-Beta"; - }; - EAA0A9C42AD84E5D00C28FCD /* FirebaseAnalytics */ = { - isa = XCSwiftPackageProductDependency; - productName = FirebaseAnalytics; - }; - EABBCF6C2B45B44100232BAF /* FirebaseAuth */ = { - isa = XCSwiftPackageProductDependency; - productName = FirebaseAuth; - }; - EABBCF6E2B45B46500232BAF /* FirebaseAuthCombine-Community */ = { - isa = XCSwiftPackageProductDependency; - productName = "FirebaseAuthCombine-Community"; - }; /* End XCSwiftPackageProductDependency section */ }; rootObject = EA1269A829EDF98800D79E66 /* Project object */; diff --git a/IntegrationTesting/ClientApp/Podfile b/IntegrationTesting/ClientApp/Podfile index 5421ab10939..9a2a124703f 100644 --- a/IntegrationTesting/ClientApp/Podfile +++ b/IntegrationTesting/ClientApp/Podfile @@ -18,6 +18,8 @@ target 'ClientApp-CocoaPods' do pod 'FirebaseRemoteConfig', :path => '../../' pod 'FirebaseRemoteConfigInterop', :path => '../../' pod 'FirebaseAppDistribution', :path => '../../' + pod 'FirebaseAuthInterop', :path => '../../' + pod 'FirebaseAuth', :path => '../../' pod 'FirebaseCrashlytics', :path => '../../' pod 'FirebaseDatabase', :path => '../../' pod 'FirebaseDynamicLinks', :path => '../../' @@ -27,19 +29,8 @@ target 'ClientApp-CocoaPods' do pod 'FirebaseInAppMessaging', :path => '../../' pod 'FirebaseMessaging', :path => '../../' pod 'FirebaseSessions', :path => '../../' + pod 'FirebaseStorage', :path => '../../' pod 'FirebasePerformance', :path => '../../' pod 'FirebaseMLModelDownloader', :path => '../../' pod 'Firebase', :path => '../../' end - -target 'ClientApp-CocoaPods-iOS13' do - platform :ios, '13.0' - - use_frameworks! - - pod 'FirebaseAnalytics' # Binary pods don't work with `:path`. - pod 'FirebaseAuth', :path => '../../' # Requires iOS 13.0+ - pod 'FirebaseAuthInterop', :path => '../../' - pod 'FirebaseInAppMessaging', :path => '../../' - pod 'FirebaseStorage', :path => '../../' -end diff --git a/IntegrationTesting/ClientApp/Shared-iOS13+/objc-header-import-test.m b/IntegrationTesting/ClientApp/Shared-iOS13+/objc-header-import-test.m deleted file mode 100644 index cea08137cea..00000000000 --- a/IntegrationTesting/ClientApp/Shared-iOS13+/objc-header-import-test.m +++ /dev/null @@ -1,45 +0,0 @@ -// Copyright 2023 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. - -// This file imports all Firebase products that vend an umbrella header. -// Products implemented in Swift are therefore omitted. - -// ‼️ NOTE: Changes should also be reflected in `objcxx-header-import-test.m`. - -#import -#import -#import -#import -#import -#import "Firebase.h" -#import "FirebaseABTesting/FirebaseABTesting.h" -#import "FirebaseAnalytics/FirebaseAnalytics.h" -#import "FirebaseAuth/FirebaseAuth.h" -#import "FirebaseCore/FirebaseCore.h" -#if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV -#import -#import "FirebaseInAppMessaging/FirebaseInAppMessaging.h" -#endif -#ifdef COCOAPODS -#import "FirebaseStorage/FIRStorageTypedefs.h" - -@interface TestImports : NSObject -@end - -@implementation TestImports -- (FIRAuth *)testImports { - return [FIRAuth auth]; -} -@end -#endif diff --git a/IntegrationTesting/ClientApp/Shared-iOS13+/objc-module-import-test.m b/IntegrationTesting/ClientApp/Shared-iOS13+/objc-module-import-test.m deleted file mode 100644 index 7aea74bd865..00000000000 --- a/IntegrationTesting/ClientApp/Shared-iOS13+/objc-module-import-test.m +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright 2023 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. - -// ‼️ NOTE: Changes should also be reflected in `objcxx-module-import-test.m`. - -#if !COCOAPODS -// TODO(ncooke3): Figure out why this isn't working on CocoaPods. -@import Firebase; -#endif // !COCOAPODS -@import FirebaseABTesting; -@import FirebaseAnalytics; -@import FirebaseAuth; -@import FirebaseCore; -#if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV -@import FirebaseInAppMessaging; -#endif -@import FirebaseStorage; diff --git a/IntegrationTesting/ClientApp/Shared-iOS13+/objcxx-header-import-test.mm b/IntegrationTesting/ClientApp/Shared-iOS13+/objcxx-header-import-test.mm deleted file mode 100644 index 0f073b2e12a..00000000000 --- a/IntegrationTesting/ClientApp/Shared-iOS13+/objcxx-header-import-test.mm +++ /dev/null @@ -1,46 +0,0 @@ -// Copyright 2023 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. - -// This file imports all Firebase products that vend an umbrella header. -// Products implemented in Swift are therefore omitted. - -// ‼️ Changes should also be reflected in `objc-header-import-test.m`. - -#import -#import -#import -#import -#import -#import "Firebase.h" -#import "FirebaseABTesting/FirebaseABTesting.h" -#import "FirebaseAnalytics/FirebaseAnalytics.h" -#import "FirebaseAuth/FirebaseAuth.h" -#import "FirebaseCore/FirebaseCore.h" -#if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV -#import -#import "FirebaseInAppMessaging/FirebaseInAppMessaging.h" -#endif - -#ifdef COCOAPODS -#import "FirebaseStorage/FIRStorageTypedefs.h" - -@interface TestImportsCxx : NSObject -@end - -@implementation TestImportsCxx -- (FIRAuth *)testImports { - return [FIRAuth auth]; -} -@end -#endif diff --git a/IntegrationTesting/ClientApp/Shared-iOS13+/swift-import-test.swift b/IntegrationTesting/ClientApp/Shared-iOS13+/swift-import-test.swift deleted file mode 100644 index d738f429a9e..00000000000 --- a/IntegrationTesting/ClientApp/Shared-iOS13+/swift-import-test.swift +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright 2023 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 FirebaseAnalytics -import FirebaseAuth -#if SWIFT_PACKAGE - import FirebaseAuthCombineSwift -#endif // SWIFT_PACKAGE -#if (os(iOS) && !targetEnvironment(macCatalyst)) || os(tvOS) - import FirebaseInAppMessaging -#endif -import FirebaseStorage diff --git a/IntegrationTesting/ClientApp/Shared-iOS12+/objc-header-import-test.m b/IntegrationTesting/ClientApp/Shared/objc-header-import-test.m similarity index 89% rename from IntegrationTesting/ClientApp/Shared-iOS12+/objc-header-import-test.m rename to IntegrationTesting/ClientApp/Shared/objc-header-import-test.m index 264d9e460ae..83727384a57 100644 --- a/IntegrationTesting/ClientApp/Shared-iOS12+/objc-header-import-test.m +++ b/IntegrationTesting/ClientApp/Shared/objc-header-import-test.m @@ -21,10 +21,9 @@ #import #import #import -#import "Firebase.h" -#import "FirebaseABTesting/FirebaseABTesting.h" -#import "FirebaseAnalytics/FirebaseAnalytics.h" +#import #import "FirebaseAppCheck/FirebaseAppCheck.h" +#import "FirebaseAuth/FirebaseAuth.h" #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST #import #import "FirebaseAppDistribution/FirebaseAppDistribution.h" @@ -53,3 +52,16 @@ #endif #import #import "FirebaseRemoteConfig/FirebaseRemoteConfig.h" + +#ifdef COCOAPODS +#import "FirebaseStorage/FIRStorageTypedefs.h" + +@interface TestImports : NSObject +@end + +@implementation TestImports +- (FIRAuth *)testImports { + return [FIRAuth auth]; +} +@end +#endif diff --git a/IntegrationTesting/ClientApp/Shared-iOS12+/objc-module-import-test.m b/IntegrationTesting/ClientApp/Shared/objc-module-import-test.m similarity index 96% rename from IntegrationTesting/ClientApp/Shared-iOS12+/objc-module-import-test.m rename to IntegrationTesting/ClientApp/Shared/objc-module-import-test.m index 2d7baf881a7..e465a83c86a 100644 --- a/IntegrationTesting/ClientApp/Shared-iOS12+/objc-module-import-test.m +++ b/IntegrationTesting/ClientApp/Shared/objc-module-import-test.m @@ -24,18 +24,19 @@ #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST @import FirebaseAppDistribution; #endif +@import FirebaseAuth; @import FirebaseCore; @import FirebaseCrashlytics; -@import FirebaseDatabase; #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST @import FirebaseDynamicLinks; #endif -@import FirebaseFirestore; -@import FirebaseFunctions; -@import FirebaseInstallations; -@import FirebaseMessaging; #if (TARGET_OS_IOS && !TARGET_OS_MACCATALYST) || TARGET_OS_TV @import FirebasePerformance; @import FirebaseInAppMessaging; #endif +@import FirebaseFirestore; +@import FirebaseFunctions; +@import FirebaseInstallations; +@import FirebaseMessaging; +@import FirebaseStorage; @import FirebaseRemoteConfig; diff --git a/IntegrationTesting/ClientApp/Shared-iOS12+/objcxx-header-import-test.mm b/IntegrationTesting/ClientApp/Shared/objcxx-header-import-test.mm similarity index 89% rename from IntegrationTesting/ClientApp/Shared-iOS12+/objcxx-header-import-test.mm rename to IntegrationTesting/ClientApp/Shared/objcxx-header-import-test.mm index 67959b36da3..4bb988bbfb6 100644 --- a/IntegrationTesting/ClientApp/Shared-iOS12+/objcxx-header-import-test.mm +++ b/IntegrationTesting/ClientApp/Shared/objcxx-header-import-test.mm @@ -21,10 +21,12 @@ #import #import #import +#import #import "Firebase.h" #import "FirebaseABTesting/FirebaseABTesting.h" #import "FirebaseAnalytics/FirebaseAnalytics.h" #import "FirebaseAppCheck/FirebaseAppCheck.h" +#import "FirebaseAuth/FirebaseAuth.h" #if TARGET_OS_IOS && !TARGET_OS_MACCATALYST #import #import "FirebaseAppDistribution/FirebaseAppDistribution.h" @@ -53,3 +55,16 @@ #endif #import #import "FirebaseRemoteConfig/FirebaseRemoteConfig.h" + +#ifdef COCOAPODS +#import "FirebaseStorage/FIRStorageTypedefs.h" + +@interface TestImportsCxx : NSObject +@end + +@implementation TestImportsCxx +- (FIRAuth *)testImports { + return [FIRAuth auth]; +} +@end +#endif diff --git a/IntegrationTesting/ClientApp/Shared-iOS12+/swift-import-test.swift b/IntegrationTesting/ClientApp/Shared/swift-import-test.swift similarity index 93% rename from IntegrationTesting/ClientApp/Shared-iOS12+/swift-import-test.swift rename to IntegrationTesting/ClientApp/Shared/swift-import-test.swift index b2b1caa4b51..2965a289ab5 100644 --- a/IntegrationTesting/ClientApp/Shared-iOS12+/swift-import-test.swift +++ b/IntegrationTesting/ClientApp/Shared/swift-import-test.swift @@ -18,10 +18,14 @@ // TODO(ncooke3): Figure out why this isn't working on CocoaPods. import Firebase #endif // !COCOAPODS +#if SWIFT_PACKAGE + import FirebaseAuthCombineSwift +#endif // SWIFT_PACKAGE // NOTE(ncooke3): `FirebaseABTesting` is not listed as a library. import FirebaseABTesting import FirebaseAnalytics import FirebaseAppCheck +import FirebaseAuth #if os(iOS) && !targetEnvironment(macCatalyst) import FirebaseAppDistribution #endif @@ -47,6 +51,7 @@ import FirebaseMLModelDownloader import FirebasePerformance #endif import FirebaseRemoteConfig +import FirebaseStorage #if SWIFT_PACKAGE import FirebaseStorageCombineSwift #endif // SWIFT_PACKAGE