diff --git a/ClientApp/ClientApp-CocoaPods-iOS13/ClientApp_CocoaPods_iOS13.entitlements b/ClientApp/ClientApp-CocoaPods-iOS13/ClientApp_CocoaPods_iOS13.entitlements new file mode 100644 index 00000000000..f2ef3ae0265 --- /dev/null +++ b/ClientApp/ClientApp-CocoaPods-iOS13/ClientApp_CocoaPods_iOS13.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.files.user-selected.read-only + + + diff --git a/ClientApp/ClientApp-CocoaPods-iOS13/Preview Content/Preview Assets.xcassets/Contents.json b/ClientApp/ClientApp-CocoaPods-iOS13/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 00000000000..73c00596a7f --- /dev/null +++ b/ClientApp/ClientApp-CocoaPods-iOS13/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ClientApp/ClientApp-iOS13/ClientApp_iOS13.entitlements b/ClientApp/ClientApp-iOS13/ClientApp_iOS13.entitlements new file mode 100644 index 00000000000..f2ef3ae0265 --- /dev/null +++ b/ClientApp/ClientApp-iOS13/ClientApp_iOS13.entitlements @@ -0,0 +1,10 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.files.user-selected.read-only + + + diff --git a/ClientApp/ClientApp-iOS13/Preview Content/Preview Assets.xcassets/Contents.json b/ClientApp/ClientApp-iOS13/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 00000000000..73c00596a7f --- /dev/null +++ b/ClientApp/ClientApp-iOS13/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/ClientApp/ClientApp.xcodeproj/project.pbxproj b/ClientApp/ClientApp.xcodeproj/project.pbxproj index 8153e361649..0024c4440d4 100644 --- a/ClientApp/ClientApp.xcodeproj/project.pbxproj +++ b/ClientApp/ClientApp.xcodeproj/project.pbxproj @@ -10,8 +10,7 @@ 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 /* ClientApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B329EDF98800D79E66 /* ClientApp.swift */; }; - EA1269B629EDF98800D79E66 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B529EDF98800D79E66 /* ContentView.swift */; }; + 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 */; }; EA501B1129F09594009C4DBC /* objcxx-header-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */; }; @@ -19,10 +18,9 @@ EA5A62992A99498500F5711A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = EA1269B729EDF98A00D79E66 /* Assets.xcassets */; }; EA5A629A2A99498500F5711A /* swift-import-test.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7DF54229EF20B9005664A7 /* swift-import-test.swift */; }; EA5A629B2A99498500F5711A /* objc-module-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DD29F08D4B00D1014F /* objc-module-import-test.m */; }; - EA5A629C2A99498500F5711A /* ClientApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B329EDF98800D79E66 /* ClientApp.swift */; }; + EA5A629C2A99498500F5711A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B329EDF98800D79E66 /* AppDelegate.swift */; }; EA5A629E2A99498500F5711A /* objcxx-header-import-test.mm in Sources */ = {isa = PBXBuildFile; fileRef = EA501B1029F09593009C4DBC /* objcxx-header-import-test.mm */; }; EA5A629F2A99498500F5711A /* objc-header-import-test.m in Sources */ = {isa = PBXBuildFile; fileRef = EA05C7DF29F0911400D1014F /* objc-header-import-test.m */; }; - EA5A62A02A99498500F5711A /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA1269B529EDF98800D79E66 /* ContentView.swift */; }; EA7DF54329EF20B9005664A7 /* swift-import-test.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA7DF54229EF20B9005664A7 /* swift-import-test.swift */; }; EA7DF58329EF3326005664A7 /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF58229EF3326005664A7 /* FirebaseAnalytics */; }; EA7DF58729EF3326005664A7 /* FirebaseAnalyticsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF58629EF3326005664A7 /* FirebaseAnalyticsSwift */; }; @@ -50,14 +48,25 @@ EA7DF5B329EF3328005664A7 /* FirebaseRemoteConfigSwift in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF5B229EF3328005664A7 /* FirebaseRemoteConfigSwift */; }; EA7DF5B529EF3328005664A7 /* FirebaseStorage in Frameworks */ = {isa = PBXBuildFile; productRef = EA7DF5B429EF3328005664A7 /* FirebaseStorage */; }; 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 */; }; + EAA0A9C32AD84E5600C28FCD /* FirebaseInAppMessagingSwift-Beta in Frameworks */ = {isa = PBXBuildFile; productRef = EAA0A9C22AD84E5600C28FCD /* FirebaseInAppMessagingSwift-Beta */; }; + EAA0A9C52AD84E5D00C28FCD /* FirebaseAnalytics in Frameworks */ = {isa = PBXBuildFile; productRef = EAA0A9C42AD84E5D00C28FCD /* FirebaseAnalytics */; }; + EAA0A9C72AD84E5D00C28FCD /* FirebaseAnalyticsSwift in Frameworks */ = {isa = PBXBuildFile; productRef = EAA0A9C62AD84E5D00C28FCD /* FirebaseAnalyticsSwift */; }; + 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 */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ 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; }; - EA1269B329EDF98800D79E66 /* ClientApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ClientApp.swift; sourceTree = ""; }; - EA1269B529EDF98800D79E66 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + EA1269B329EDF98800D79E66 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; EA1269B729EDF98A00D79E66 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; EA1269B929EDF98A00D79E66 /* ClientApp.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = ClientApp.entitlements; sourceTree = ""; }; EA1269BB29EDF98A00D79E66 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; @@ -67,6 +76,13 @@ 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 */ @@ -111,18 +127,47 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + EAA0A98C2AD8494F00C28FCD /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; + EAA0A9AE2AD84E0800C28FCD /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + EAA0A9C72AD84E5D00C28FCD /* FirebaseAnalyticsSwift in Frameworks */, + EAA0A9C32AD84E5600C28FCD /* FirebaseInAppMessagingSwift-Beta in Frameworks */, + EAA0A9C12AD84E5600C28FCD /* FirebaseInAppMessaging-Beta in Frameworks */, + EAA0A9C52AD84E5D00C28FCD /* FirebaseAnalytics in Frameworks */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 413203AEE08A47DF84F65AED /* Pods */ = { + isa = PBXGroup; + children = ( + ); + path = Pods; + sourceTree = ""; + }; EA1269A729EDF98800D79E66 = { isa = PBXGroup; children = ( + EAA0A9A72AD84BF100C28FCD /* Shared-iOS11+ */, + EAA0A9A62AD84BCC00C28FCD /* Shared-iOS13+ */, EA5A62982A99151F00F5711A /* Shared */, EA1269C229EDF9DD00D79E66 /* Packages */, EA1269B229EDF98800D79E66 /* ClientApp */, EA5A628A2A9914F000F5711A /* ClientApp-CocoaPods */, + EAA0A9902AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13 */, + EAA0A9B22AD84E0800C28FCD /* ClientApp-iOS13 */, EA1269B129EDF98800D79E66 /* Products */, - EA1269C429EDFC1000D79E66 /* Frameworks */, + 413203AEE08A47DF84F65AED /* Pods */, ); sourceTree = ""; }; @@ -131,6 +176,8 @@ children = ( EA1269B029EDF98800D79E66 /* ClientApp.app */, EA5A62892A9914F000F5711A /* ClientApp-CocoaPods.app */, + EAA0A98F2AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13.app */, + EAA0A9B12AD84E0800C28FCD /* ClientApp-iOS13.app */, ); name = Products; sourceTree = ""; @@ -160,13 +207,6 @@ name = Packages; sourceTree = ""; }; - EA1269C429EDFC1000D79E66 /* Frameworks */ = { - isa = PBXGroup; - children = ( - ); - name = Frameworks; - sourceTree = ""; - }; EA5A628A2A9914F000F5711A /* ClientApp-CocoaPods */ = { isa = PBXGroup; children = ( @@ -187,15 +227,63 @@ EA5A62982A99151F00F5711A /* Shared */ = { isa = PBXGroup; children = ( - EA1269B329EDF98800D79E66 /* ClientApp.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 = ( + EAA0A9A82AD84C2A00C28FCD /* swift-import-test.swift */, + ); + path = "Shared-iOS13+"; + sourceTree = ""; + }; + EAA0A9A72AD84BF100C28FCD /* Shared-iOS11+ */ = { + 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 */, - EA1269B529EDF98800D79E66 /* ContentView.swift */, - EA1269B729EDF98A00D79E66 /* Assets.xcassets */, ); - path = Shared; + path = "Shared-iOS11+"; + 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 */ @@ -264,6 +352,46 @@ 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 */, + EAA0A9C22AD84E5600C28FCD /* FirebaseInAppMessagingSwift-Beta */, + EAA0A9C42AD84E5D00C28FCD /* FirebaseAnalytics */, + EAA0A9C62AD84E5D00C28FCD /* FirebaseAnalyticsSwift */, + ); + productName = "ClientApp-iOS13"; + productReference = EAA0A9B12AD84E0800C28FCD /* ClientApp-iOS13.app */; + productType = "com.apple.product-type.application"; + }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -281,6 +409,13 @@ EA5A62882A9914F000F5711A = { CreatedOnToolsVersion = 14.1; }; + EAA0A98E2AD8494F00C28FCD = { + CreatedOnToolsVersion = 14.1; + LastSwiftMigration = 1410; + }; + EAA0A9B02AD84E0800C28FCD = { + CreatedOnToolsVersion = 14.1; + }; }; }; buildConfigurationList = EA1269AB29EDF98800D79E66 /* Build configuration list for PBXProject "ClientApp" */; @@ -292,14 +427,14 @@ Base, ); mainGroup = EA1269A729EDF98800D79E66; - packageReferences = ( - ); productRefGroup = EA1269B129EDF98800D79E66 /* Products */; projectDirPath = ""; projectRoot = ""; targets = ( EA1269AF29EDF98800D79E66 /* ClientApp */, EA5A62882A9914F000F5711A /* ClientApp-CocoaPods */, + EAA0A98E2AD8494F00C28FCD /* ClientApp-CocoaPods-iOS13 */, + EAA0A9B02AD84E0800C28FCD /* ClientApp-iOS13 */, ); }; /* End PBXProject section */ @@ -323,6 +458,24 @@ ); 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 */ @@ -330,11 +483,10 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - EA1269B629EDF98800D79E66 /* ContentView.swift in Sources */, EA05C7DE29F08D4B00D1014F /* objc-module-import-test.m in Sources */, EA7DF54329EF20B9005664A7 /* swift-import-test.swift in Sources */, EA05C7E029F0911400D1014F /* objc-header-import-test.m in Sources */, - EA1269B429EDF98800D79E66 /* ClientApp.swift in Sources */, + EA1269B429EDF98800D79E66 /* AppDelegate.swift in Sources */, EA501B1129F09594009C4DBC /* objcxx-header-import-test.mm in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -345,13 +497,30 @@ files = ( EA5A629B2A99498500F5711A /* objc-module-import-test.m in Sources */, EA5A629A2A99498500F5711A /* swift-import-test.swift in Sources */, - EA5A62A02A99498500F5711A /* ContentView.swift in Sources */, EA5A629E2A99498500F5711A /* objcxx-header-import-test.mm in Sources */, - EA5A629C2A99498500F5711A /* ClientApp.swift in Sources */, + EA5A629C2A99498500F5711A /* AppDelegate.swift in Sources */, EA5A629F2A99498500F5711A /* objc-header-import-test.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; + EAA0A98B2AD8494F00C28FCD /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + EAA0A9A92AD84C2A00C28FCD /* swift-import-test.swift in Sources */, + EAA0A9A52AD849E600C28FCD /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; + EAA0A9AD2AD84E0800C28FCD /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + EAA0A9C82AD84E6A00C28FCD /* swift-import-test.swift in Sources */, + EAA0A9CA2AD84E7000C28FCD /* AppDelegate.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; /* End PBXSourcesBuildPhase section */ /* Begin XCBuildConfiguration section */ @@ -489,14 +658,12 @@ "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.2; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 12.6; + MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 1.0; - OTHER_CPLUSPLUSFLAGS = ( - "$(OTHER_CFLAGS)", - ); + OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.ClientApp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; @@ -507,6 +674,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Debug; }; @@ -533,14 +701,12 @@ "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.2; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 12.6; + MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 1.0; - OTHER_CPLUSPLUSFLAGS = ( - "$(OTHER_CFLAGS)", - ); + OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.ClientApp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; @@ -550,6 +716,7 @@ SWIFT_EMIT_LOC_STRINGS = YES; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2,3"; + TVOS_DEPLOYMENT_TARGET = 12.0; }; name = Release; }; @@ -574,10 +741,10 @@ "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.1; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 13.0; + MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.ClientApp-CocoaPods"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -610,10 +777,10 @@ "INFOPLIST_KEY_UIStatusBarStyle[sdk=iphonesimulator*]" = UIStatusBarStyleDefault; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = "UIInterfaceOrientationPortrait UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight"; - IPHONEOS_DEPLOYMENT_TARGET = 16.1; + IPHONEOS_DEPLOYMENT_TARGET = 11.0; LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks"; "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; - MACOSX_DEPLOYMENT_TARGET = 13.0; + MACOSX_DEPLOYMENT_TARGET = 10.13; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = "com.google.firebase.ClientApp-CocoaPods"; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -625,6 +792,167 @@ }; 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; + 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; + }; + name = Debug; + }; + EAA0A9BF2AD84E0900C28FCD /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; + 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; + }; + name = Release; + }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ @@ -655,6 +983,24 @@ 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 */ @@ -766,6 +1112,22 @@ isa = XCSwiftPackageProductDependency; productName = "FirebaseStorageCombine-Community"; }; + EAA0A9C02AD84E5600C28FCD /* FirebaseInAppMessaging-Beta */ = { + isa = XCSwiftPackageProductDependency; + productName = "FirebaseInAppMessaging-Beta"; + }; + EAA0A9C22AD84E5600C28FCD /* FirebaseInAppMessagingSwift-Beta */ = { + isa = XCSwiftPackageProductDependency; + productName = "FirebaseInAppMessagingSwift-Beta"; + }; + EAA0A9C42AD84E5D00C28FCD /* FirebaseAnalytics */ = { + isa = XCSwiftPackageProductDependency; + productName = FirebaseAnalytics; + }; + EAA0A9C62AD84E5D00C28FCD /* FirebaseAnalyticsSwift */ = { + isa = XCSwiftPackageProductDependency; + productName = FirebaseAnalyticsSwift; + }; /* End XCSwiftPackageProductDependency section */ }; rootObject = EA1269A829EDF98800D79E66 /* Project object */; diff --git a/ClientApp/Podfile b/ClientApp/Podfile index c8d98b88844..3926a76b38a 100644 --- a/ClientApp/Podfile +++ b/ClientApp/Podfile @@ -2,19 +2,15 @@ source 'https://github.com/firebase/SpecsDev.git' source 'https://github.com/firebase/SpecsStaging.git' source 'https://cdn.cocoapods.org/' -# Uncomment the next line to define a global platform for your project -platform :ios, '13.0' - target 'ClientApp-CocoaPods' do - # Comment the next line if you don't want to use dynamic frameworks + platform :ios, '11.0' + use_frameworks! - # Pods for ClientApp-CocoaPods pod 'FirebaseCore', :path => '../' pod 'FirebaseInstallations', :path => '../' pod 'FirebaseAnalytics' # Binary pods don't work with `:path`. pod 'FirebaseAnalyticsOnDeviceConversion', :path => '../' - pod 'FirebaseAnalyticsSwift', :path => '../' pod 'FirebaseABTesting', :path => '../' pod 'FirebaseAppCheck', :path => '../' pod 'FirebaseRemoteConfig', :path => '../' @@ -29,11 +25,21 @@ target 'ClientApp-CocoaPods' do pod 'FirebaseFirestoreSwift', :path => '../' pod 'FirebaseFunctions', :path => '../' pod 'FirebaseInAppMessaging', :path => '../' - pod 'FirebaseInAppMessagingSwift', :path => '../' pod 'FirebaseMessaging', :path => '../' pod 'FirebasePerformance', :path => '../' pod 'FirebaseStorage', :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 'FirebaseAnalyticsSwift', :path => '../' # Requires iOS 13.0+ + pod 'FirebaseInAppMessaging', :path => '../' + pod 'FirebaseInAppMessagingSwift', :path => '../' # Requires iOS 13.0+ end diff --git a/ClientApp/Shared/objc-header-import-test.m b/ClientApp/Shared-iOS11+/objc-header-import-test.m similarity index 100% rename from ClientApp/Shared/objc-header-import-test.m rename to ClientApp/Shared-iOS11+/objc-header-import-test.m diff --git a/ClientApp/Shared/objc-module-import-test.m b/ClientApp/Shared-iOS11+/objc-module-import-test.m similarity index 100% rename from ClientApp/Shared/objc-module-import-test.m rename to ClientApp/Shared-iOS11+/objc-module-import-test.m diff --git a/ClientApp/Shared/objcxx-header-import-test.mm b/ClientApp/Shared-iOS11+/objcxx-header-import-test.mm similarity index 100% rename from ClientApp/Shared/objcxx-header-import-test.mm rename to ClientApp/Shared-iOS11+/objcxx-header-import-test.mm diff --git a/ClientApp/Shared/swift-import-test.swift b/ClientApp/Shared-iOS11+/swift-import-test.swift similarity index 96% rename from ClientApp/Shared/swift-import-test.swift rename to ClientApp/Shared-iOS11+/swift-import-test.swift index edfe2f9296f..b2e18bd8747 100644 --- a/ClientApp/Shared/swift-import-test.swift +++ b/ClientApp/Shared-iOS11+/swift-import-test.swift @@ -21,7 +21,6 @@ // NOTE(ncooke3): `FirebaseABTesting` is not listed as a library. import FirebaseABTesting import FirebaseAnalytics -import FirebaseAnalyticsSwift import FirebaseAppCheck #if os(iOS) && !targetEnvironment(macCatalyst) import FirebaseAppDistribution @@ -52,7 +51,6 @@ import FirebaseMLModelDownloader #if (os(iOS) && !targetEnvironment(macCatalyst)) || os(tvOS) import FirebasePerformance import FirebaseInAppMessaging - import FirebaseInAppMessagingSwift #endif import FirebaseRemoteConfig import FirebaseRemoteConfigSwift diff --git a/ClientApp/Shared/ClientApp.swift b/ClientApp/Shared-iOS13+/swift-import-test.swift similarity index 75% rename from ClientApp/Shared/ClientApp.swift rename to ClientApp/Shared-iOS13+/swift-import-test.swift index b882f558a48..3f55b929fa8 100644 --- a/ClientApp/Shared/ClientApp.swift +++ b/ClientApp/Shared-iOS13+/swift-import-test.swift @@ -12,13 +12,9 @@ // See the License for the specific language governing permissions and // limitations under the License. -import SwiftUI - -@main -struct ClientApp: App { - var body: some Scene { - WindowGroup { - ContentView() - } - } -} +import FirebaseAnalytics +import FirebaseAnalyticsSwift +#if (os(iOS) && !targetEnvironment(macCatalyst)) || os(tvOS) + import FirebaseInAppMessaging + import FirebaseInAppMessagingSwift +#endif diff --git a/ClientApp/Shared/ContentView.swift b/ClientApp/Shared/AppDelegate.swift similarity index 64% rename from ClientApp/Shared/ContentView.swift rename to ClientApp/Shared/AppDelegate.swift index 622eef4c115..2e5c582a7b3 100644 --- a/ClientApp/Shared/ContentView.swift +++ b/ClientApp/Shared/AppDelegate.swift @@ -12,22 +12,13 @@ // See the License for the specific language governing permissions and // limitations under the License. -import SwiftUI +import UIKit -struct ContentView: View { - var body: some View { - VStack { - Image(systemName: "globe") - .imageScale(.large) - .foregroundColor(.accentColor) - Text("Hello, world!") - } - .padding() - } -} - -struct ContentView_Previews: PreviewProvider { - static var previews: some View { - ContentView() +@UIApplicationMain +class AppDelegate: UIResponder, UIApplicationDelegate { + func application(_ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication + .LaunchOptionsKey: Any]?) -> Bool { + return true } }