diff --git a/ios-starter/swift-starter/FriendlyChatSwift.xcodeproj/project.pbxproj b/ios-starter/swift-starter/FriendlyChatSwift.xcodeproj/project.pbxproj index bdc1948c..c3a7deeb 100644 --- a/ios-starter/swift-starter/FriendlyChatSwift.xcodeproj/project.pbxproj +++ b/ios-starter/swift-starter/FriendlyChatSwift.xcodeproj/project.pbxproj @@ -17,9 +17,11 @@ 2CA807BC1B21702E009AD7F2 /* MeasurementHelper.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2CA807BB1B21702E009AD7F2 /* MeasurementHelper.swift */; }; 5F5A537E1ADE67D500F81DF0 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F5A537D1ADE67D500F81DF0 /* AppDelegate.swift */; }; 5F5A53801ADE67D500F81DF0 /* FCViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5F5A537F1ADE67D500F81DF0 /* FCViewController.swift */; }; + E00F67C24C4BE9365D871E3A /* Pods_FriendlyChatSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6B9BB2A83ADC4D0E5012AC8 /* Pods_FriendlyChatSwift.framework */; }; /* End PBXBuildFile section */ /* Begin PBXFileReference section */ + 070128E731A262E1FEF701AF /* Pods-FriendlyChatSwift.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FriendlyChatSwift.debug.xcconfig"; path = "Target Support Files/Pods-FriendlyChatSwift/Pods-FriendlyChatSwift.debug.xcconfig"; sourceTree = ""; }; 1037935F1BF4256400C88958 /* module.modulemap */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.module-map"; name = module.modulemap; path = Pods/Firebase/Headers/module.modulemap; sourceTree = ""; }; 107960721C612531003DB6CC /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 107960741C61253B003DB6CC /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -33,6 +35,8 @@ 5F5A53791ADE67D500F81DF0 /* FriendlyChatSwift.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FriendlyChatSwift.app; sourceTree = BUILT_PRODUCTS_DIR; }; 5F5A537D1ADE67D500F81DF0 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 5F5A537F1ADE67D500F81DF0 /* FCViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FCViewController.swift; sourceTree = ""; }; + C6B9BB2A83ADC4D0E5012AC8 /* Pods_FriendlyChatSwift.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FriendlyChatSwift.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + DCC77BAB2DDA2316F59B26E4 /* Pods-FriendlyChatSwift.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FriendlyChatSwift.release.xcconfig"; path = "Target Support Files/Pods-FriendlyChatSwift/Pods-FriendlyChatSwift.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -40,6 +44,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + E00F67C24C4BE9365D871E3A /* Pods_FriendlyChatSwift.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -72,6 +77,7 @@ 5F5A537A1ADE67D500F81DF0 /* FriendlyChatSwift */, 5F5A534D1ADE670C00F81DF0 /* Products */, AD1F1C80A93A096F652504F5 /* Frameworks */, + C79FA41B4C712D93EEBC815F /* Pods */, ); sourceTree = ""; }; @@ -109,10 +115,20 @@ isa = PBXGroup; children = ( 1037935F1BF4256400C88958 /* module.modulemap */, + C6B9BB2A83ADC4D0E5012AC8 /* Pods_FriendlyChatSwift.framework */, ); name = Frameworks; sourceTree = ""; }; + C79FA41B4C712D93EEBC815F /* Pods */ = { + isa = PBXGroup; + children = ( + 070128E731A262E1FEF701AF /* Pods-FriendlyChatSwift.debug.xcconfig */, + DCC77BAB2DDA2316F59B26E4 /* Pods-FriendlyChatSwift.release.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -120,9 +136,12 @@ isa = PBXNativeTarget; buildConfigurationList = 5F5A53991ADE67D500F81DF0 /* Build configuration list for PBXNativeTarget "FriendlyChatSwift" */; buildPhases = ( + 8AF21DAB50A934BD5BE8BAE4 /* [CP] Check Pods Manifest.lock */, 5F5A53751ADE67D500F81DF0 /* Sources */, 5F5A53761ADE67D500F81DF0 /* Frameworks */, 5F5A53771ADE67D500F81DF0 /* Resources */, + 21B319A568E7D26BD42DCF81 /* [CP] Embed Pods Frameworks */, + 77406E771A965874F08F8C90 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -187,6 +206,119 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 21B319A568E7D26BD42DCF81 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FriendlyChatSwift/Pods-FriendlyChatSwift-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/AppAuth/AppAuth.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseABTesting/FirebaseABTesting.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseAppCheckInterop/FirebaseAppCheckInterop.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseAuth/FirebaseAuth.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseAuthInterop/FirebaseAuthInterop.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCore/FirebaseCore.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreExtension/FirebaseCoreExtension.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCoreInternal/FirebaseCoreInternal.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseCrashlytics/FirebaseCrashlytics.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseDatabase/FirebaseDatabase.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseInstallations/FirebaseInstallations.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfig/FirebaseRemoteConfig.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseRemoteConfigInterop/FirebaseRemoteConfigInterop.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseSessions/FirebaseSessions.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseSharedSwift/FirebaseSharedSwift.framework", + "${BUILT_PRODUCTS_DIR}/FirebaseStorage/FirebaseStorage.framework", + "${BUILT_PRODUCTS_DIR}/GTMAppAuth/GTMAppAuth.framework", + "${BUILT_PRODUCTS_DIR}/GTMSessionFetcher/GTMSessionFetcher.framework", + "${BUILT_PRODUCTS_DIR}/GoogleDataTransport/GoogleDataTransport.framework", + "${BUILT_PRODUCTS_DIR}/GoogleSignIn/GoogleSignIn.framework", + "${BUILT_PRODUCTS_DIR}/GoogleUtilities/GoogleUtilities.framework", + "${BUILT_PRODUCTS_DIR}/PromisesObjC/FBLPromises.framework", + "${BUILT_PRODUCTS_DIR}/PromisesSwift/Promises.framework", + "${BUILT_PRODUCTS_DIR}/RecaptchaInterop/RecaptchaInterop.framework", + "${BUILT_PRODUCTS_DIR}/leveldb-library/leveldb.framework", + "${BUILT_PRODUCTS_DIR}/nanopb/nanopb.framework", + ); + name = "[CP] Embed Pods Frameworks"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/AppAuth.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseABTesting.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAppCheckInterop.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAuth.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseAuthInterop.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCore.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreExtension.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCoreInternal.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseCrashlytics.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseDatabase.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseInstallations.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfig.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseRemoteConfigInterop.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSessions.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseSharedSwift.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FirebaseStorage.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMAppAuth.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GTMSessionFetcher.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleDataTransport.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleSignIn.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/GoogleUtilities.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FBLPromises.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Promises.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RecaptchaInterop.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/leveldb.framework", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/nanopb.framework", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FriendlyChatSwift/Pods-FriendlyChatSwift-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 77406E771A965874F08F8C90 /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FriendlyChatSwift/Pods-FriendlyChatSwift-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/Google-Mobile-Ads-SDK/GoogleMobileAdsResources.bundle", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUserMessagingPlatform/UserMessagingPlatformResources.bundle", + ); + name = "[CP] Copy Pods Resources"; + outputPaths = ( + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleMobileAdsResources.bundle", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/UserMessagingPlatformResources.bundle", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FriendlyChatSwift/Pods-FriendlyChatSwift-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 8AF21DAB50A934BD5BE8BAE4 /* [CP] Check Pods Manifest.lock */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", + ); + name = "[CP] Check Pods Manifest.lock"; + outputFileListPaths = ( + ); + outputPaths = ( + "$(DERIVED_FILE_DIR)/Pods-FriendlyChatSwift-checkManifestLockResult.txt", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; + showEnvVarsInLog = 0; + }; +/* End PBXShellScriptBuildPhase section */ + /* Begin PBXSourcesBuildPhase section */ 5F5A53751ADE67D500F81DF0 /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -261,7 +393,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; PROVISIONING_PROFILE = "65c2088b-2425-4961-b6d5-0256d4790678"; @@ -311,7 +443,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; PROVISIONING_PROFILE = "65c2088b-2425-4961-b6d5-0256d4790678"; SDKROOT = iphoneos; @@ -323,6 +455,7 @@ }; 5F5A53951ADE67D500F81DF0 /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 070128E731A262E1FEF701AF /* Pods-FriendlyChatSwift.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; @@ -343,6 +476,7 @@ }; 5F5A53961ADE67D500F81DF0 /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = DCC77BAB2DDA2316F59B26E4 /* Pods-FriendlyChatSwift.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; ASSETCATALOG_COMPILER_LAUNCHIMAGE_NAME = LaunchImage; diff --git a/ios-starter/swift-starter/FriendlyChatSwift/AppDelegate.swift b/ios-starter/swift-starter/FriendlyChatSwift/AppDelegate.swift index 58aff431..c0d49d97 100644 --- a/ios-starter/swift-starter/FriendlyChatSwift/AppDelegate.swift +++ b/ios-starter/swift-starter/FriendlyChatSwift/AppDelegate.swift @@ -20,7 +20,7 @@ import Firebase import GoogleSignIn @UIApplicationMain -class AppDelegate: UIResponder, UIApplicationDelegate, GIDSignInDelegate { +class AppDelegate: UIResponder, UIApplicationDelegate { var window: UIWindow? @@ -29,14 +29,14 @@ class AppDelegate: UIResponder, UIApplicationDelegate, GIDSignInDelegate { open url: URL, options: [UIApplication.OpenURLOptionsKey : Any]) -> Bool { - return GIDSignIn.sharedInstance().handle(url) + return GIDSignIn.sharedInstance.handle(url) } func application(_ application: UIApplication, open url: URL, sourceApplication: String?, annotation: Any) -> Bool { - return GIDSignIn.sharedInstance().handle(url) + return GIDSignIn.sharedInstance.handle(url) } func sign(_ signIn: GIDSignIn!, didSignInFor user: GIDGoogleUser!, withError error: Error?) { @@ -48,7 +48,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, GIDSignInDelegate { func application(_ application: UIApplication, didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]?) -> Bool { - GIDSignIn.sharedInstance().delegate = self +// GIDSignIn.sharedInstance().delegate = self return true } } diff --git a/ios-starter/swift-starter/FriendlyChatSwift/Info.plist b/ios-starter/swift-starter/FriendlyChatSwift/Info.plist index dcfe01d4..4a8a6ba9 100644 --- a/ios-starter/swift-starter/FriendlyChatSwift/Info.plist +++ b/ios-starter/swift-starter/FriendlyChatSwift/Info.plist @@ -59,5 +59,206 @@ UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight + GADApplicationIdentifier + ca-app-pub-PUT-YOUR-APP-ID-HERE + SKAdNetworkItems + + + SKAdNetworkIdentifier + cstr6suwn9.skadnetwork + + + SKAdNetworkIdentifier + 4fzdc2evr5.skadnetwork + + + SKAdNetworkIdentifier + 4pfyvq9l8r.skadnetwork + + + SKAdNetworkIdentifier + 2fnua5tdw4.skadnetwork + + + SKAdNetworkIdentifier + ydx93a7ass.skadnetwork + + + SKAdNetworkIdentifier + 5a6flpkh64.skadnetwork + + + SKAdNetworkIdentifier + p78axxw29g.skadnetwork + + + SKAdNetworkIdentifier + v72qych5uu.skadnetwork + + + SKAdNetworkIdentifier + ludvb6z3bs.skadnetwork + + + SKAdNetworkIdentifier + cp8zw746q7.skadnetwork + + + SKAdNetworkIdentifier + 3sh42y64q3.skadnetwork + + + SKAdNetworkIdentifier + c6k4g5qg8m.skadnetwork + + + SKAdNetworkIdentifier + s39g8k73mm.skadnetwork + + + SKAdNetworkIdentifier + 3qy4746246.skadnetwork + + + SKAdNetworkIdentifier + f38h382jlk.skadnetwork + + + SKAdNetworkIdentifier + hs6bdukanm.skadnetwork + + + SKAdNetworkIdentifier + v4nxqhlyqp.skadnetwork + + + SKAdNetworkIdentifier + wzmmz9fp6w.skadnetwork + + + SKAdNetworkIdentifier + yclnxrl5pm.skadnetwork + + + SKAdNetworkIdentifier + t38b2kh725.skadnetwork + + + SKAdNetworkIdentifier + 7ug5zh24hu.skadnetwork + + + SKAdNetworkIdentifier + gta9lk7p23.skadnetwork + + + SKAdNetworkIdentifier + vutu7akeur.skadnetwork + + + SKAdNetworkIdentifier + y5ghdn5j9k.skadnetwork + + + SKAdNetworkIdentifier + n6fk4nfna4.skadnetwork + + + SKAdNetworkIdentifier + v9wttpbfk9.skadnetwork + + + SKAdNetworkIdentifier + n38lu8286q.skadnetwork + + + SKAdNetworkIdentifier + 47vhws6wlr.skadnetwork + + + SKAdNetworkIdentifier + kbd757ywx3.skadnetwork + + + SKAdNetworkIdentifier + 9t245vhmpl.skadnetwork + + + SKAdNetworkIdentifier + eh6m2bh4zr.skadnetwork + + + SKAdNetworkIdentifier + a2p9lx4jpn.skadnetwork + + + SKAdNetworkIdentifier + 22mmun2rn5.skadnetwork + + + SKAdNetworkIdentifier + 4468km3ulz.skadnetwork + + + SKAdNetworkIdentifier + 2u9pt9hc89.skadnetwork + + + SKAdNetworkIdentifier + 8s468mfl3y.skadnetwork + + + SKAdNetworkIdentifier + klf5c3l5u5.skadnetwork + + + SKAdNetworkIdentifier + ppxm28t8ap.skadnetwork + + + SKAdNetworkIdentifier + ecpz2srf59.skadnetwork + + + SKAdNetworkIdentifier + uw77j35x4d.skadnetwork + + + SKAdNetworkIdentifier + pwa73g5rt2.skadnetwork + + + SKAdNetworkIdentifier + mlmmfzh3r3.skadnetwork + + + SKAdNetworkIdentifier + 578prtvx9j.skadnetwork + + + SKAdNetworkIdentifier + 4dzt52r2t5.skadnetwork + + + SKAdNetworkIdentifier + e5fvkxwrpn.skadnetwork + + + SKAdNetworkIdentifier + 8c4e2ghe7u.skadnetwork + + + SKAdNetworkIdentifier + zq492l623r.skadnetwork + + + SKAdNetworkIdentifier + 3rd42ekr43.skadnetwork + + + SKAdNetworkIdentifier + 3qcr597p9d.skadnetwork + + diff --git a/ios-starter/swift-starter/FriendlyChatSwift/SignInViewController.swift b/ios-starter/swift-starter/FriendlyChatSwift/SignInViewController.swift index 991f71ed..f8d6eb77 100644 --- a/ios-starter/swift-starter/FriendlyChatSwift/SignInViewController.swift +++ b/ios-starter/swift-starter/FriendlyChatSwift/SignInViewController.swift @@ -26,7 +26,7 @@ class SignInViewController: UIViewController { override func viewDidLoad() { super.viewDidLoad() - GIDSignIn.sharedInstance()?.presentingViewController = self +// GIDSignIn.sharedInstance()?.presentingViewController = self } deinit { diff --git a/ios-starter/swift-starter/Podfile b/ios-starter/swift-starter/Podfile index 36978fc3..09126e53 100644 --- a/ios-starter/swift-starter/Podfile +++ b/ios-starter/swift-starter/Podfile @@ -1,9 +1,9 @@ # FriendlyChat Codelab use_frameworks! -platform :ios, '9.0' +platform :ios, '12.0' -pod 'Firebase/AdMob' +pod 'Google-Mobile-Ads-SDK' pod 'Firebase/Analytics' pod 'Firebase/Auth' pod 'Firebase/Database' diff --git a/ios-starter/swift-starter/Podfile.lock b/ios-starter/swift-starter/Podfile.lock index 8a9ff825..edb7e4a0 100644 --- a/ios-starter/swift-starter/Podfile.lock +++ b/ios-starter/swift-starter/Podfile.lock @@ -5,102 +5,164 @@ PODS: - AppAuth/Core (1.7.2) - AppAuth/ExternalUserAgent (1.7.2): - AppAuth/Core - - Firebase/AdMob (3.6.0): - - Firebase/Analytics - - Google-Mobile-Ads-SDK (= 7.11.0) - - Firebase/Analytics (3.6.0): - - FirebaseAnalytics (= 3.4.2) - - Firebase/Auth (3.6.0): - - Firebase/Analytics - - FirebaseAuth (= 3.0.5) - - Firebase/CoreOnly (9.6.0): - - FirebaseCore (= 9.6.0) - - Firebase/Crashlytics (9.6.0): + - Firebase/Analytics (10.23.1): + - Firebase/Core + - Firebase/Auth (10.23.1): - Firebase/CoreOnly - - FirebaseCrashlytics (~> 9.6.0) - - Firebase/Database (3.6.0): - - Firebase/Analytics - - FirebaseDatabase (= 3.0.3) - - Firebase/RemoteConfig (3.6.0): - - Firebase/Analytics - - FirebaseRemoteConfig (= 1.3.0) - - Firebase/Storage (3.6.0): - - Firebase/Analytics - - FirebaseStorage (= 1.0.3) - - FirebaseAnalytics (3.4.2): - - FirebaseInstanceID (~> 1.0) - - GoogleInterchangeUtilities (~> 1.2) - - GoogleSymbolUtilities (~> 1.1) - - GoogleUtilities (~> 1.2) - - FirebaseAuth (3.0.5): - - FirebaseAnalytics (~> 3.3) - - GoogleNetworkingUtilities (~> 1.2) - - GoogleUtilities (~> 1.2) - - FirebaseCore (9.6.0): - - FirebaseCoreDiagnostics (~> 9.0) - - FirebaseCoreInternal (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - FirebaseCoreDiagnostics (9.6.0): - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/Logger (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) - - FirebaseCoreInternal (9.6.0): - - "GoogleUtilities/NSData+zlib (~> 7.7)" - - FirebaseCrashlytics (9.6.0): - - FirebaseCore (~> 9.0) - - FirebaseInstallations (~> 9.0) - - GoogleDataTransport (< 10.0.0, >= 9.1.4) - - GoogleUtilities/Environment (~> 7.7) - - nanopb (< 2.30910.0, >= 2.30908.0) + - FirebaseAuth (~> 10.23.0) + - Firebase/Core (10.23.1): + - Firebase/CoreOnly + - FirebaseAnalytics (~> 10.23.1) + - Firebase/CoreOnly (10.23.1): + - FirebaseCore (= 10.23.1) + - Firebase/Crashlytics (10.23.1): + - Firebase/CoreOnly + - FirebaseCrashlytics (~> 10.23.0) + - Firebase/Database (10.23.1): + - Firebase/CoreOnly + - FirebaseDatabase (~> 10.23.0) + - Firebase/RemoteConfig (10.23.1): + - Firebase/CoreOnly + - FirebaseRemoteConfig (~> 10.23.0) + - Firebase/Storage (10.23.1): + - Firebase/CoreOnly + - FirebaseStorage (~> 10.23.0) + - FirebaseABTesting (10.23.0): + - FirebaseCore (~> 10.0) + - FirebaseAnalytics (10.23.1): + - FirebaseAnalytics/AdIdSupport (= 10.23.1) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30911.0, >= 2.30908.0) + - FirebaseAnalytics/AdIdSupport (10.23.1): + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleAppMeasurement (= 10.23.1) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30911.0, >= 2.30908.0) + - FirebaseAppCheckInterop (10.23.0) + - FirebaseAuth (10.23.0): + - FirebaseAppCheckInterop (~> 10.17) + - FirebaseCore (~> 10.0) + - GoogleUtilities/AppDelegateSwizzler (~> 7.8) + - GoogleUtilities/Environment (~> 7.8) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - RecaptchaInterop (~> 100.0) + - FirebaseAuthInterop (10.23.0) + - FirebaseCore (10.23.1): + - FirebaseCoreInternal (~> 10.0) + - GoogleUtilities/Environment (~> 7.12) + - GoogleUtilities/Logger (~> 7.12) + - FirebaseCoreExtension (10.23.0): + - FirebaseCore (~> 10.0) + - FirebaseCoreInternal (10.23.0): + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseCrashlytics (10.23.0): + - FirebaseCore (~> 10.5) + - FirebaseInstallations (~> 10.0) + - FirebaseRemoteConfigInterop (~> 10.23) + - FirebaseSessions (~> 10.5) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.8) + - nanopb (< 2.30911.0, >= 2.30908.0) - PromisesObjC (~> 2.1) - - FirebaseDatabase (3.0.3): - - FirebaseAnalytics (~> 3.3) - - FirebaseInstallations (9.6.0): - - FirebaseCore (~> 9.0) - - GoogleUtilities/Environment (~> 7.7) - - GoogleUtilities/UserDefaults (~> 7.7) + - FirebaseDatabase (10.23.0): + - FirebaseAppCheckInterop (~> 10.17) + - FirebaseCore (~> 10.0) + - FirebaseSharedSwift (~> 10.0) + - leveldb-library (~> 1.22) + - FirebaseInstallations (10.23.0): + - FirebaseCore (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - GoogleUtilities/UserDefaults (~> 7.8) - PromisesObjC (~> 2.1) - - FirebaseInstanceID (1.0.9) - - FirebaseRemoteConfig (1.3.0): - - FirebaseAnalytics (~> 3.3) - - FirebaseInstanceID (~> 1.0) - - GoogleInterchangeUtilities (~> 1.2) - - GoogleIPhoneUtilities (~> 1.2) - - GoogleSymbolUtilities (~> 1.1) - - GoogleUtilities (~> 1.2) - - FirebaseStorage (1.0.3): - - FirebaseAnalytics (~> 3.3) - - GoogleNetworkingUtilities (~> 1.2) - - Google-Mobile-Ads-SDK (7.11.0) + - FirebaseRemoteConfig (10.23.0): + - FirebaseABTesting (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseInstallations (~> 10.0) + - FirebaseRemoteConfigInterop (~> 10.23) + - FirebaseSharedSwift (~> 10.0) + - GoogleUtilities/Environment (~> 7.8) + - "GoogleUtilities/NSData+zlib (~> 7.8)" + - FirebaseRemoteConfigInterop (10.23.0) + - FirebaseSessions (10.23.0): + - FirebaseCore (~> 10.5) + - FirebaseCoreExtension (~> 10.0) + - FirebaseInstallations (~> 10.0) + - GoogleDataTransport (~> 9.2) + - GoogleUtilities/Environment (~> 7.10) + - nanopb (< 2.30911.0, >= 2.30908.0) + - PromisesSwift (~> 2.1) + - FirebaseSharedSwift (10.23.0) + - FirebaseStorage (10.23.0): + - FirebaseAppCheckInterop (~> 10.0) + - FirebaseAuthInterop (~> 10.0) + - FirebaseCore (~> 10.0) + - FirebaseCoreExtension (~> 10.0) + - GTMSessionFetcher/Core (< 4.0, >= 2.1) + - Google-Mobile-Ads-SDK (11.2.0): + - GoogleUserMessagingPlatform (>= 1.1) + - GoogleAppMeasurement (10.23.1): + - GoogleAppMeasurement/AdIdSupport (= 10.23.1) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30911.0, >= 2.30908.0) + - GoogleAppMeasurement/AdIdSupport (10.23.1): + - GoogleAppMeasurement/WithoutAdIdSupport (= 10.23.1) + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30911.0, >= 2.30908.0) + - GoogleAppMeasurement/WithoutAdIdSupport (10.23.1): + - GoogleUtilities/AppDelegateSwizzler (~> 7.11) + - GoogleUtilities/MethodSwizzler (~> 7.11) + - GoogleUtilities/Network (~> 7.11) + - "GoogleUtilities/NSData+zlib (~> 7.11)" + - nanopb (< 2.30911.0, >= 2.30908.0) - GoogleDataTransport (9.4.1): - GoogleUtilities/Environment (~> 7.7) - nanopb (< 2.30911.0, >= 2.30908.0) - PromisesObjC (< 3.0, >= 1.2) - - GoogleInterchangeUtilities (1.2.2): - - GoogleSymbolUtilities (~> 1.1) - - GoogleIPhoneUtilities (1.2.1): - - GoogleSymbolUtilities (~> 1.0) - - GoogleUtilities (~> 1.0) - - GoogleNetworkingUtilities (1.2.2): - - GoogleSymbolUtilities (~> 1.1) - GoogleSignIn (6.2.4): - AppAuth (~> 1.5) - GTMAppAuth (~> 1.3) - GTMSessionFetcher/Core (< 3.0, >= 1.1) - - GoogleSymbolUtilities (1.1.2) - - GoogleUtilities (1.3.2): - - GoogleSymbolUtilities (~> 1.1) + - GoogleUserMessagingPlatform (2.3.0) + - GoogleUtilities/AppDelegateSwizzler (7.13.0): + - GoogleUtilities/Environment + - GoogleUtilities/Logger + - GoogleUtilities/Network + - GoogleUtilities/Privacy - GoogleUtilities/Environment (7.13.0): - GoogleUtilities/Privacy - PromisesObjC (< 3.0, >= 1.2) - GoogleUtilities/Logger (7.13.0): - GoogleUtilities/Environment - GoogleUtilities/Privacy + - GoogleUtilities/MethodSwizzler (7.13.0): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy + - GoogleUtilities/Network (7.13.0): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Privacy + - GoogleUtilities/Reachability - "GoogleUtilities/NSData+zlib (7.13.0)": - GoogleUtilities/Privacy - GoogleUtilities/Privacy (7.13.0) + - GoogleUtilities/Reachability (7.13.0): + - GoogleUtilities/Logger + - GoogleUtilities/Privacy - GoogleUtilities/UserDefaults (7.13.0): - GoogleUtilities/Logger - GoogleUtilities/Privacy @@ -108,78 +170,94 @@ PODS: - AppAuth/Core (~> 1.6) - GTMSessionFetcher/Core (< 3.0, >= 1.5) - GTMSessionFetcher/Core (2.3.0) - - nanopb (2.30909.1): - - nanopb/decode (= 2.30909.1) - - nanopb/encode (= 2.30909.1) - - nanopb/decode (2.30909.1) - - nanopb/encode (2.30909.1) + - leveldb-library (1.22.4) + - nanopb (2.30910.0): + - nanopb/decode (= 2.30910.0) + - nanopb/encode (= 2.30910.0) + - nanopb/decode (2.30910.0) + - nanopb/encode (2.30910.0) - PromisesObjC (2.4.0) + - PromisesSwift (2.4.0): + - PromisesObjC (= 2.4.0) + - RecaptchaInterop (100.0.0) DEPENDENCIES: - - Firebase/AdMob - Firebase/Analytics - Firebase/Auth - Firebase/Crashlytics - Firebase/Database - Firebase/RemoteConfig - Firebase/Storage + - Google-Mobile-Ads-SDK - GoogleSignIn SPEC REPOS: trunk: - AppAuth - Firebase + - FirebaseABTesting - FirebaseAnalytics + - FirebaseAppCheckInterop - FirebaseAuth + - FirebaseAuthInterop - FirebaseCore - - FirebaseCoreDiagnostics + - FirebaseCoreExtension - FirebaseCoreInternal - FirebaseCrashlytics - FirebaseDatabase - FirebaseInstallations - - FirebaseInstanceID - FirebaseRemoteConfig + - FirebaseRemoteConfigInterop + - FirebaseSessions + - FirebaseSharedSwift - FirebaseStorage - Google-Mobile-Ads-SDK + - GoogleAppMeasurement - GoogleDataTransport - - GoogleInterchangeUtilities - - GoogleIPhoneUtilities - - GoogleNetworkingUtilities - GoogleSignIn - - GoogleSymbolUtilities + - GoogleUserMessagingPlatform - GoogleUtilities - GTMAppAuth - GTMSessionFetcher + - leveldb-library - nanopb - PromisesObjC + - PromisesSwift + - RecaptchaInterop SPEC CHECKSUMS: AppAuth: ca2458caccec349cc1e26d8d9e8fd7d22f1d01f3 - Firebase: 34187200ef4979dbd485c7aa685ef078bf587c86 - FirebaseAnalytics: 3f5358d9104adf159cc8d99b7b501e50099a39ad - FirebaseAuth: 75a062bbf2d3c97d1e6e55bbc110e13a6853e25d - FirebaseCore: 2082fffcd855f95f883c0a1641133eb9bbe76d40 - FirebaseCoreDiagnostics: 99a495094b10a57eeb3ae8efa1665700ad0bdaa6 - FirebaseCoreInternal: bca76517fe1ed381e989f5e7d8abb0da8d85bed3 - FirebaseCrashlytics: 3210572ddb77801e5a0bd9d7bc890769f2066a0c - FirebaseDatabase: 750a4a0fe18ef114318876fd654b2d9c671e0992 - FirebaseInstallations: 0a115432c4e223c5ab20b0dbbe4cbefa793a0e8e - FirebaseInstanceID: 2d0518b1378fe9d685ef40cbdd63d2fdc1125339 - FirebaseRemoteConfig: 981f45d4278281cfefa8f48a6f5c566f2c95ac5a - FirebaseStorage: 3992817bf405f5c1a4f8349678d22724cd0ef509 - Google-Mobile-Ads-SDK: 0e864ab93ba1ff8afe92e16de0e4e883f581ed33 + Firebase: cf09623f98ae25a3ad484e23c7e0e5f464152d80 + FirebaseABTesting: aec61ed9a34d85a95e2013a3fdf051426a2419df + FirebaseAnalytics: fd35d51e6da86ef1aa2c3fe1f64ab2482cc01ba5 + FirebaseAppCheckInterop: a1955ce8c30f38f87e7d091630e871e91154d65d + FirebaseAuth: 22eb85d3853141de7062bfabc131aa7d6335cade + FirebaseAuthInterop: a458e398bb1e9b71b9b42d46e54acc666b021d0f + FirebaseCore: c43f9f0437b50a965e930cac4ad243200d12a984 + FirebaseCoreExtension: cb88851781a24e031d1b58e0bd01eb1f46b044b5 + FirebaseCoreInternal: 6a292e6f0bece1243a737e81556e56e5e19282e3 + FirebaseCrashlytics: b7aca2d52dd2440257a13741d2909ad80745ac6c + FirebaseDatabase: 50f243af7bbf3c7d50faf355b963b1502049d5c5 + FirebaseInstallations: 42d6ead4605d6eafb3b6683674e80e18eb6f2c35 + FirebaseRemoteConfig: 70ebe9542cf5242d762d1c0b4d53bfc472e0a4ce + FirebaseRemoteConfigInterop: cbc87ffa4932719a7911a08e94510f18f026f5a7 + FirebaseSessions: f06853e30f99fe42aa511014d7ee6c8c319f08a3 + FirebaseSharedSwift: c92645b392db3c41a83a0aa967de16f8bad25568 + FirebaseStorage: 96fd765b2ef632c53b214057691e257538b8c496 + Google-Mobile-Ads-SDK: 5a6d005a6cb5b5e8f4c7b69ca05cdea79c181139 + GoogleAppMeasurement: 794d1d2f71fdf77a077a3986258a5c2dac0f9d48 GoogleDataTransport: 6c09b596d841063d76d4288cc2d2f42cc36e1e2a - GoogleInterchangeUtilities: d5bc4d88d5b661ab72f9d70c58d02ca8c27ad1f7 - GoogleIPhoneUtilities: 63f25e93a3ddcb66884d182aab3a660d98f1479b - GoogleNetworkingUtilities: 3edd3a8161347494f2da60ea0deddc8a472d94cb GoogleSignIn: 5651ce3a61e56ca864160e79b484cd9ed3f49b7a - GoogleSymbolUtilities: 631ee17048aa5e9ab133470d768ea997a5ef9b96 + GoogleUserMessagingPlatform: b1ad7bb1ee3ce64749d4fec24f667b36e45c396c GoogleUtilities: d053d902a8edaa9904e1bd00c37535385b8ed152 GTMAppAuth: 0ff230db599948a9ad7470ca667337803b3fc4dd GTMSessionFetcher: 3a63d75eecd6aa32c2fc79f578064e1214dfdec2 - nanopb: d4d75c12cd1316f4a64e3c6963f879ecd4b5e0d5 + leveldb-library: 06a69cc7582d64b29424a63e085e683cc188230a + nanopb: 438bc412db1928dac798aa6fd75726007be04262 PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47 + PromisesSwift: 9d77319bbe72ebf6d872900551f7eeba9bce2851 + RecaptchaInterop: 7d1a4a01a6b2cb1610a47ef3f85f0c411434cb21 -PODFILE CHECKSUM: 7ac21aa08bcf2fc450d620d791eba9687dcd6d10 +PODFILE CHECKSUM: 22df323d29e4966173c03ff42749affd8fd43973 COCOAPODS: 1.15.2