diff --git a/.travis.yml b/.travis.yml index 9ef11ca63ae..a8f9a1cb870 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,4 +1,4 @@ -osx_image: xcode10.1 +osx_image: xcode10.2 language: objective-c xcode_workspace: FirebaseUI.xcworkspace xcode_scheme: FirebaseUI diff --git a/AnonymousAuth/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj b/AnonymousAuth/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj index 4630dc5d4fe..1a94253c468 100644 --- a/AnonymousAuth/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj +++ b/AnonymousAuth/FirebaseAnonymousAuthUI.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1EF5CA884792B6ABAF0C7EC8 /* Pods_FirebaseAnonymousAuthUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9B521F1010988D23DF3A39CD /* Pods_FirebaseAnonymousAuthUITests.framework */; }; 8D69E22721DD476D00CFA49B /* FirebaseAnonymousAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D69E21D21DD476C00CFA49B /* FirebaseAnonymousAuthUI.framework */; }; 8D69E22C21DD476D00CFA49B /* FirebaseAnonymousAuthUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E22B21DD476D00CFA49B /* FirebaseAnonymousAuthUITests.m */; }; 8D69E22E21DD476D00CFA49B /* FirebaseAnonymousAuthUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E22021DD476D00CFA49B /* FirebaseAnonymousAuthUI.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -17,7 +16,6 @@ 8D69E35421DD5C4700CFA49B /* ic_anonymous@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E34E21DD5C4700CFA49B /* ic_anonymous@3x.png */; }; 8D69E35521DD5C4700CFA49B /* ic_anonymous@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E34F21DD5C4700CFA49B /* ic_anonymous@2x.png */; }; 8D69E35621DD5C4700CFA49B /* FirebaseAnonymousAuthUI.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E35121DD5C4700CFA49B /* FirebaseAnonymousAuthUI.strings */; }; - FCB1B2C40B18B4A62D63C4E4 /* Pods_FirebaseAnonymousAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73B589F207E4236363EEE626 /* Pods_FirebaseAnonymousAuthUI.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -31,8 +29,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 02807C8B4CFAB7FD9C32C1A3 /* Pods-FirebaseAnonymousAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests.release.xcconfig"; sourceTree = ""; }; - 73B589F207E4236363EEE626 /* Pods_FirebaseAnonymousAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseAnonymousAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E21D21DD476C00CFA49B /* FirebaseAnonymousAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseAnonymousAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E22021DD476D00CFA49B /* FirebaseAnonymousAuthUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseAnonymousAuthUI.h; sourceTree = ""; }; 8D69E22121DD476D00CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -45,10 +41,6 @@ 8D69E34E21DD5C4700CFA49B /* ic_anonymous@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_anonymous@3x.png"; sourceTree = ""; }; 8D69E34F21DD5C4700CFA49B /* ic_anonymous@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_anonymous@2x.png"; sourceTree = ""; }; 8D69E35221DD5C4700CFA49B /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/FirebaseAnonymousAuthUI.strings; sourceTree = ""; }; - 9929AABD790C0DD60C537CB2 /* Pods-FirebaseAnonymousAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI.release.xcconfig"; sourceTree = ""; }; - 9B521F1010988D23DF3A39CD /* Pods_FirebaseAnonymousAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseAnonymousAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - AD655D2BC8125FCBFB69632A /* Pods-FirebaseAnonymousAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI.debug.xcconfig"; sourceTree = ""; }; - C7E917677D16B9024969C4FE /* Pods-FirebaseAnonymousAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAnonymousAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -56,7 +48,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - FCB1B2C40B18B4A62D63C4E4 /* Pods_FirebaseAnonymousAuthUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -65,7 +56,6 @@ buildActionMask = 2147483647; files = ( 8D69E22721DD476D00CFA49B /* FirebaseAnonymousAuthUI.framework in Frameworks */, - 1EF5CA884792B6ABAF0C7EC8 /* Pods_FirebaseAnonymousAuthUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -78,8 +68,7 @@ 8D69E21F21DD476C00CFA49B /* FirebaseAnonymousAuthUI */, 8D69E22A21DD476D00CFA49B /* FirebaseAnonymousAuthUITests */, 8D69E21E21DD476C00CFA49B /* Products */, - B55605365FE042830EBBD157 /* Pods */, - B3C0D2E787876EE649C89CBF /* Frameworks */, + BEF4805F13BABCBDD925C264 /* Pods */, ); sourceTree = ""; }; @@ -132,24 +121,10 @@ path = Strings; sourceTree = ""; }; - B3C0D2E787876EE649C89CBF /* Frameworks */ = { + BEF4805F13BABCBDD925C264 /* Pods */ = { isa = PBXGroup; children = ( - 73B589F207E4236363EEE626 /* Pods_FirebaseAnonymousAuthUI.framework */, - 9B521F1010988D23DF3A39CD /* Pods_FirebaseAnonymousAuthUITests.framework */, ); - name = Frameworks; - sourceTree = ""; - }; - B55605365FE042830EBBD157 /* Pods */ = { - isa = PBXGroup; - children = ( - AD655D2BC8125FCBFB69632A /* Pods-FirebaseAnonymousAuthUI.debug.xcconfig */, - 9929AABD790C0DD60C537CB2 /* Pods-FirebaseAnonymousAuthUI.release.xcconfig */, - C7E917677D16B9024969C4FE /* Pods-FirebaseAnonymousAuthUITests.debug.xcconfig */, - 02807C8B4CFAB7FD9C32C1A3 /* Pods-FirebaseAnonymousAuthUITests.release.xcconfig */, - ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -172,12 +147,10 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E23121DD476D00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseAnonymousAuthUI" */; buildPhases = ( - F0D2BEDEEF9C146EA083E17F /* [CP] Check Pods Manifest.lock */, 8D69E21821DD476C00CFA49B /* Headers */, 8D69E21921DD476C00CFA49B /* Sources */, 8D69E21A21DD476C00CFA49B /* Frameworks */, 8D69E21B21DD476C00CFA49B /* Resources */, - 65BB97B1C2E0ACB0370C903B /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -192,11 +165,9 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E23421DD476D00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseAnonymousAuthUITests" */; buildPhases = ( - 714F08D4612B91126DDD4559 /* [CP] Check Pods Manifest.lock */, 8D69E22221DD476D00CFA49B /* Sources */, 8D69E22321DD476D00CFA49B /* Frameworks */, 8D69E22421DD476D00CFA49B /* Resources */, - 870284F7293CA07BAECE0B41 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -264,97 +235,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 65BB97B1C2E0ACB0370C903B /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUI/Pods-FirebaseAnonymousAuthUI-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - 714F08D4612B91126DDD4559 /* [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-FirebaseAnonymousAuthUITests-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; - }; - 870284F7293CA07BAECE0B41 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseAnonymousAuthUITests/Pods-FirebaseAnonymousAuthUITests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - F0D2BEDEEF9C146EA083E17F /* [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-FirebaseAnonymousAuthUI-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 */ 8D69E21921DD476C00CFA49B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -514,7 +394,6 @@ }; 8D69E23221DD476D00CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = AD655D2BC8125FCBFB69632A /* Pods-FirebaseAnonymousAuthUI.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -538,7 +417,6 @@ }; 8D69E23321DD476D00CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9929AABD790C0DD60C537CB2 /* Pods-FirebaseAnonymousAuthUI.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -562,7 +440,6 @@ }; 8D69E23521DD476D00CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = C7E917677D16B9024969C4FE /* Pods-FirebaseAnonymousAuthUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseAnonymousAuthUITests/Info.plist; @@ -570,6 +447,12 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/OCMock\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -588,7 +471,6 @@ }; 8D69E23621DD476D00CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 02807C8B4CFAB7FD9C32C1A3 /* Pods-FirebaseAnonymousAuthUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseAnonymousAuthUITests/Info.plist; @@ -596,6 +478,12 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/OCMock\"", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/AnonymousAuth/Podfile b/AnonymousAuth/Podfile index 5f6308b6039..1d62eb33842 100644 --- a/AnonymousAuth/Podfile +++ b/AnonymousAuth/Podfile @@ -3,6 +3,7 @@ platform :ios, '8.0' target 'FirebaseAnonymousAuthUI' do use_frameworks! + pod 'FirebaseAuth', '~> 6.0' pod 'FirebaseUI/Auth', :path => '../' target 'FirebaseAnonymousAuthUITests' do diff --git a/AnonymousAuth/Podfile.lock b/AnonymousAuth/Podfile.lock index 844e2f5352d..055d82cb0dd 100644 --- a/AnonymousAuth/Podfile.lock +++ b/AnonymousAuth/Podfile.lock @@ -1,29 +1,43 @@ PODS: - - Firebase/Auth (5.18.0): + - Firebase/Auth (6.1.0): - Firebase/CoreOnly - - FirebaseAuth (= 5.4.0) - - Firebase/CoreOnly (5.18.0): - - FirebaseCore (= 5.3.1) - - FirebaseAuth (5.4.0): + - FirebaseAuth (~> 6.1.0) + - Firebase/CoreOnly (6.1.0): + - FirebaseCore (= 6.0.1) + - FirebaseAuth (6.1.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - GoogleUtilities/Environment (~> 5.2) + - FirebaseCore (~> 6.0) + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/Environment (~> 6.0) - GTMSessionFetcher/Core (~> 1.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (5.3.1): - - GoogleUtilities/Logger (~> 5.2) - - FirebaseUI/Auth (6.2.1): - - Firebase/Auth (~> 5.4) + - FirebaseCore (6.0.1): + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/Logger (~> 6.0) + - FirebaseUI/Auth (7.0.0): + - Firebase/Auth (~> 6.0) - GoogleUtilities/UserDefaults - - GoogleUtilities/Environment (5.4.0) - - GoogleUtilities/Logger (5.4.0): + - GoogleUtilities/AppDelegateSwizzler (6.2.0): - GoogleUtilities/Environment - - GoogleUtilities/UserDefaults (5.4.0): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (1.2.1) + - GoogleUtilities/Network + - GoogleUtilities/Environment (6.2.0) + - GoogleUtilities/Logger (6.2.0): + - GoogleUtilities/Environment + - GoogleUtilities/Network (6.2.0): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (6.2.0)" + - GoogleUtilities/Reachability (6.2.0): + - GoogleUtilities/Logger + - GoogleUtilities/UserDefaults (6.2.0): + - GoogleUtilities/Logger + - GTMSessionFetcher/Core (1.2.2) - OCMock (3.4.3) DEPENDENCIES: + - FirebaseAuth (~> 6.0) - FirebaseUI/Auth (from `../`) - OCMock @@ -42,15 +56,15 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Firebase: 02f3281965c075426141a0ce1277e9de6649cab9 - FirebaseAuth: d85d052354447f30b4b2a805ab91b511458b56a6 + Firebase: 8d77bb33624ae9b62d745d82ec023de5f70f7e4f + FirebaseAuth: 4281d6d98a90881e00710fa8d9e37c2ccdfc7d80 FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3 - FirebaseUI: a2edbe63a90dff4a9ac715f4dd2869411528eedc - GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560 - GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca + FirebaseCore: 66bdef3b310a026880e2a5bc8aa586ab62ce4543 + FirebaseUI: f9367cd5cacde991d9bcce9278d3fcb858f84f6a + GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab -PODFILE CHECKSUM: ccc9aef49354c1762d5e773c9a26513b2b724d60 +PODFILE CHECKSUM: dd5f618b7b3efad7d3eb9d842878ab03d443c8d4 -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.0 diff --git a/Auth/FirebaseAuthUI.xcodeproj/project.pbxproj b/Auth/FirebaseAuthUI.xcodeproj/project.pbxproj index f4eb2a57081..82d4c7d271c 100644 --- a/Auth/FirebaseAuthUI.xcodeproj/project.pbxproj +++ b/Auth/FirebaseAuthUI.xcodeproj/project.pbxproj @@ -76,8 +76,6 @@ 8D69E34B21DD4C6D00CFA49B /* FirebaseAuthUI.strings in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E2ED21DD4C6D00CFA49B /* FirebaseAuthUI.strings */; }; 8D69E35921DD614000CFA49B /* FUIAuthTest.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E35721DD614000CFA49B /* FUIAuthTest.m */; }; 8D69E35A21DD614000CFA49B /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E35821DD614000CFA49B /* GoogleService-Info.plist */; }; - AFC1F987A398C97769EEAF49 /* Pods_FirebaseAuthUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C75BC6A95DCB5BB2416555AA /* Pods_FirebaseAuthUITests.framework */; }; - F18D76B90280363380AB6A15 /* Pods_FirebaseAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4FDBEE30A8FD28AFDAF9FF21 /* Pods_FirebaseAuthUI.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -91,8 +89,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 4955D61CF2EE16858F92D6FE /* Pods-FirebaseAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseAuthUI/Pods-FirebaseAuthUI.release.xcconfig"; sourceTree = ""; }; - 4FDBEE30A8FD28AFDAF9FF21 /* Pods_FirebaseAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E25921DD4BD000CFA49B /* FirebaseAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E25C21DD4BD000CFA49B /* FirebaseAuthUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseAuthUI.h; sourceTree = ""; }; 8D69E25D21DD4BD000CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -248,10 +244,6 @@ 8D69E34121DD4C6D00CFA49B /* en-IN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-IN"; path = "en-IN.lproj/FirebaseAuthUI.strings"; sourceTree = ""; }; 8D69E35721DD614000CFA49B /* FUIAuthTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIAuthTest.m; sourceTree = ""; }; 8D69E35821DD614000CFA49B /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; - 92B78908F9AAE76445327645 /* Pods-FirebaseAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseAuthUITests/Pods-FirebaseAuthUITests.release.xcconfig"; sourceTree = ""; }; - B4D75A18555E217B6606843B /* Pods-FirebaseAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseAuthUI/Pods-FirebaseAuthUI.debug.xcconfig"; sourceTree = ""; }; - C75BC6A95DCB5BB2416555AA /* Pods_FirebaseAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - EF35DF8D73A6F8A868E996F9 /* Pods-FirebaseAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseAuthUITests/Pods-FirebaseAuthUITests.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -259,7 +251,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - F18D76B90280363380AB6A15 /* Pods_FirebaseAuthUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -268,7 +259,6 @@ buildActionMask = 2147483647; files = ( 8D69E26321DD4BD100CFA49B /* FirebaseAuthUI.framework in Frameworks */, - AFC1F987A398C97769EEAF49 /* Pods_FirebaseAuthUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -281,8 +271,7 @@ 8D69E25B21DD4BD000CFA49B /* FirebaseAuthUI */, 8D69E26621DD4BD100CFA49B /* FirebaseAuthUITests */, 8D69E25A21DD4BD000CFA49B /* Products */, - AD366F7587E22A427423A545 /* Pods */, - F6DA039B71F6AD552525F757 /* Frameworks */, + ACF63AA832F9F7882BC43A9D /* Pods */, ); sourceTree = ""; }; @@ -403,27 +392,13 @@ path = Strings; sourceTree = ""; }; - AD366F7587E22A427423A545 /* Pods */ = { + ACF63AA832F9F7882BC43A9D /* Pods */ = { isa = PBXGroup; children = ( - B4D75A18555E217B6606843B /* Pods-FirebaseAuthUI.debug.xcconfig */, - 4955D61CF2EE16858F92D6FE /* Pods-FirebaseAuthUI.release.xcconfig */, - EF35DF8D73A6F8A868E996F9 /* Pods-FirebaseAuthUITests.debug.xcconfig */, - 92B78908F9AAE76445327645 /* Pods-FirebaseAuthUITests.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; - F6DA039B71F6AD552525F757 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 4FDBEE30A8FD28AFDAF9FF21 /* Pods_FirebaseAuthUI.framework */, - C75BC6A95DCB5BB2416555AA /* Pods_FirebaseAuthUITests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -469,7 +444,6 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E26D21DD4BD100CFA49B /* Build configuration list for PBXNativeTarget "FirebaseAuthUI" */; buildPhases = ( - 6938849AE21702CA743A7B88 /* [CP] Check Pods Manifest.lock */, 8D69E25421DD4BD000CFA49B /* Headers */, 8D69E25521DD4BD000CFA49B /* Sources */, 8D69E25621DD4BD000CFA49B /* Frameworks */, @@ -488,7 +462,6 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E27021DD4BD100CFA49B /* Build configuration list for PBXNativeTarget "FirebaseAuthUITests" */; buildPhases = ( - 98E25422C6710C94D21B18CB /* [CP] Check Pods Manifest.lock */, 8D69E25E21DD4BD100CFA49B /* Sources */, 8D69E25F21DD4BD100CFA49B /* Frameworks */, 8D69E26021DD4BD100CFA49B /* Resources */, @@ -655,53 +628,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 6938849AE21702CA743A7B88 /* [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-FirebaseAuthUI-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; - }; - 98E25422C6710C94D21B18CB /* [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-FirebaseAuthUITests-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 */ 8D69E25521DD4BD000CFA49B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -967,7 +893,6 @@ }; 8D69E26E21DD4BD100CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B4D75A18555E217B6606843B /* Pods-FirebaseAuthUI.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -991,7 +916,6 @@ }; 8D69E26F21DD4BD100CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4955D61CF2EE16858F92D6FE /* Pods-FirebaseAuthUI.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -1015,7 +939,6 @@ }; 8D69E27121DD4BD100CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = EF35DF8D73A6F8A868E996F9 /* Pods-FirebaseAuthUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseAuthUITests/Info.plist; @@ -1023,6 +946,8 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities", ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseAuthUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -1032,7 +957,6 @@ }; 8D69E27221DD4BD100CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 92B78908F9AAE76445327645 /* Pods-FirebaseAuthUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseAuthUITests/Info.plist; @@ -1040,6 +964,8 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "$(PODS_CONFIGURATION_BUILD_DIR)/GTMSessionFetcher", + "${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities", ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseAuthUITests; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Auth/FirebaseAuthUI/FUIAuth.m b/Auth/FirebaseAuthUI/FUIAuth.m index 1017fc4fa80..376eaa26291 100644 --- a/Auth/FirebaseAuthUI/FUIAuth.m +++ b/Auth/FirebaseAuthUI/FUIAuth.m @@ -197,9 +197,9 @@ - (void)signInWithProviderUI:(id)providerUI credential:credential resultCallback:result]; } else { - [self.auth signInWithCredential:credential - completion:^(FIRAuthDataResult *_Nullable authResult, - NSError *_Nullable error) { + [self.auth signInAndRetrieveDataWithCredential:credential + completion:^(FIRAuthDataResult *_Nullable authResult, + NSError *_Nullable error) { if (error && error.code == FIRAuthErrorCodeAccountExistsWithDifferentCredential) { NSString *email = error.userInfo[kErrorUserInfoEmailKey]; [self.emailAuthProvider handleAccountLinkingForEmail:email @@ -230,9 +230,9 @@ - (void)autoUpgradeAccountWithProviderUI:(id)providerUI credential:(nullable FIRAuthCredential *)credential resultCallback:(nullable FIRAuthResultCallback)callback { [self.auth.currentUser - linkWithCredential:credential - completion:^(FIRAuthDataResult *_Nullable authResult, - NSError * _Nullable error) { + linkAndRetrieveDataWithCredential:credential + completion:^(FIRAuthDataResult *_Nullable authResult, + NSError * _Nullable error) { if (error) { // Check for "credential in use" conflict error and handle appropriately. if (error.code == FIRAuthErrorCodeCredentialAlreadyInUse) { @@ -283,9 +283,9 @@ - (void)autoUpgradeAccountWithProviderUI:(id)providerUI return; } - [authResult.user linkWithCredential:credential - completion:^(FIRAuthDataResult *authResult, - NSError *linkError) { + [authResult.user linkAndRetrieveDataWithCredential:credential + completion:^(FIRAuthDataResult *authResult, + NSError *linkError) { if (linkError) { [self completeSignInWithResult:nil error:linkError diff --git a/Auth/FirebaseAuthUITests/FUIAuthTest.m b/Auth/FirebaseAuthUITests/FUIAuthTest.m index dbd21bc9769..746aad50317 100644 --- a/Auth/FirebaseAuthUITests/FUIAuthTest.m +++ b/Auth/FirebaseAuthUITests/FUIAuthTest.m @@ -97,7 +97,9 @@ - (void)setUp { [super setUp]; if ([FIRApp defaultApp] == nil) { - [FIRApp configure]; + FIROptions *options = [[FIROptions alloc] initWithGoogleAppID:@"1:1069647793992:ios:91eecf4730fc920b" + GCMSenderID:@"1069647793992"]; + [FIRApp configureWithOptions:options]; } self.auth = [FIRAuth authWithApp:[FIRApp defaultApp]]; diff --git a/Auth/FirebaseAuthUITests/GoogleService-Info.plist b/Auth/FirebaseAuthUITests/GoogleService-Info.plist index 3b31cf44419..332d92983f7 100644 --- a/Auth/FirebaseAuthUITests/GoogleService-Info.plist +++ b/Auth/FirebaseAuthUITests/GoogleService-Info.plist @@ -2,39 +2,37 @@ - AD_UNIT_ID_FOR_BANNER_TEST - ad-unit-banner - AD_UNIT_ID_FOR_INTERSTITIAL_TEST - ad-unit-interstitial CLIENT_ID - client-id.apps.googleusercontent.com + 0000000000000000000000000.apps.googleusercontent.com REVERSED_CLIENT_ID - com.googleusercontent.apps.client-id + com.googleusercontent.apps.0000000000000000000000000 + ANDROID_CLIENT_ID + 0000000000000000000000000.apps.googleusercontent.com API_KEY - api-key + 0000000000000000000000000 GCM_SENDER_ID - sender-id + 0000000000000000000000000 PLIST_VERSION 1 BUNDLE_ID - com.firebase.firebaseUI.tests + com.firebase.firebaseui.tests PROJECT_ID - project-id + 0000000000000000000000000 STORAGE_BUCKET - storage-bucket + 0000000000000000000000000.appspot.com IS_ADS_ENABLED - + IS_ANALYTICS_ENABLED - + IS_APPINVITE_ENABLED - + IS_GCM_ENABLED - + IS_SIGNIN_ENABLED - + GOOGLE_APP_ID - 0:000000000000:ios:0000000000000000 + 0000000000000000000000000 DATABASE_URL - database-url + https://0000000000000000000000000.firebaseio.com - + \ No newline at end of file diff --git a/Auth/Podfile b/Auth/Podfile index bbc39ab57e8..3394370885e 100644 --- a/Auth/Podfile +++ b/Auth/Podfile @@ -1,4 +1,4 @@ -source 'sso://cpdc-internal/firebase' +# source 'sso://cpdc-internal/firebase' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' diff --git a/Auth/Podfile.lock b/Auth/Podfile.lock index 068e2bd5213..ea0531ed093 100644 --- a/Auth/Podfile.lock +++ b/Auth/Podfile.lock @@ -37,6 +37,6 @@ SPEC CHECKSUMS: GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560 GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca -PODFILE CHECKSUM: 4760d151bb4c1b8b0d1cc3a4b90555f042f65db8 +PODFILE CHECKSUM: b52e77a8635fdab60813531d42d397d13cda156e -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.0 diff --git a/Database/FirebaseDatabaseUI.xcodeproj/project.pbxproj b/Database/FirebaseDatabaseUI.xcodeproj/project.pbxproj index c41b1508402..b178bc7488b 100644 --- a/Database/FirebaseDatabaseUI.xcodeproj/project.pbxproj +++ b/Database/FirebaseDatabaseUI.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 0006045D190AC15BB4C5AC9C /* Pods_FirebaseDatabaseUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 89B617FADCB8AD78A02A074A /* Pods_FirebaseDatabaseUITests.framework */; }; - 11BFD48737B8EDCDE19D43AD /* Pods_FirebaseDatabaseUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D4CA42188C674F230A3061E1 /* Pods_FirebaseDatabaseUI.framework */; }; 8D69E1D021DD446600CFA49B /* FirebaseDatabaseUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D69E1C621DD446600CFA49B /* FirebaseDatabaseUI.framework */; }; 8D69E1D721DD446600CFA49B /* FirebaseDatabaseUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E1C921DD446600CFA49B /* FirebaseDatabaseUI.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8D69E1F121DD44EB00CFA49B /* FUICollectionViewDataSource.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E1E021DD44EA00CFA49B /* FUICollectionViewDataSource.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -49,11 +47,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 1EB6AB5232B96EAEC31824C1 /* Pods-FirebaseDatabaseUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseDatabaseUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseDatabaseUI/Pods-FirebaseDatabaseUI.release.xcconfig"; sourceTree = ""; }; - 311C0F8EEBC55348D8D59158 /* Pods-FirebaseDatabaseUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseDatabaseUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseDatabaseUI/Pods-FirebaseDatabaseUI.debug.xcconfig"; sourceTree = ""; }; - 39AA3D8455DA000E87D20C6D /* Pods-FirebaseDatabaseUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseDatabaseUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseDatabaseUITests/Pods-FirebaseDatabaseUITests.release.xcconfig"; sourceTree = ""; }; - 6FD4BEEB30C35316198FAC38 /* Pods-FirebaseDatabaseUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseDatabaseUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseDatabaseUITests/Pods-FirebaseDatabaseUITests.debug.xcconfig"; sourceTree = ""; }; - 89B617FADCB8AD78A02A074A /* Pods_FirebaseDatabaseUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseDatabaseUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E1C621DD446600CFA49B /* FirebaseDatabaseUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseDatabaseUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E1C921DD446600CFA49B /* FirebaseDatabaseUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseDatabaseUI.h; sourceTree = ""; }; 8D69E1CA21DD446600CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -85,7 +78,6 @@ 8D69E20821DD451D00CFA49B /* FUIIndexTableViewDataSourceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIIndexTableViewDataSourceTest.m; sourceTree = ""; }; 8D69E20921DD451D00CFA49B /* FUITableViewDataSourceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUITableViewDataSourceTest.m; sourceTree = ""; }; 8D69E20A21DD451D00CFA49B /* FUICollectionViewDataSourceTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUICollectionViewDataSourceTest.m; sourceTree = ""; }; - D4CA42188C674F230A3061E1 /* Pods_FirebaseDatabaseUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseDatabaseUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -93,7 +85,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 11BFD48737B8EDCDE19D43AD /* Pods_FirebaseDatabaseUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -102,22 +93,16 @@ buildActionMask = 2147483647; files = ( 8D69E1D021DD446600CFA49B /* FirebaseDatabaseUI.framework in Frameworks */, - 0006045D190AC15BB4C5AC9C /* Pods_FirebaseDatabaseUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1CAEFB82EF91DE987BBCCC8D /* Pods */ = { + 5E6E54D5C69E9648700F3B53 /* Pods */ = { isa = PBXGroup; children = ( - 311C0F8EEBC55348D8D59158 /* Pods-FirebaseDatabaseUI.debug.xcconfig */, - 1EB6AB5232B96EAEC31824C1 /* Pods-FirebaseDatabaseUI.release.xcconfig */, - 6FD4BEEB30C35316198FAC38 /* Pods-FirebaseDatabaseUITests.debug.xcconfig */, - 39AA3D8455DA000E87D20C6D /* Pods-FirebaseDatabaseUITests.release.xcconfig */, ); - name = Pods; path = Pods; sourceTree = ""; }; @@ -127,8 +112,7 @@ 8D69E1C821DD446600CFA49B /* FirebaseDatabaseUI */, 8D69E1D321DD446600CFA49B /* FirebaseDatabaseUITests */, 8D69E1C721DD446600CFA49B /* Products */, - 1CAEFB82EF91DE987BBCCC8D /* Pods */, - C22A6BA8FC3E47E6C6098F0B /* Frameworks */, + 5E6E54D5C69E9648700F3B53 /* Pods */, ); sourceTree = ""; }; @@ -184,15 +168,6 @@ path = FirebaseDatabaseUITests; sourceTree = ""; }; - C22A6BA8FC3E47E6C6098F0B /* Frameworks */ = { - isa = PBXGroup; - children = ( - D4CA42188C674F230A3061E1 /* Pods_FirebaseDatabaseUI.framework */, - 89B617FADCB8AD78A02A074A /* Pods_FirebaseDatabaseUITests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -220,7 +195,6 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E1DA21DD446600CFA49B /* Build configuration list for PBXNativeTarget "FirebaseDatabaseUI" */; buildPhases = ( - 703AA6F741657BEDFEC07253 /* [CP] Check Pods Manifest.lock */, 8D69E1C121DD446600CFA49B /* Headers */, 8D69E1C221DD446600CFA49B /* Sources */, 8D69E1C321DD446600CFA49B /* Frameworks */, @@ -239,7 +213,6 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E1DD21DD446600CFA49B /* Build configuration list for PBXNativeTarget "FirebaseDatabaseUITests" */; buildPhases = ( - 7BED97797640E02FEBA24D99 /* [CP] Check Pods Manifest.lock */, 8D69E1CB21DD446600CFA49B /* Sources */, 8D69E1CC21DD446600CFA49B /* Frameworks */, 8D69E1CD21DD446600CFA49B /* Resources */, @@ -306,53 +279,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 703AA6F741657BEDFEC07253 /* [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-FirebaseDatabaseUI-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; - }; - 7BED97797640E02FEBA24D99 /* [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-FirebaseDatabaseUITests-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 */ 8D69E1C221DD446600CFA49B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -515,7 +441,6 @@ }; 8D69E1DB21DD446600CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 311C0F8EEBC55348D8D59158 /* Pods-FirebaseDatabaseUI.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -539,7 +464,6 @@ }; 8D69E1DC21DD446600CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1EB6AB5232B96EAEC31824C1 /* Pods-FirebaseDatabaseUI.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -563,7 +487,6 @@ }; 8D69E1DE21DD446600CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 6FD4BEEB30C35316198FAC38 /* Pods-FirebaseDatabaseUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseDatabaseUITests/Info.plist; @@ -571,6 +494,10 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseDatabaseUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -580,7 +507,6 @@ }; 8D69E1DF21DD446600CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 39AA3D8455DA000E87D20C6D /* Pods-FirebaseDatabaseUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseDatabaseUITests/Info.plist; @@ -588,6 +514,10 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseDatabase\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseDatabaseUITests; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Database/FirebaseDatabaseUI/FUIArray.m b/Database/FirebaseDatabaseUI/FUIArray.m index c5e28d60cc7..82764aa39e0 100755 --- a/Database/FirebaseDatabaseUI/FUIArray.m +++ b/Database/FirebaseDatabaseUI/FUIArray.m @@ -28,7 +28,7 @@ @interface FUIArray () @property (strong, nonatomic) NSMutableArray *snapshots; /** - * The backing collection that holds all of the array's key. + * The backing collection that holds all of the array's keys. */ @property (strong, nonatomic) NSMutableArray *keys; diff --git a/Database/FirebaseDatabaseUI/FUISortedArray.m b/Database/FirebaseDatabaseUI/FUISortedArray.m index 19612038acc..f5a9deb2691 100644 --- a/Database/FirebaseDatabaseUI/FUISortedArray.m +++ b/Database/FirebaseDatabaseUI/FUISortedArray.m @@ -28,6 +28,11 @@ @interface FUISortedArray () */ @property (strong, nonatomic) NSMutableArray *snapshots; +/** + * The backing collection that holds all of the array's keys. + */ +@property (strong, nonatomic) NSMutableArray *keys; + /** * A set containing the query observer handles that should be released when * this array is freed. @@ -64,6 +69,7 @@ - (void)removeSnapshot:(FIRDataSnapshot *)snap withPreviousChildKey:(NSString *) if (index == NSNotFound) { /* error */ return; } [self.snapshots removeObjectAtIndex:index]; + [self.keys removeObjectAtIndex:index]; if ([self.delegate respondsToSelector:@selector(array:didRemoveObject:atIndex:)]) { [self.delegate array:self didRemoveObject:snap atIndex:index]; } @@ -78,6 +84,7 @@ - (void)changeSnapshot:(FIRDataSnapshot *)snap withPreviousChildKey:(NSString *) // Since changes can change ordering, model changes as a deletion and an insertion. FIRDataSnapshot *removed = [self snapshotAtIndex:index]; [self.snapshots removeObjectAtIndex:index]; + [self.keys removeObjectAtIndex:index]; if ([self.delegate respondsToSelector:@selector(array:didRemoveObject:atIndex:)]) { [self.delegate array:self didRemoveObject:removed atIndex:index]; } @@ -99,6 +106,7 @@ - (NSArray *)items { - (NSInteger)insertSnapshot:(FIRDataSnapshot *)snapshot { if (self.count == 0) { [self.snapshots addObject:snapshot]; + [self.keys addObject:snapshot.key]; return 0; } if (self.count == 1) { @@ -106,9 +114,11 @@ - (NSInteger)insertSnapshot:(FIRDataSnapshot *)snapshot { switch (result) { case NSOrderedDescending: [self.snapshots addObject:snapshot]; + [self.keys addObject:snapshot.key]; return 1; default: [self.snapshots insertObject:snapshot atIndex:0]; + [self.keys insertObject:snapshot.key atIndex:0]; return 0; } } @@ -120,10 +130,12 @@ - (NSInteger)insertSnapshot:(FIRDataSnapshot *)snapshot { if (index == 0) { [self.snapshots insertObject:snapshot atIndex:0]; + [self.keys insertObject:snapshot.key atIndex:0]; return 0; } if (index == self.snapshots.count) { [self.snapshots addObject:snapshot]; + [self.keys addObject:snapshot.key]; return index; } @@ -148,6 +160,7 @@ - (NSInteger)insertSnapshot:(FIRDataSnapshot *)snapshot { } else { // good [self.snapshots insertObject:snapshot atIndex:index]; + [self.keys insertObject:snapshot.key atIndex:index]; return index; } } diff --git a/Database/Podfile b/Database/Podfile index 5b89ed6ece1..5a7dee37128 100644 --- a/Database/Podfile +++ b/Database/Podfile @@ -1,4 +1,4 @@ -source 'sso://cpdc-internal/firebase' +# source 'sso://cpdc-internal/firebase' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' diff --git a/Database/Podfile.lock b/Database/Podfile.lock index 013871ae248..7abe0b75665 100644 --- a/Database/Podfile.lock +++ b/Database/Podfile.lock @@ -36,6 +36,6 @@ SPEC CHECKSUMS: GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560 leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5 -PODFILE CHECKSUM: 022fa898a7b275c96a2e28bfcff62e6352ca5643 +PODFILE CHECKSUM: 4a5d8ca50779b0745cc8a6eed485c325bb517b35 -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.0 diff --git a/EmailAuth/FirebaseEmailAuthUI.xcodeproj/project.pbxproj b/EmailAuth/FirebaseEmailAuthUI.xcodeproj/project.pbxproj index 70b7699d357..ccb272c42c0 100644 --- a/EmailAuth/FirebaseEmailAuthUI.xcodeproj/project.pbxproj +++ b/EmailAuth/FirebaseEmailAuthUI.xcodeproj/project.pbxproj @@ -7,8 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1EC27450F429F476F81B9E00 /* Pods_FirebaseEmailAuthUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 52DCB91BE44B8B257365D9F6 /* Pods_FirebaseEmailAuthUITests.framework */; }; - 616F0EE6EE33B10252F2020F /* Pods_FirebaseEmailAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8276B42713E82648B16F596C /* Pods_FirebaseEmailAuthUI.framework */; }; 8D69E36F21DD623F00CFA49B /* FirebaseEmailAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D69E36521DD623F00CFA49B /* FirebaseEmailAuthUI.framework */; }; 8D69E37421DD623F00CFA49B /* FirebaseEmailAuthUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E37321DD623F00CFA49B /* FirebaseEmailAuthUITests.m */; }; 8D69E37621DD623F00CFA49B /* FirebaseEmailAuthUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E36821DD623F00CFA49B /* FirebaseEmailAuthUI.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -51,10 +49,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 2BB8F49C02A03A8F401DD401 /* Pods-FirebaseEmailAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseEmailAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseEmailAuthUITests/Pods-FirebaseEmailAuthUITests.release.xcconfig"; sourceTree = ""; }; - 4DE30278CA4CC5E36F146E0D /* Pods-FirebaseEmailAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseEmailAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseEmailAuthUI/Pods-FirebaseEmailAuthUI.release.xcconfig"; sourceTree = ""; }; - 52DCB91BE44B8B257365D9F6 /* Pods_FirebaseEmailAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseEmailAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 8276B42713E82648B16F596C /* Pods_FirebaseEmailAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseEmailAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E36521DD623F00CFA49B /* FirebaseEmailAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseEmailAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E36821DD623F00CFA49B /* FirebaseEmailAuthUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseEmailAuthUI.h; sourceTree = ""; }; 8D69E36921DD623F00CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -87,8 +81,6 @@ 8D69E3B921DD63D100CFA49B /* FUIPasswordSignInViewController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; name = FUIPasswordSignInViewController.xib; path = Resources/FUIPasswordSignInViewController.xib; sourceTree = ""; }; 8DB3779E226137CC00BF5095 /* FUIConfirmEmailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUIConfirmEmailViewController.h; sourceTree = ""; }; 8DB3779F226137CC00BF5095 /* FUIConfirmEmailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIConfirmEmailViewController.m; sourceTree = ""; }; - F3CC6B44D09C6FF6761A008B /* Pods-FirebaseEmailAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseEmailAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseEmailAuthUITests/Pods-FirebaseEmailAuthUITests.debug.xcconfig"; sourceTree = ""; }; - FA4E3712BA6ED8218803CEE6 /* Pods-FirebaseEmailAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseEmailAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseEmailAuthUI/Pods-FirebaseEmailAuthUI.debug.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -96,7 +88,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 616F0EE6EE33B10252F2020F /* Pods_FirebaseEmailAuthUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -105,29 +96,15 @@ buildActionMask = 2147483647; files = ( 8D69E36F21DD623F00CFA49B /* FirebaseEmailAuthUI.framework in Frameworks */, - 1EC27450F429F476F81B9E00 /* Pods_FirebaseEmailAuthUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 343F119D65105B13DFE49796 /* Frameworks */ = { - isa = PBXGroup; - children = ( - 8276B42713E82648B16F596C /* Pods_FirebaseEmailAuthUI.framework */, - 52DCB91BE44B8B257365D9F6 /* Pods_FirebaseEmailAuthUITests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; 3F62AEE76F7ADD8E7928642E /* Pods */ = { isa = PBXGroup; children = ( - FA4E3712BA6ED8218803CEE6 /* Pods-FirebaseEmailAuthUI.debug.xcconfig */, - 4DE30278CA4CC5E36F146E0D /* Pods-FirebaseEmailAuthUI.release.xcconfig */, - F3CC6B44D09C6FF6761A008B /* Pods-FirebaseEmailAuthUITests.debug.xcconfig */, - 2BB8F49C02A03A8F401DD401 /* Pods-FirebaseEmailAuthUITests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -139,7 +116,6 @@ 8D69E37221DD623F00CFA49B /* FirebaseEmailAuthUITests */, 8D69E36621DD623F00CFA49B /* Products */, 3F62AEE76F7ADD8E7928642E /* Pods */, - 343F119D65105B13DFE49796 /* Frameworks */, ); sourceTree = ""; }; @@ -233,12 +209,10 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E37921DD623F00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseEmailAuthUI" */; buildPhases = ( - 28D1202966671EE3B20A5DF3 /* [CP] Check Pods Manifest.lock */, 8D69E36021DD623F00CFA49B /* Headers */, 8D69E36121DD623F00CFA49B /* Sources */, 8D69E36221DD623F00CFA49B /* Frameworks */, 8D69E36321DD623F00CFA49B /* Resources */, - 88CA35772AE2AB4F0692BCF7 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -253,11 +227,9 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E37C21DD623F00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseEmailAuthUITests" */; buildPhases = ( - C7B08F2907138853CBD16878 /* [CP] Check Pods Manifest.lock */, 8D69E36A21DD623F00CFA49B /* Sources */, 8D69E36B21DD623F00CFA49B /* Frameworks */, 8D69E36C21DD623F00CFA49B /* Resources */, - A8C42C2A84AB7CEAF0F1C768 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -329,97 +301,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 28D1202966671EE3B20A5DF3 /* [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-FirebaseEmailAuthUI-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; - }; - 88CA35772AE2AB4F0692BCF7 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebaseEmailAuthUI/Pods-FirebaseEmailAuthUI-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseEmailAuthUI/Pods-FirebaseEmailAuthUI-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - A8C42C2A84AB7CEAF0F1C768 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebaseEmailAuthUITests/Pods-FirebaseEmailAuthUITests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseEmailAuthUITests/Pods-FirebaseEmailAuthUITests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - C7B08F2907138853CBD16878 /* [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-FirebaseEmailAuthUITests-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 */ 8D69E36121DD623F00CFA49B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -575,7 +456,6 @@ }; 8D69E37A21DD623F00CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = FA4E3712BA6ED8218803CEE6 /* Pods-FirebaseEmailAuthUI.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -614,7 +494,6 @@ }; 8D69E37B21DD623F00CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4DE30278CA4CC5E36F146E0D /* Pods-FirebaseEmailAuthUI.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -653,7 +532,6 @@ }; 8D69E37D21DD623F00CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = F3CC6B44D09C6FF6761A008B /* Pods-FirebaseEmailAuthUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseEmailAuthUITests/Info.plist; @@ -685,7 +563,6 @@ }; 8D69E37E21DD623F00CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2BB8F49C02A03A8F401DD401 /* Pods-FirebaseEmailAuthUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseEmailAuthUITests/Info.plist; diff --git a/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m b/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m index 758810675d3..ae338348096 100644 --- a/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m +++ b/EmailAuth/FirebaseEmailAuthUI/FUIEmailAuth.m @@ -504,9 +504,9 @@ - (void)signInWithEmailHint:(NSString *)emailHint // currently signed in user on the default auth instance. FIRAuth *tempAuth = [FIRAuth authWithApp:tempApp]; - [self.authUI.auth fetchProvidersForEmail:emailHint - completion:^(NSArray *_Nullable providers, - NSError *_Nullable error) { + [self.authUI.auth fetchSignInMethodsForEmail:emailHint + completion:^(NSArray *_Nullable providers, + NSError *_Nullable error) { if (error) { if (completion) { completion(nil, error, nil); diff --git a/EmailAuth/Podfile b/EmailAuth/Podfile index e016ddbac7e..787ae1d1917 100644 --- a/EmailAuth/Podfile +++ b/EmailAuth/Podfile @@ -1,4 +1,4 @@ -source 'sso://cpdc-internal/firebase' +# source 'sso://cpdc-internal/firebase' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' diff --git a/EmailAuth/Podfile.lock b/EmailAuth/Podfile.lock index 183796225d3..8ed09f254d3 100644 --- a/EmailAuth/Podfile.lock +++ b/EmailAuth/Podfile.lock @@ -1,26 +1,39 @@ PODS: - - Firebase/Auth (5.18.0): + - Firebase/Auth (6.1.0): - Firebase/CoreOnly - - FirebaseAuth (= 5.4.0) - - Firebase/CoreOnly (5.18.0): - - FirebaseCore (= 5.3.1) - - FirebaseAuth (5.4.0): + - FirebaseAuth (~> 6.1.0) + - Firebase/CoreOnly (6.1.0): + - FirebaseCore (= 6.0.1) + - FirebaseAuth (6.1.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - GoogleUtilities/Environment (~> 5.2) + - FirebaseCore (~> 6.0) + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/Environment (~> 6.0) - GTMSessionFetcher/Core (~> 1.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (5.3.1): - - GoogleUtilities/Logger (~> 5.2) - - FirebaseUI/Auth (6.2.1): - - Firebase/Auth (~> 5.4) + - FirebaseCore (6.0.1): + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/Logger (~> 6.0) + - FirebaseUI/Auth (7.0.0): + - Firebase/Auth (~> 6.0) - GoogleUtilities/UserDefaults - - GoogleUtilities/Environment (5.4.0) - - GoogleUtilities/Logger (5.4.0): + - GoogleUtilities/AppDelegateSwizzler (6.2.0): - GoogleUtilities/Environment - - GoogleUtilities/UserDefaults (5.4.0): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (1.2.1) + - GoogleUtilities/Network + - GoogleUtilities/Environment (6.2.0) + - GoogleUtilities/Logger (6.2.0): + - GoogleUtilities/Environment + - GoogleUtilities/Network (6.2.0): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (6.2.0)" + - GoogleUtilities/Reachability (6.2.0): + - GoogleUtilities/Logger + - GoogleUtilities/UserDefaults (6.2.0): + - GoogleUtilities/Logger + - GTMSessionFetcher/Core (1.2.2) - OCMock (3.4.3) DEPENDENCIES: @@ -42,15 +55,15 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Firebase: 02f3281965c075426141a0ce1277e9de6649cab9 - FirebaseAuth: d85d052354447f30b4b2a805ab91b511458b56a6 + Firebase: 8d77bb33624ae9b62d745d82ec023de5f70f7e4f + FirebaseAuth: 4281d6d98a90881e00710fa8d9e37c2ccdfc7d80 FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3 - FirebaseUI: a2edbe63a90dff4a9ac715f4dd2869411528eedc - GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560 - GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca + FirebaseCore: 66bdef3b310a026880e2a5bc8aa586ab62ce4543 + FirebaseUI: f9367cd5cacde991d9bcce9278d3fcb858f84f6a + GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab -PODFILE CHECKSUM: 6ff38bbeb6491ec0603cbfcda597c2bf9b1d2795 +PODFILE CHECKSUM: 93c949bd721b310021205cac2512e3aac755c549 -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.0 diff --git a/FacebookAuth/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj b/FacebookAuth/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj index 527ec185920..085575a1257 100644 --- a/FacebookAuth/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj +++ b/FacebookAuth/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -153,12 +153,20 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 7DC88936A359F0A20973DC4C /* Pods */ = { + isa = PBXGroup; + children = ( + ); + path = Pods; + sourceTree = ""; + }; 8D69E3C221DD83EB00CFA49B = { isa = PBXGroup; children = ( 8D69E3CE21DD83EB00CFA49B /* FirebaseFacebookAuthUI */, 8D69E3D921DD83EB00CFA49B /* FirebaseFacebookAuthUITests */, 8D69E3CD21DD83EB00CFA49B /* Products */, + 7DC88936A359F0A20973DC4C /* Pods */, ); sourceTree = ""; }; @@ -271,7 +279,7 @@ 8D69E3C321DD83EB00CFA49B /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 1010; + LastUpgradeCheck = 1020; ORGANIZATIONNAME = Firebase; TargetAttributes = { 8D69E3CB21DD83EB00CFA49B = { @@ -535,6 +543,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -597,6 +606,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES; CLANG_ANALYZER_NONNULL = YES; CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; @@ -742,6 +752,13 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKLoginKit\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -779,6 +796,13 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKCoreKit\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FBSDKLoginKit\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/FacebookAuth/FirebaseFacebookAuthUI/FUIFacebookAuth.m b/FacebookAuth/FirebaseFacebookAuthUI/FUIFacebookAuth.m index fb52696c819..a160b61a3bb 100644 --- a/FacebookAuth/FirebaseFacebookAuthUI/FUIFacebookAuth.m +++ b/FacebookAuth/FirebaseFacebookAuthUI/FUIFacebookAuth.m @@ -222,7 +222,7 @@ - (void)callbackWithCredential:(nullable FIRAuthCredential *)credential @brief Validates that Facebook SDK data was filled in Info.plist and creates Facebook login manager */ - (void)configureProvider { - NSBundle *bundle = [NSBundle mainBundle]; + NSBundle *bundle = [FUIAuthUtils bundleNamed:nil]; NSString *facebookAppId = [bundle objectForInfoDictionaryKey:kFacebookAppId]; NSString *facebookDisplayName = [bundle objectForInfoDictionaryKey:kFacebookDisplayName]; diff --git a/FacebookAuth/FirebaseFacebookAuthUITests/FUIFacebookAuthTest.m b/FacebookAuth/FirebaseFacebookAuthUITests/FUIFacebookAuthTest.m index 5129cca0fea..82830b780bd 100644 --- a/FacebookAuth/FirebaseFacebookAuthUITests/FUIFacebookAuthTest.m +++ b/FacebookAuth/FirebaseFacebookAuthUITests/FUIFacebookAuthTest.m @@ -23,9 +23,9 @@ @interface FBSDKLoginManagerTest : FBSDKLoginManager @implementation FBSDKLoginManagerTest -- (void)logInWithReadPermissions:(NSArray *)permissions - fromViewController:(UIViewController *)fromViewController - handler:(FBSDKLoginManagerLoginResultBlock)handler { +- (void)logInWithPermissions:(NSArray *)permissions + fromViewController:(UIViewController *)fromViewController + handler:(FBSDKLoginManagerLoginResultBlock)handler { handler(self.result, self.error); } @end diff --git a/FacebookAuth/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m b/FacebookAuth/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m index 40fcfd45c88..997219d55da 100644 --- a/FacebookAuth/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m +++ b/FacebookAuth/FirebaseFacebookAuthUITests/FirebaseFacebookAuthUITests.m @@ -48,6 +48,10 @@ - (void)setUp { OCMStub(ClassMethod([authClass auth])). andReturn(authClass); + id bundle = [NSBundle bundleForClass:[self class]]; + id mockNSBundleClass = OCMClassMock([NSBundle class]); + OCMStub(ClassMethod(mockNSBundleClass)).andReturn(bundle); + self.provider = [[FUIFacebookAuthTest alloc] init]; } @@ -83,20 +87,21 @@ - (void)testSuccessfullLogin { dataAccessExpirationDate:nil]; id mockToken = OCMPartialMock(token); + NSSet *emptySet = [NSSet set]; FBSDKLoginManagerLoginResult *result = [[FBSDKLoginManagerLoginResult alloc] initWithToken:mockToken isCancelled:NO - grantedPermissions:nil - declinedPermissions:nil]; + grantedPermissions:emptySet + declinedPermissions:emptySet]; XCTAssertNil(_provider.accessToken); [self.provider configureLoginManager:result withError:nil]; XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"]; - [self.provider signInWithEmail:nil - presentingViewController:nil - completion:^(FIRAuthCredential *_Nullable credential, - NSError *_Nullable error, - FIRAuthResultCallback _Nullable result, - NSDictionary *_Nullable userInfo) { + [self.provider signInWithDefaultValue:nil + presentingViewController:nil + completion:^(FIRAuthCredential *_Nullable credential, + NSError *_Nullable error, + FIRAuthResultCallback _Nullable result, + NSDictionary *_Nullable userInfo) { XCTAssertNil(error); XCTAssertNotNil(credential); XCTAssertNotNil(result); @@ -128,17 +133,17 @@ - (void)testCancelLogin { id mockToken = OCMPartialMock(token); FBSDKLoginManagerLoginResult *result = [[FBSDKLoginManagerLoginResult alloc] initWithToken:mockToken isCancelled:YES - grantedPermissions:nil - declinedPermissions:nil]; + grantedPermissions:[NSSet set] + declinedPermissions:[NSSet set]]; [self.provider configureLoginManager:result withError:nil]; XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"]; - [self.provider signInWithEmail:nil - presentingViewController:nil - completion:^(FIRAuthCredential *_Nullable credential, - NSError *_Nullable error, - FIRAuthResultCallback _Nullable result, - NSDictionary *_Nullable userInfo) { + [self.provider signInWithDefaultValue:nil + presentingViewController:nil + completion:^(FIRAuthCredential *_Nullable credential, + NSError *_Nullable error, + FIRAuthResultCallback _Nullable result, + NSDictionary *_Nullable userInfo) { XCTAssertNotNil(error); XCTAssertEqual(error.code, FUIAuthErrorCodeUserCancelledSignIn); XCTAssertNil(credential); @@ -161,12 +166,12 @@ - (void)testErrorLogin { [self.provider configureLoginManager:nil withError:testError]; XCTestExpectation *expectation = [self expectationWithDescription:@"logged in"]; - [self.provider signInWithEmail:nil - presentingViewController:nil - completion:^(FIRAuthCredential *_Nullable credential, - NSError *_Nullable error, - FIRAuthResultCallback _Nullable result, - NSDictionary *_Nullable userInfo) { + [self.provider signInWithDefaultValue:nil + presentingViewController:nil + completion:^(FIRAuthCredential *_Nullable credential, + NSError *_Nullable error, + FIRAuthResultCallback _Nullable result, + NSDictionary *_Nullable userInfo) { XCTAssertNotNil(error); XCTAssertEqual(error.userInfo[NSUnderlyingErrorKey], testError); XCTAssertNil(credential); diff --git a/FacebookAuth/FirebaseFacebookAuthUITests/Info.plist b/FacebookAuth/FirebaseFacebookAuthUITests/Info.plist index e96b5a66eba..cc6aa6a73ee 100644 --- a/FacebookAuth/FirebaseFacebookAuthUITests/Info.plist +++ b/FacebookAuth/FirebaseFacebookAuthUITests/Info.plist @@ -18,9 +18,25 @@ ???? CFBundleVersion 1 - FacebookAppID - {your-app-id} - FacebookDisplayName - {your-app-name} + CFBundleURLTypes + + + CFBundleURLSchemes + + fb00000000 + + + + FacebookAppID + 00000000 + FacebookDisplayName + FirebaseUI + LSApplicationQueriesSchemes + + fbapi + fb-messenger-share-api + fbauth2 + fbshareextension + diff --git a/FacebookAuth/Podfile b/FacebookAuth/Podfile index 12a3c9ad993..b0ce949caa4 100644 --- a/FacebookAuth/Podfile +++ b/FacebookAuth/Podfile @@ -1,4 +1,4 @@ -source 'sso://cpdc-internal/firebase' +# source 'sso://cpdc-internal/firebase' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' diff --git a/FacebookAuth/Podfile.lock b/FacebookAuth/Podfile.lock index e3b6bbdaa21..0b5587463a1 100644 --- a/FacebookAuth/Podfile.lock +++ b/FacebookAuth/Podfile.lock @@ -1,35 +1,47 @@ PODS: - - FBSDKCoreKit (5.0.0): - - FBSDKCoreKit/Basics (= 5.0.0) - - FBSDKCoreKit/Core (= 5.0.0) - - FBSDKCoreKit/Basics (5.0.0) - - FBSDKCoreKit/Core (5.0.0): + - FBSDKCoreKit (5.0.1): + - FBSDKCoreKit/Basics (= 5.0.1) + - FBSDKCoreKit/Core (= 5.0.1) + - FBSDKCoreKit/Basics (5.0.1) + - FBSDKCoreKit/Core (5.0.1): - FBSDKCoreKit/Basics - - FBSDKLoginKit (5.0.0): - - FBSDKCoreKit (= 5.0.0) - - Firebase/Auth (5.20.2): + - FBSDKLoginKit (5.0.1): + - FBSDKCoreKit (~> 5.0) + - Firebase/Auth (6.1.0): - Firebase/CoreOnly - - FirebaseAuth (= 5.4.2) - - Firebase/CoreOnly (5.20.2): - - FirebaseCore (= 5.4.1) - - FirebaseAuth (5.4.2): + - FirebaseAuth (~> 6.1.0) + - Firebase/CoreOnly (6.1.0): + - FirebaseCore (= 6.0.1) + - FirebaseAuth (6.1.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - GoogleUtilities/Environment (~> 5.2) + - FirebaseCore (~> 6.0) + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/Environment (~> 6.0) - GTMSessionFetcher/Core (~> 1.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (5.4.1): - - GoogleUtilities/Environment (~> 5.2) - - GoogleUtilities/Logger (~> 5.2) - - FirebaseUI/Auth (6.2.1): - - Firebase/Auth (~> 5.4) + - FirebaseCore (6.0.1): + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/Logger (~> 6.0) + - FirebaseUI/Auth (7.0.0): + - Firebase/Auth (~> 6.0) - GoogleUtilities/UserDefaults - - GoogleUtilities/Environment (5.8.0) - - GoogleUtilities/Logger (5.8.0): + - GoogleUtilities/AppDelegateSwizzler (6.2.0): - GoogleUtilities/Environment - - GoogleUtilities/UserDefaults (5.8.0): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (1.2.1) + - GoogleUtilities/Network + - GoogleUtilities/Environment (6.2.0) + - GoogleUtilities/Logger (6.2.0): + - GoogleUtilities/Environment + - GoogleUtilities/Network (6.2.0): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (6.2.0)" + - GoogleUtilities/Reachability (6.2.0): + - GoogleUtilities/Logger + - GoogleUtilities/UserDefaults (6.2.0): + - GoogleUtilities/Logger + - GTMSessionFetcher/Core (1.2.2) - OCMock (3.4.3) DEPENDENCIES: @@ -55,17 +67,17 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - FBSDKCoreKit: ba361d4a9d4dc29ff218822b849b22d4f869c7bb - FBSDKLoginKit: c6d0dc187bd076e370dffa10f7fc8a3562a6892c - Firebase: 0c8cf33f266410c61ab3e2265cfa412200351d9c - FirebaseAuth: dd7bbf03a5aee0eafb3a1aee4d2812bd74bac890 + FBSDKCoreKit: 4a19534474ade7c71bd016d800aa5e7722bcdda1 + FBSDKLoginKit: 41efa754b909b0ea813fa9a8596dacc8ed196d50 + Firebase: 8d77bb33624ae9b62d745d82ec023de5f70f7e4f + FirebaseAuth: 4281d6d98a90881e00710fa8d9e37c2ccdfc7d80 FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: f1a9a8be1aee4bf71a2fc0f4096df6788bdfda61 - FirebaseUI: a2edbe63a90dff4a9ac715f4dd2869411528eedc - GoogleUtilities: 04fce34bcd5620c1ee76fb79172105c74a4df335 - GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca + FirebaseCore: 66bdef3b310a026880e2a5bc8aa586ab62ce4543 + FirebaseUI: f9367cd5cacde991d9bcce9278d3fcb858f84f6a + GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab -PODFILE CHECKSUM: 4a628fc1e0dd4b8135687af583b15c395645a8d1 +PODFILE CHECKSUM: d4087ca55e7289fffba35c7dae37752581dfdfe2 -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.0 diff --git a/Firestore/FirebaseFirestoreUI.xcodeproj/project.pbxproj b/Firestore/FirebaseFirestoreUI.xcodeproj/project.pbxproj index b1d31d8ac27..de67adff651 100644 --- a/Firestore/FirebaseFirestoreUI.xcodeproj/project.pbxproj +++ b/Firestore/FirebaseFirestoreUI.xcodeproj/project.pbxproj @@ -75,6 +75,7 @@ 8D69E46021DD8B2E00CFA49B /* FirebaseFirestoreUI */, 8D69E46B21DD8B2E00CFA49B /* FirebaseFirestoreUITests */, 8D69E45F21DD8B2E00CFA49B /* Products */, + 905358392FD4EDB2D9802535 /* Pods */, ); sourceTree = ""; }; @@ -115,6 +116,13 @@ path = FirebaseFirestoreUITests; sourceTree = ""; }; + 905358392FD4EDB2D9802535 /* Pods */ = { + isa = PBXGroup; + children = ( + ); + path = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -426,6 +434,15 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/BoringSSL-GRPC\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseFirestore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/Protobuf\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/gRPC-C++\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/gRPC-Core\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseFirestoreUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -442,6 +459,15 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/BoringSSL-GRPC\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseFirestore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/Protobuf\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/gRPC-C++\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/gRPC-Core\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/leveldb-library\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/nanopb\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseFirestoreUITests; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Firestore/FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.m b/Firestore/FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.m index d27cecfbe3e..6048f467719 100644 --- a/Firestore/FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.m +++ b/Firestore/FirebaseFirestoreUI/FUIFirestoreTableViewDataSource.m @@ -141,6 +141,12 @@ - (void)batchedArray:(FUIBatchedArray *)array queryDidFailWithError:(NSError *)e } } +- (void)batchedArray:(nonnull FUIBatchedArray *)array + willUpdateWithDiff:(nonnull FUISnapshotArrayDiff *)diff { + // do nothing +} + + #pragma mark - UITableViewDataSource methods - (id)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { diff --git a/Firestore/Podfile b/Firestore/Podfile index 99cf63ae3d3..a49fae05f02 100644 --- a/Firestore/Podfile +++ b/Firestore/Podfile @@ -1,4 +1,4 @@ -source 'sso://cpdc-internal/firebase' +# source 'sso://cpdc-internal/firebase' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' diff --git a/Firestore/Podfile.lock b/Firestore/Podfile.lock index 0eda466386c..da78baaae04 100644 --- a/Firestore/Podfile.lock +++ b/Firestore/Podfile.lock @@ -1,59 +1,60 @@ PODS: - - BoringSSL-GRPC (0.0.2): - - BoringSSL-GRPC/Implementation (= 0.0.2) - - BoringSSL-GRPC/Interface (= 0.0.2) - - BoringSSL-GRPC/Implementation (0.0.2): - - BoringSSL-GRPC/Interface (= 0.0.2) - - BoringSSL-GRPC/Interface (0.0.2) - - Firebase/CoreOnly (5.18.0): - - FirebaseCore (= 5.3.1) - - Firebase/Firestore (5.18.0): + - BoringSSL-GRPC (0.0.3): + - BoringSSL-GRPC/Implementation (= 0.0.3) + - BoringSSL-GRPC/Interface (= 0.0.3) + - BoringSSL-GRPC/Implementation (0.0.3): + - BoringSSL-GRPC/Interface (= 0.0.3) + - BoringSSL-GRPC/Interface (0.0.3) + - Firebase/CoreOnly (6.1.0): + - FirebaseCore (= 6.0.1) + - Firebase/Firestore (6.1.0): - Firebase/CoreOnly - - FirebaseFirestore (= 1.0.2) + - FirebaseFirestore (~> 1.3.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (5.3.1): - - GoogleUtilities/Logger (~> 5.2) - - FirebaseFirestore (1.0.2): + - FirebaseCore (6.0.1): + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/Logger (~> 6.0) + - FirebaseFirestore (1.3.1): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - FirebaseFirestore/abseil-cpp (= 1.0.2) - - "gRPC-C++ (= 0.0.6)" + - FirebaseCore (~> 6.0) + - FirebaseFirestore/abseil-cpp (= 1.3.1) + - "gRPC-C++ (= 0.0.8)" - leveldb-library (~> 1.20) - nanopb (~> 0.3.901) - Protobuf (~> 3.1) - - FirebaseFirestore/abseil-cpp (1.0.2): + - FirebaseFirestore/abseil-cpp (1.3.1): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - "gRPC-C++ (= 0.0.6)" + - FirebaseCore (~> 6.0) + - "gRPC-C++ (= 0.0.8)" - leveldb-library (~> 1.20) - nanopb (~> 0.3.901) - Protobuf (~> 3.1) - - GoogleUtilities/Environment (5.4.0) - - GoogleUtilities/Logger (5.4.0): + - GoogleUtilities/Environment (6.2.0) + - GoogleUtilities/Logger (6.2.0): - GoogleUtilities/Environment - - "gRPC-C++ (0.0.6)": - - "gRPC-C++/Implementation (= 0.0.6)" - - "gRPC-C++/Interface (= 0.0.6)" - - "gRPC-C++/Implementation (0.0.6)": - - "gRPC-C++/Interface (= 0.0.6)" - - gRPC-Core (= 1.17.0) + - "gRPC-C++ (0.0.8)": + - "gRPC-C++/Implementation (= 0.0.8)" + - "gRPC-C++/Interface (= 0.0.8)" + - "gRPC-C++/Implementation (0.0.8)": + - "gRPC-C++/Interface (= 0.0.8)" + - gRPC-Core (= 1.19.0) - nanopb (~> 0.3) - - "gRPC-C++/Interface (0.0.6)" - - gRPC-Core (1.17.0): - - gRPC-Core/Implementation (= 1.17.0) - - gRPC-Core/Interface (= 1.17.0) - - gRPC-Core/Implementation (1.17.0): - - BoringSSL-GRPC (= 0.0.2) - - gRPC-Core/Interface (= 1.17.0) + - "gRPC-C++/Interface (0.0.8)" + - gRPC-Core (1.19.0): + - gRPC-Core/Implementation (= 1.19.0) + - gRPC-Core/Interface (= 1.19.0) + - gRPC-Core/Implementation (1.19.0): + - BoringSSL-GRPC (= 0.0.3) + - gRPC-Core/Interface (= 1.19.0) - nanopb (~> 0.3) - - gRPC-Core/Interface (1.17.0) + - gRPC-Core/Interface (1.19.0) - leveldb-library (1.20) - nanopb (0.3.901): - nanopb/decode (= 0.3.901) - nanopb/encode (= 0.3.901) - nanopb/decode (0.3.901) - nanopb/encode (0.3.901) - - Protobuf (3.7.0) + - Protobuf (3.8.0) DEPENDENCIES: - Firebase/Firestore @@ -73,18 +74,18 @@ SPEC REPOS: - Protobuf SPEC CHECKSUMS: - BoringSSL-GRPC: 2a230d9cd93e7ce39916044f645cebb31f37dde6 - Firebase: 02f3281965c075426141a0ce1277e9de6649cab9 + BoringSSL-GRPC: db8764df3204ccea016e1c8dd15d9a9ad63ff318 + Firebase: 8d77bb33624ae9b62d745d82ec023de5f70f7e4f FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3 - FirebaseFirestore: ccdaffb8a73c591ff61872b8f7905ad0c237ef50 - GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560 - "gRPC-C++": e76441995900ac90e9bd98644ab4733f12521edf - gRPC-Core: 4028031ed2c5267cca0d846c876d8046b1ecb9b6 + FirebaseCore: 66bdef3b310a026880e2a5bc8aa586ab62ce4543 + FirebaseFirestore: 8feac73d330bf7ed6945518e5ffc0aeb164a07f6 + GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + "gRPC-C++": 98be881723177d8c4faf5fdffacb582c7b4971a2 + gRPC-Core: bd9472c8daa2e414b9f8038ba667bf56ce0e02b8 leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5 nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 - Protobuf: 7a877b7f3e5964e3fce995e2eb323dbc6831bb5a + Protobuf: 3f617b9a6e73605565086864c9bc26b2bf2dd5a3 -PODFILE CHECKSUM: f8a650a7bb1d18a6090109e2d8bc3fa500fb202a +PODFILE CHECKSUM: 3fd572e9b2b7003d527db1933d11971a4c10c23f -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.0 diff --git a/GoogleAuth/FirebaseGoogleAuthUI.xcodeproj/project.pbxproj b/GoogleAuth/FirebaseGoogleAuthUI.xcodeproj/project.pbxproj index 6c33afad80f..9b9d84e0c2b 100644 --- a/GoogleAuth/FirebaseGoogleAuthUI.xcodeproj/project.pbxproj +++ b/GoogleAuth/FirebaseGoogleAuthUI.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 1463CD277718C832BDA95AA3 /* Pods_FirebaseGoogleAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6EA6FE1990415F579F7D0FF /* Pods_FirebaseGoogleAuthUI.framework */; }; 8D69E4A121DE8CAF00CFA49B /* FirebaseGoogleAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D69E49721DE8CAF00CFA49B /* FirebaseGoogleAuthUI.framework */; }; 8D69E4A621DE8CAF00CFA49B /* FirebaseGoogleAuthUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E4A521DE8CAF00CFA49B /* FirebaseGoogleAuthUITests.m */; }; 8D69E4A821DE8CAF00CFA49B /* FirebaseGoogleAuthUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E49A21DE8CAF00CFA49B /* FirebaseGoogleAuthUI.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -17,7 +16,6 @@ 8D69E51021DE8CF000CFA49B /* ic_google@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E50A21DE8CF000CFA49B /* ic_google@3x.png */; }; 8D69E51121DE8CF000CFA49B /* FUIGoogleAuth.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E50B21DE8CF000CFA49B /* FUIGoogleAuth.h */; }; 8D69E51221DE8CF000CFA49B /* FUIGoogleAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E50C21DE8CF000CFA49B /* FUIGoogleAuth.m */; }; - D55C1AB08A3090264A31146B /* Pods_FirebaseGoogleAuthUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 21E81DE6B07ED03C929F0713 /* Pods_FirebaseGoogleAuthUITests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -31,10 +29,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0B28FE588389A2B83478498B /* Pods-FirebaseGoogleAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseGoogleAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseGoogleAuthUI/Pods-FirebaseGoogleAuthUI.debug.xcconfig"; sourceTree = ""; }; - 21E81DE6B07ED03C929F0713 /* Pods_FirebaseGoogleAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseGoogleAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - 288B08EC2FF94BDC5AD57754 /* Pods-FirebaseGoogleAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseGoogleAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseGoogleAuthUITests/Pods-FirebaseGoogleAuthUITests.debug.xcconfig"; sourceTree = ""; }; - 79EAE5ACBF1F20A855FFDDE4 /* Pods-FirebaseGoogleAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseGoogleAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseGoogleAuthUITests/Pods-FirebaseGoogleAuthUITests.release.xcconfig"; sourceTree = ""; }; 8D69E49721DE8CAF00CFA49B /* FirebaseGoogleAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseGoogleAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E49A21DE8CAF00CFA49B /* FirebaseGoogleAuthUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseGoogleAuthUI.h; sourceTree = ""; }; 8D69E49B21DE8CAF00CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -130,8 +124,6 @@ 8D69E50A21DE8CF000CFA49B /* ic_google@3x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "ic_google@3x.png"; sourceTree = ""; }; 8D69E50B21DE8CF000CFA49B /* FUIGoogleAuth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUIGoogleAuth.h; sourceTree = ""; }; 8D69E50C21DE8CF000CFA49B /* FUIGoogleAuth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIGoogleAuth.m; sourceTree = ""; }; - D1594C392B04FC9FDA23B586 /* Pods-FirebaseGoogleAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseGoogleAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseGoogleAuthUI/Pods-FirebaseGoogleAuthUI.release.xcconfig"; sourceTree = ""; }; - D6EA6FE1990415F579F7D0FF /* Pods_FirebaseGoogleAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseGoogleAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -139,7 +131,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 1463CD277718C832BDA95AA3 /* Pods_FirebaseGoogleAuthUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -148,42 +139,18 @@ buildActionMask = 2147483647; files = ( 8D69E4A121DE8CAF00CFA49B /* FirebaseGoogleAuthUI.framework in Frameworks */, - D55C1AB08A3090264A31146B /* Pods_FirebaseGoogleAuthUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 0F749AB5C50FFA4ED371E7E5 /* Frameworks */ = { - isa = PBXGroup; - children = ( - D6EA6FE1990415F579F7D0FF /* Pods_FirebaseGoogleAuthUI.framework */, - 21E81DE6B07ED03C929F0713 /* Pods_FirebaseGoogleAuthUITests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - 8C09E9681B56A91C5A51074F /* Pods */ = { - isa = PBXGroup; - children = ( - 0B28FE588389A2B83478498B /* Pods-FirebaseGoogleAuthUI.debug.xcconfig */, - D1594C392B04FC9FDA23B586 /* Pods-FirebaseGoogleAuthUI.release.xcconfig */, - 288B08EC2FF94BDC5AD57754 /* Pods-FirebaseGoogleAuthUITests.debug.xcconfig */, - 79EAE5ACBF1F20A855FFDDE4 /* Pods-FirebaseGoogleAuthUITests.release.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; 8D69E48D21DE8CAF00CFA49B = { isa = PBXGroup; children = ( 8D69E49921DE8CAF00CFA49B /* FirebaseGoogleAuthUI */, 8D69E4A421DE8CAF00CFA49B /* FirebaseGoogleAuthUITests */, 8D69E49821DE8CAF00CFA49B /* Products */, - 8C09E9681B56A91C5A51074F /* Pods */, - 0F749AB5C50FFA4ED371E7E5 /* Frameworks */, ); sourceTree = ""; }; @@ -255,12 +222,10 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E4AB21DE8CAF00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseGoogleAuthUI" */; buildPhases = ( - 085538C6FDAF63B766ECC28F /* [CP] Check Pods Manifest.lock */, 8D69E49221DE8CAF00CFA49B /* Headers */, 8D69E49321DE8CAF00CFA49B /* Sources */, 8D69E49421DE8CAF00CFA49B /* Frameworks */, 8D69E49521DE8CAF00CFA49B /* Resources */, - 8C4D6E3DA589E87A07781FA6 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -275,11 +240,9 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E4AE21DE8CAF00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseGoogleAuthUITests" */; buildPhases = ( - 05F26EAD2B19EC500B25FA79 /* [CP] Check Pods Manifest.lock */, 8D69E49C21DE8CAF00CFA49B /* Sources */, 8D69E49D21DE8CAF00CFA49B /* Frameworks */, 8D69E49E21DE8CAF00CFA49B /* Resources */, - D8A80FA2C30855944E781FDF /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -430,99 +393,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 05F26EAD2B19EC500B25FA79 /* [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-FirebaseGoogleAuthUITests-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; - }; - 085538C6FDAF63B766ECC28F /* [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-FirebaseGoogleAuthUI-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; - }; - 8C4D6E3DA589E87A07781FA6 /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebaseGoogleAuthUI/Pods-FirebaseGoogleAuthUI-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle", - "${PODS_ROOT}/GoogleSignIn/Resources/GoogleSignIn.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle", - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/GoogleSignIn.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseGoogleAuthUI/Pods-FirebaseGoogleAuthUI-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - D8A80FA2C30855944E781FDF /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebaseGoogleAuthUITests/Pods-FirebaseGoogleAuthUITests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseGoogleAuthUITests/Pods-FirebaseGoogleAuthUITests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - /* Begin PBXSourcesBuildPhase section */ 8D69E49321DE8CAF00CFA49B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -765,7 +635,6 @@ }; 8D69E4AC21DE8CAF00CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 0B28FE588389A2B83478498B /* Pods-FirebaseGoogleAuthUI.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -817,7 +686,6 @@ }; 8D69E4AD21DE8CAF00CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = D1594C392B04FC9FDA23B586 /* Pods-FirebaseGoogleAuthUI.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -869,7 +737,6 @@ }; 8D69E4AF21DE8CAF00CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 288B08EC2FF94BDC5AD57754 /* Pods-FirebaseGoogleAuthUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseGoogleAuthUITests/Info.plist; @@ -877,6 +744,13 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleToolboxForMac\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_ROOT}/GoogleSignIn/Frameworks\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -913,7 +787,6 @@ }; 8D69E4B021DE8CAF00CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 79EAE5ACBF1F20A855FFDDE4 /* Pods-FirebaseGoogleAuthUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseGoogleAuthUITests/Info.plist; @@ -921,6 +794,13 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleToolboxForMac\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_ROOT}/GoogleSignIn/Frameworks\"", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/GoogleAuth/Podfile b/GoogleAuth/Podfile index c76c1d8a5d2..de193b6f18f 100644 --- a/GoogleAuth/Podfile +++ b/GoogleAuth/Podfile @@ -1,4 +1,4 @@ -source 'sso://cpdc-internal/firebase' +# source 'sso://cpdc-internal/firebase' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '9.0' diff --git a/GoogleAuth/Podfile.lock b/GoogleAuth/Podfile.lock index 70c955a0fc9..4e0bbfe6e24 100644 --- a/GoogleAuth/Podfile.lock +++ b/GoogleAuth/Podfile.lock @@ -1,38 +1,51 @@ PODS: - - Firebase/Auth (5.18.0): + - Firebase/Auth (6.1.0): - Firebase/CoreOnly - - FirebaseAuth (= 5.4.0) - - Firebase/CoreOnly (5.18.0): - - FirebaseCore (= 5.3.1) - - FirebaseAuth (5.4.0): + - FirebaseAuth (~> 6.1.0) + - Firebase/CoreOnly (6.1.0): + - FirebaseCore (= 6.0.1) + - FirebaseAuth (6.1.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - GoogleUtilities/Environment (~> 5.2) + - FirebaseCore (~> 6.0) + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/Environment (~> 6.0) - GTMSessionFetcher/Core (~> 1.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (5.3.1): - - GoogleUtilities/Logger (~> 5.2) - - FirebaseUI/Auth (6.2.1): - - Firebase/Auth (~> 5.4) + - FirebaseCore (6.0.1): + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/Logger (~> 6.0) + - FirebaseUI/Auth (7.0.0): + - Firebase/Auth (~> 6.0) - GoogleUtilities/UserDefaults - GoogleSignIn (4.4.0): - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" - "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)" - GTMSessionFetcher/Core (~> 1.1) - - GoogleToolboxForMac/DebugUtils (2.2.0): - - GoogleToolboxForMac/Defines (= 2.2.0) - - GoogleToolboxForMac/Defines (2.2.0) - - "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.0)": - - GoogleToolboxForMac/DebugUtils (= 2.2.0) - - GoogleToolboxForMac/Defines (= 2.2.0) - - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.0)" - - "GoogleToolboxForMac/NSString+URLArguments (2.2.0)" - - GoogleUtilities/Environment (5.4.0) - - GoogleUtilities/Logger (5.4.0): + - GoogleToolboxForMac/DebugUtils (2.2.1): + - GoogleToolboxForMac/Defines (= 2.2.1) + - GoogleToolboxForMac/Defines (2.2.1) + - "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.1)": + - GoogleToolboxForMac/DebugUtils (= 2.2.1) + - GoogleToolboxForMac/Defines (= 2.2.1) + - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.1)" + - "GoogleToolboxForMac/NSString+URLArguments (2.2.1)" + - GoogleUtilities/AppDelegateSwizzler (6.2.0): - GoogleUtilities/Environment - - GoogleUtilities/UserDefaults (5.4.0): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (1.2.1) + - GoogleUtilities/Network + - GoogleUtilities/Environment (6.2.0) + - GoogleUtilities/Logger (6.2.0): + - GoogleUtilities/Environment + - GoogleUtilities/Network (6.2.0): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (6.2.0)" + - GoogleUtilities/Reachability (6.2.0): + - GoogleUtilities/Logger + - GoogleUtilities/UserDefaults (6.2.0): + - GoogleUtilities/Logger + - GTMSessionFetcher/Core (1.2.2) - OCMock (3.4.3) DEPENDENCIES: @@ -57,17 +70,17 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Firebase: 02f3281965c075426141a0ce1277e9de6649cab9 - FirebaseAuth: d85d052354447f30b4b2a805ab91b511458b56a6 + Firebase: 8d77bb33624ae9b62d745d82ec023de5f70f7e4f + FirebaseAuth: 4281d6d98a90881e00710fa8d9e37c2ccdfc7d80 FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3 - FirebaseUI: a2edbe63a90dff4a9ac715f4dd2869411528eedc + FirebaseCore: 66bdef3b310a026880e2a5bc8aa586ab62ce4543 + FirebaseUI: f9367cd5cacde991d9bcce9278d3fcb858f84f6a GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39 - GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d - GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560 - GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca + GoogleToolboxForMac: b3553629623a3b1bff17f555e736cd5a6d95ad55 + GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab -PODFILE CHECKSUM: 89eb1d2f066cf045b8fc6fa60f193d0b5835639e +PODFILE CHECKSUM: ca2b3387ec9065b83811f62eaabb0fc9d328f688 -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.0 diff --git a/OAuth/FirebaseOAuthUI.xcodeproj/project.pbxproj b/OAuth/FirebaseOAuthUI.xcodeproj/project.pbxproj index 3ae5e009d3a..6a20bcfa53e 100644 --- a/OAuth/FirebaseOAuthUI.xcodeproj/project.pbxproj +++ b/OAuth/FirebaseOAuthUI.xcodeproj/project.pbxproj @@ -14,6 +14,8 @@ 8D69E22E21DD476D00CFA49B /* FirebaseOAuthUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E22021DD476D00CFA49B /* FirebaseOAuthUI.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8D69E23921DD47B400CFA49B /* FUIOAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E23721DD47B400CFA49B /* FUIOAuth.m */; }; 8D69E23A21DD47B400CFA49B /* FUIOAuth.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E23821DD47B400CFA49B /* FUIOAuth.h */; settings = {ATTRIBUTES = (Public, ); }; }; + BCA3C54639AFD3478AF0340B /* Pods_FirebaseOAuthUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8C0EAB722B63AB12FA783AB /* Pods_FirebaseOAuthUITests.framework */; }; + C6797D8923E539512ADDC0C6 /* Pods_FirebaseOAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2476E06100F3DF2D4B2A0DC2 /* Pods_FirebaseOAuthUI.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -27,9 +29,9 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 155F53D010178319240C0A07 /* Pods-FirebaseOAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseOAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseOAuthUITests/Pods-FirebaseOAuthUITests.release.xcconfig"; sourceTree = ""; }; - 1AA327BECE2E8C522D7A8534 /* Pods-FirebaseOAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseOAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseOAuthUI/Pods-FirebaseOAuthUI.release.xcconfig"; sourceTree = ""; }; - 33C5885B143447ADBC597032 /* Pods-FirebaseOAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseOAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseOAuthUI/Pods-FirebaseOAuthUI.debug.xcconfig"; sourceTree = ""; }; + 0F0125A86AC4AE57392C5CF1 /* Pods-FirebaseOAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseOAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseOAuthUI/Pods-FirebaseOAuthUI.debug.xcconfig"; sourceTree = ""; }; + 2476E06100F3DF2D4B2A0DC2 /* Pods_FirebaseOAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseOAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 5B268BE63C5FC2E4F46FC9A1 /* Pods-FirebaseOAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseOAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseOAuthUITests/Pods-FirebaseOAuthUITests.debug.xcconfig"; sourceTree = ""; }; 8D69E21D21DD476C00CFA49B /* FirebaseOAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseOAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E22021DD476D00CFA49B /* FirebaseOAuthUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseOAuthUI.h; sourceTree = ""; }; 8D69E22121DD476D00CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -38,9 +40,9 @@ 8D69E22D21DD476D00CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 8D69E23721DD47B400CFA49B /* FUIOAuth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIOAuth.m; sourceTree = ""; }; 8D69E23821DD47B400CFA49B /* FUIOAuth.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUIOAuth.h; sourceTree = ""; }; - A116B9EACA0AD9E4789F3725 /* Pods-FirebaseOAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseOAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseOAuthUITests/Pods-FirebaseOAuthUITests.debug.xcconfig"; sourceTree = ""; }; - B60787908B36BB906D6F8967 /* Pods_FirebaseOAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseOAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - D7B9FBC9CB581E1609617A32 /* Pods_FirebaseOAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseOAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C8C0EAB722B63AB12FA783AB /* Pods_FirebaseOAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseOAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + D1AC9683D496BA3C33FCA1A2 /* Pods-FirebaseOAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseOAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseOAuthUI/Pods-FirebaseOAuthUI.release.xcconfig"; sourceTree = ""; }; + FC3F299AB618B7CEE815641B /* Pods-FirebaseOAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseOAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseOAuthUITests/Pods-FirebaseOAuthUITests.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -48,7 +50,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 7EFA5B64375216155095F4EE /* Pods_FirebaseOAuthUI.framework in Frameworks */, + C6797D8923E539512ADDC0C6 /* Pods_FirebaseOAuthUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -57,18 +59,18 @@ buildActionMask = 2147483647; files = ( 8D69E22721DD476D00CFA49B /* FirebaseOAuthUI.framework in Frameworks */, - 4F876AD0DEA8CE209BED9E6D /* Pods_FirebaseOAuthUITests.framework in Frameworks */, + BCA3C54639AFD3478AF0340B /* Pods_FirebaseOAuthUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1B0D33E8AFE29DE952445C11 /* Frameworks */ = { + 1E134AB844CD7BA2962C90D1 /* Frameworks */ = { isa = PBXGroup; children = ( - D7B9FBC9CB581E1609617A32 /* Pods_FirebaseOAuthUI.framework */, - B60787908B36BB906D6F8967 /* Pods_FirebaseOAuthUITests.framework */, + 2476E06100F3DF2D4B2A0DC2 /* Pods_FirebaseOAuthUI.framework */, + C8C0EAB722B63AB12FA783AB /* Pods_FirebaseOAuthUITests.framework */, ); name = Frameworks; sourceTree = ""; @@ -76,10 +78,10 @@ 5763488F2FEC8FD187D3A6FB /* Pods */ = { isa = PBXGroup; children = ( - 33C5885B143447ADBC597032 /* Pods-FirebaseOAuthUI.debug.xcconfig */, - 1AA327BECE2E8C522D7A8534 /* Pods-FirebaseOAuthUI.release.xcconfig */, - A116B9EACA0AD9E4789F3725 /* Pods-FirebaseOAuthUITests.debug.xcconfig */, - 155F53D010178319240C0A07 /* Pods-FirebaseOAuthUITests.release.xcconfig */, + 0F0125A86AC4AE57392C5CF1 /* Pods-FirebaseOAuthUI.debug.xcconfig */, + D1AC9683D496BA3C33FCA1A2 /* Pods-FirebaseOAuthUI.release.xcconfig */, + 5B268BE63C5FC2E4F46FC9A1 /* Pods-FirebaseOAuthUITests.debug.xcconfig */, + FC3F299AB618B7CEE815641B /* Pods-FirebaseOAuthUITests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -91,7 +93,7 @@ 8D69E22A21DD476D00CFA49B /* FirebaseOAuthUITests */, 8D69E21E21DD476C00CFA49B /* Products */, 5763488F2FEC8FD187D3A6FB /* Pods */, - 1B0D33E8AFE29DE952445C11 /* Frameworks */, + 1E134AB844CD7BA2962C90D1 /* Frameworks */, ); sourceTree = ""; }; @@ -143,12 +145,12 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E23121DD476D00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseOAuthUI" */; buildPhases = ( - 762B8A6E48104309D143C852 /* [CP] Check Pods Manifest.lock */, + 7690934EAA7AF46F5B53C8A0 /* [CP] Check Pods Manifest.lock */, 8D69E21821DD476C00CFA49B /* Headers */, 8D69E21921DD476C00CFA49B /* Sources */, 8D69E21A21DD476C00CFA49B /* Frameworks */, 8D69E21B21DD476C00CFA49B /* Resources */, - 6CFBD3FEF6A5E2100C747507 /* [CP] Copy Pods Resources */, + A6AADD81B2835EAAB7081763 /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -163,11 +165,11 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E23421DD476D00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseOAuthUITests" */; buildPhases = ( - EF45A834CF9F7F74428983B7 /* [CP] Check Pods Manifest.lock */, + 022921C222F16DC87A286920 /* [CP] Check Pods Manifest.lock */, 8D69E22221DD476D00CFA49B /* Sources */, 8D69E22321DD476D00CFA49B /* Frameworks */, 8D69E22421DD476D00CFA49B /* Resources */, - 9A8EE317848A73891934DD51 /* [CP] Embed Pods Frameworks */, + DC772C1242B29C758CF55AAB /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -232,7 +234,7 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ - 6CFBD3FEF6A5E2100C747507 /* [CP] Copy Pods Resources */ = { + 022921C222F16DC87A286920 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -240,21 +242,21 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebaseOAuthUI/Pods-FirebaseOAuthUI-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle", + "${PODS_PODFILE_DIR_PATH}/Podfile.lock", + "${PODS_ROOT}/Manifest.lock", ); - name = "[CP] Copy Pods Resources"; + name = "[CP] Check Pods Manifest.lock"; outputFileListPaths = ( ); outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle", + "$(DERIVED_FILE_DIR)/Pods-FirebaseOAuthUITests-checkManifestLockResult.txt", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseOAuthUI/Pods-FirebaseOAuthUI-resources.sh\"\n"; + 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; }; - 762B8A6E48104309D143C852 /* [CP] Check Pods Manifest.lock */ = { + 7690934EAA7AF46F5B53C8A0 /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -276,7 +278,7 @@ 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; }; - 9A8EE317848A73891934DD51 /* [CP] Embed Pods Frameworks */ = { + A6AADD81B2835EAAB7081763 /* [CP] Copy Pods Resources */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -284,21 +286,21 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebaseOAuthUITests/Pods-FirebaseOAuthUITests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", + "${PODS_ROOT}/Target Support Files/Pods-FirebaseOAuthUI/Pods-FirebaseOAuthUI-resources.sh", + "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle", ); - name = "[CP] Embed Pods Frameworks"; + name = "[CP] Copy Pods Resources"; outputFileListPaths = ( ); outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", + "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle", ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseOAuthUITests/Pods-FirebaseOAuthUITests-frameworks.sh\"\n"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseOAuthUI/Pods-FirebaseOAuthUI-resources.sh\"\n"; showEnvVarsInLog = 0; }; - EF45A834CF9F7F74428983B7 /* [CP] Check Pods Manifest.lock */ = { + DC772C1242B29C758CF55AAB /* [CP] Embed Pods Frameworks */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; files = ( @@ -306,18 +308,18 @@ inputFileListPaths = ( ); inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", + "${PODS_ROOT}/Target Support Files/Pods-FirebaseOAuthUITests/Pods-FirebaseOAuthUITests-frameworks.sh", + "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", ); - name = "[CP] Check Pods Manifest.lock"; + name = "[CP] Embed Pods Frameworks"; outputFileListPaths = ( ); outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-FirebaseOAuthUITests-checkManifestLockResult.txt", + "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", ); 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"; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseOAuthUITests/Pods-FirebaseOAuthUITests-frameworks.sh\"\n"; showEnvVarsInLog = 0; }; /* End PBXShellScriptBuildPhase section */ @@ -470,7 +472,7 @@ }; 8D69E23221DD476D00CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 33C5885B143447ADBC597032 /* Pods-FirebaseOAuthUI.debug.xcconfig */; + baseConfigurationReference = 0F0125A86AC4AE57392C5CF1 /* Pods-FirebaseOAuthUI.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -494,7 +496,7 @@ }; 8D69E23321DD476D00CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1AA327BECE2E8C522D7A8534 /* Pods-FirebaseOAuthUI.release.xcconfig */; + baseConfigurationReference = D1AC9683D496BA3C33FCA1A2 /* Pods-FirebaseOAuthUI.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -518,7 +520,7 @@ }; 8D69E23521DD476D00CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A116B9EACA0AD9E4789F3725 /* Pods-FirebaseOAuthUITests.debug.xcconfig */; + baseConfigurationReference = 5B268BE63C5FC2E4F46FC9A1 /* Pods-FirebaseOAuthUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseOAuthUITests/Info.plist; @@ -526,6 +528,12 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/OCMock\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -544,7 +552,7 @@ }; 8D69E23621DD476D00CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 155F53D010178319240C0A07 /* Pods-FirebaseOAuthUITests.release.xcconfig */; + baseConfigurationReference = FC3F299AB618B7CEE815641B /* Pods-FirebaseOAuthUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseOAuthUITests/Info.plist; @@ -552,6 +560,12 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/OCMock\"", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/OAuth/FirebaseOAuthUITests/FirebaseOAuthUITests.m b/OAuth/FirebaseOAuthUITests/FirebaseOAuthUITests.m index 7af434290ad..9eb9e100443 100644 --- a/OAuth/FirebaseOAuthUITests/FirebaseOAuthUITests.m +++ b/OAuth/FirebaseOAuthUITests/FirebaseOAuthUITests.m @@ -54,7 +54,8 @@ - (void)setUp { buttonColor:[UIColor clearColor] iconImage:[UIImage imageNamed:@""] scopes:@[] - customParameters:@{}]; + customParameters:@{} + loginHintKey:nil]; } - (void)tearDown { @@ -64,11 +65,11 @@ - (void)tearDown { - (void)testProviderValidity { XCTAssertNotNil(self.provider); - XCTAssertNotNil(self.provider.icon); + XCTAssertNil(self.provider.icon); XCTAssertNotNil(self.provider.signInLabel); XCTAssertNotNil(self.provider.buttonBackgroundColor); XCTAssertNotNil(self.provider.buttonTextColor); - XCTAssertNil(self.provider.providerID); + XCTAssertNotNil(self.provider.providerID); XCTAssertNotNil(self.provider.shortName); XCTAssertTrue(self.provider.signInLabel.length != 0); XCTAssertNil(self.provider.accessToken); diff --git a/OAuth/Podfile b/OAuth/Podfile index 3b2c6a326b5..068c3b44ce7 100644 --- a/OAuth/Podfile +++ b/OAuth/Podfile @@ -1,4 +1,4 @@ -source 'sso://cpdc-internal/firebase' +# source 'sso://cpdc-internal/firebase' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' diff --git a/PhoneAuth/FirebasePhoneAuthUI.xcodeproj/project.pbxproj b/PhoneAuth/FirebasePhoneAuthUI.xcodeproj/project.pbxproj index 1f241e7c9a0..c0c5e12a9a1 100644 --- a/PhoneAuth/FirebasePhoneAuthUI.xcodeproj/project.pbxproj +++ b/PhoneAuth/FirebasePhoneAuthUI.xcodeproj/project.pbxproj @@ -7,7 +7,6 @@ objects = { /* Begin PBXBuildFile section */ - 3FD466F15358BA7A9C892D72 /* Pods_FirebasePhoneAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DB0C41782CCD42879F957EE6 /* Pods_FirebasePhoneAuthUI.framework */; }; 8D69E54B21DE915A00CFA49B /* FirebasePhoneAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D69E54121DE915A00CFA49B /* FirebasePhoneAuthUI.framework */; }; 8D69E55021DE915A00CFA49B /* FirebasePhoneAuthUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E54F21DE915A00CFA49B /* FirebasePhoneAuthUITests.m */; }; 8D69E55221DE915A00CFA49B /* FirebasePhoneAuthUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E54421DE915A00CFA49B /* FirebasePhoneAuthUI.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -43,7 +42,6 @@ 8D69E5EF21DE91D400CFA49B /* FUIPhoneAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E5CF21DE91D300CFA49B /* FUIPhoneAuth.m */; }; 8D69E5F021DE91D400CFA49B /* FUICodeField.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E5D021DE91D300CFA49B /* FUICodeField.h */; }; 8D69E5F121DE91D400CFA49B /* FUIPhoneEntryViewController.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E5D121DE91D300CFA49B /* FUIPhoneEntryViewController.h */; }; - F31E3169C66DE4A246648239 /* Pods_FirebasePhoneAuthUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DFCC6D9C946F568C9B88D064 /* Pods_FirebasePhoneAuthUITests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -57,9 +55,6 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 2C64036A6184E4EF6A740D0B /* Pods-FirebasePhoneAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebasePhoneAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebasePhoneAuthUI/Pods-FirebasePhoneAuthUI.debug.xcconfig"; sourceTree = ""; }; - 4110DEDAD8A2F59A729C91F1 /* Pods-FirebasePhoneAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebasePhoneAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebasePhoneAuthUITests/Pods-FirebasePhoneAuthUITests.release.xcconfig"; sourceTree = ""; }; - 4EFCC1592A53A17FF0AAA9B9 /* Pods-FirebasePhoneAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebasePhoneAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebasePhoneAuthUITests/Pods-FirebasePhoneAuthUITests.debug.xcconfig"; sourceTree = ""; }; 8D69E54121DE915A00CFA49B /* FirebasePhoneAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebasePhoneAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E54421DE915A00CFA49B /* FirebasePhoneAuthUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebasePhoneAuthUI.h; sourceTree = ""; }; 8D69E54521DE915A00CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -181,9 +176,6 @@ 8D69E5CF21DE91D300CFA49B /* FUIPhoneAuth.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIPhoneAuth.m; sourceTree = ""; }; 8D69E5D021DE91D300CFA49B /* FUICodeField.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUICodeField.h; sourceTree = ""; }; 8D69E5D121DE91D300CFA49B /* FUIPhoneEntryViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUIPhoneEntryViewController.h; sourceTree = ""; }; - B0AD5B1C72E5C1963BAD35FF /* Pods-FirebasePhoneAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebasePhoneAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebasePhoneAuthUI/Pods-FirebasePhoneAuthUI.release.xcconfig"; sourceTree = ""; }; - DB0C41782CCD42879F957EE6 /* Pods_FirebasePhoneAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebasePhoneAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - DFCC6D9C946F568C9B88D064 /* Pods_FirebasePhoneAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebasePhoneAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -191,7 +183,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 3FD466F15358BA7A9C892D72 /* Pods_FirebasePhoneAuthUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -200,21 +191,26 @@ buildActionMask = 2147483647; files = ( 8D69E54B21DE915A00CFA49B /* FirebasePhoneAuthUI.framework in Frameworks */, - F31E3169C66DE4A246648239 /* Pods_FirebasePhoneAuthUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 4132CF4029104D5AA0E7B64A /* Pods */ = { + isa = PBXGroup; + children = ( + ); + path = Pods; + sourceTree = ""; + }; 8D69E53721DE915A00CFA49B = { isa = PBXGroup; children = ( 8D69E54321DE915A00CFA49B /* FirebasePhoneAuthUI */, 8D69E54E21DE915A00CFA49B /* FirebasePhoneAuthUITests */, 8D69E54221DE915A00CFA49B /* Products */, - C183DC39F7F4152570A2B714 /* Pods */, - BD2BBF05F70801BB10EF3213 /* Frameworks */, + 4132CF4029104D5AA0E7B64A /* Pods */, ); sourceTree = ""; }; @@ -301,27 +297,6 @@ path = CountryCode; sourceTree = ""; }; - BD2BBF05F70801BB10EF3213 /* Frameworks */ = { - isa = PBXGroup; - children = ( - DB0C41782CCD42879F957EE6 /* Pods_FirebasePhoneAuthUI.framework */, - DFCC6D9C946F568C9B88D064 /* Pods_FirebasePhoneAuthUITests.framework */, - ); - name = Frameworks; - sourceTree = ""; - }; - C183DC39F7F4152570A2B714 /* Pods */ = { - isa = PBXGroup; - children = ( - 2C64036A6184E4EF6A740D0B /* Pods-FirebasePhoneAuthUI.debug.xcconfig */, - B0AD5B1C72E5C1963BAD35FF /* Pods-FirebasePhoneAuthUI.release.xcconfig */, - 4EFCC1592A53A17FF0AAA9B9 /* Pods-FirebasePhoneAuthUITests.debug.xcconfig */, - 4110DEDAD8A2F59A729C91F1 /* Pods-FirebasePhoneAuthUITests.release.xcconfig */, - ); - name = Pods; - path = Pods; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -352,12 +327,10 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E55521DE915A00CFA49B /* Build configuration list for PBXNativeTarget "FirebasePhoneAuthUI" */; buildPhases = ( - F9CF617381B828B54D58A711 /* [CP] Check Pods Manifest.lock */, 8D69E53C21DE915A00CFA49B /* Headers */, 8D69E53D21DE915A00CFA49B /* Sources */, 8D69E53E21DE915A00CFA49B /* Frameworks */, 8D69E53F21DE915A00CFA49B /* Resources */, - 94CA26679D051D5468D8B69C /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -372,11 +345,9 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E55821DE915A00CFA49B /* Build configuration list for PBXNativeTarget "FirebasePhoneAuthUITests" */; buildPhases = ( - 1C7CCF8DADCCD464CF73BDE5 /* [CP] Check Pods Manifest.lock */, 8D69E54621DE915A00CFA49B /* Sources */, 8D69E54721DE915A00CFA49B /* Frameworks */, 8D69E54821DE915A00CFA49B /* Resources */, - C5A964C4CEA26FE6204D25B8 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -532,97 +503,6 @@ }; /* End PBXResourcesBuildPhase section */ -/* Begin PBXShellScriptBuildPhase section */ - 1C7CCF8DADCCD464CF73BDE5 /* [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-FirebasePhoneAuthUITests-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; - }; - 94CA26679D051D5468D8B69C /* [CP] Copy Pods Resources */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebasePhoneAuthUI/Pods-FirebasePhoneAuthUI-resources.sh", - "${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI/FirebaseAuthUI.bundle", - ); - name = "[CP] Copy Pods Resources"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/FirebaseAuthUI.bundle", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebasePhoneAuthUI/Pods-FirebasePhoneAuthUI-resources.sh\"\n"; - showEnvVarsInLog = 0; - }; - C5A964C4CEA26FE6204D25B8 /* [CP] Embed Pods Frameworks */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_ROOT}/Target Support Files/Pods-FirebasePhoneAuthUITests/Pods-FirebasePhoneAuthUITests-frameworks.sh", - "${BUILT_PRODUCTS_DIR}/OCMock/OCMock.framework", - ); - name = "[CP] Embed Pods Frameworks"; - outputFileListPaths = ( - ); - outputPaths = ( - "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/OCMock.framework", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebasePhoneAuthUITests/Pods-FirebasePhoneAuthUITests-frameworks.sh\"\n"; - showEnvVarsInLog = 0; - }; - F9CF617381B828B54D58A711 /* [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-FirebasePhoneAuthUI-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 */ 8D69E53D21DE915A00CFA49B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -875,7 +755,6 @@ }; 8D69E55621DE915A00CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 2C64036A6184E4EF6A740D0B /* Pods-FirebasePhoneAuthUI.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -899,7 +778,6 @@ }; 8D69E55721DE915A00CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = B0AD5B1C72E5C1963BAD35FF /* Pods-FirebasePhoneAuthUI.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -923,7 +801,6 @@ }; 8D69E55921DE915A00CFA49B /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4EFCC1592A53A17FF0AAA9B9 /* Pods-FirebasePhoneAuthUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebasePhoneAuthUITests/Info.plist; @@ -931,6 +808,11 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", ); OTHER_LDFLAGS = ( "-ObjC", @@ -957,7 +839,6 @@ }; 8D69E55A21DE915A00CFA49B /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 4110DEDAD8A2F59A729C91F1 /* Pods-FirebasePhoneAuthUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebasePhoneAuthUITests/Info.plist; @@ -965,6 +846,11 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseAuth\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseUI\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", ); OTHER_LDFLAGS = ( "-ObjC", diff --git a/PhoneAuth/Podfile b/PhoneAuth/Podfile index 0c934ab7672..b5f93c0563e 100644 --- a/PhoneAuth/Podfile +++ b/PhoneAuth/Podfile @@ -1,4 +1,4 @@ -source 'sso://cpdc-internal/firebase' +# source 'sso://cpdc-internal/firebase' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' diff --git a/PhoneAuth/Podfile.lock b/PhoneAuth/Podfile.lock index a4690bc3d1c..ae8fb327ad6 100644 --- a/PhoneAuth/Podfile.lock +++ b/PhoneAuth/Podfile.lock @@ -1,26 +1,39 @@ PODS: - - Firebase/Auth (5.18.0): + - Firebase/Auth (6.1.0): - Firebase/CoreOnly - - FirebaseAuth (= 5.4.0) - - Firebase/CoreOnly (5.18.0): - - FirebaseCore (= 5.3.1) - - FirebaseAuth (5.4.0): + - FirebaseAuth (~> 6.1.0) + - Firebase/CoreOnly (6.1.0): + - FirebaseCore (= 6.0.1) + - FirebaseAuth (6.1.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - GoogleUtilities/Environment (~> 5.2) + - FirebaseCore (~> 6.0) + - GoogleUtilities/AppDelegateSwizzler (~> 6.0) + - GoogleUtilities/Environment (~> 6.0) - GTMSessionFetcher/Core (~> 1.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (5.3.1): - - GoogleUtilities/Logger (~> 5.2) - - FirebaseUI/Auth (6.2.1): - - Firebase/Auth (~> 5.4) + - FirebaseCore (6.0.1): + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/Logger (~> 6.0) + - FirebaseUI/Auth (7.0.0): + - Firebase/Auth (~> 6.0) - GoogleUtilities/UserDefaults - - GoogleUtilities/Environment (5.4.0) - - GoogleUtilities/Logger (5.4.0): + - GoogleUtilities/AppDelegateSwizzler (6.2.0): - GoogleUtilities/Environment - - GoogleUtilities/UserDefaults (5.4.0): - GoogleUtilities/Logger - - GTMSessionFetcher/Core (1.2.1) + - GoogleUtilities/Network + - GoogleUtilities/Environment (6.2.0) + - GoogleUtilities/Logger (6.2.0): + - GoogleUtilities/Environment + - GoogleUtilities/Network (6.2.0): + - GoogleUtilities/Logger + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (6.2.0)" + - GoogleUtilities/Reachability (6.2.0): + - GoogleUtilities/Logger + - GoogleUtilities/UserDefaults (6.2.0): + - GoogleUtilities/Logger + - GTMSessionFetcher/Core (1.2.2) - OCMock (3.4.3) DEPENDENCIES: @@ -42,15 +55,15 @@ EXTERNAL SOURCES: :path: "../" SPEC CHECKSUMS: - Firebase: 02f3281965c075426141a0ce1277e9de6649cab9 - FirebaseAuth: d85d052354447f30b4b2a805ab91b511458b56a6 + Firebase: 8d77bb33624ae9b62d745d82ec023de5f70f7e4f + FirebaseAuth: 4281d6d98a90881e00710fa8d9e37c2ccdfc7d80 FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3 - FirebaseUI: a2edbe63a90dff4a9ac715f4dd2869411528eedc - GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560 - GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca + FirebaseCore: 66bdef3b310a026880e2a5bc8aa586ab62ce4543 + FirebaseUI: f9367cd5cacde991d9bcce9278d3fcb858f84f6a + GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab -PODFILE CHECKSUM: b68a78c3ab0c6c49eeb25ee6bc24eb300c069cc5 +PODFILE CHECKSUM: 1dde70927cc7817510a860e219580b5e319d97fc -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.0 diff --git a/Storage/FirebaseStorageUI.xcodeproj/project.pbxproj b/Storage/FirebaseStorageUI.xcodeproj/project.pbxproj index 2c64e738405..ac9d4df2838 100644 --- a/Storage/FirebaseStorageUI.xcodeproj/project.pbxproj +++ b/Storage/FirebaseStorageUI.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 2C104ECEB924319EFF003F87 /* Pods_FirebaseStorageUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = A5C8957A3AC2CB1742FBEDD3 /* Pods_FirebaseStorageUITests.framework */; }; 32450161224B963B00AF2E90 /* FUIStorageImageLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = 3245015F224B963B00AF2E90 /* FUIStorageImageLoader.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32450162224B963B00AF2E90 /* FUIStorageImageLoader.m in Sources */ = {isa = PBXBuildFile; fileRef = 32450160224B963B00AF2E90 /* FUIStorageImageLoader.m */; }; 32450165224B96B400AF2E90 /* NSURL+FirebaseStorage.h in Headers */ = {isa = PBXBuildFile; fileRef = 32450163224B96B400AF2E90 /* NSURL+FirebaseStorage.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -15,6 +16,7 @@ 3245016E224B987400AF2E90 /* FUIStorageDefine.m in Sources */ = {isa = PBXBuildFile; fileRef = 3245016C224B987400AF2E90 /* FUIStorageDefine.m */; }; 32A5DB2722755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.h in Headers */ = {isa = PBXBuildFile; fileRef = 32A5DB2522755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.h */; settings = {ATTRIBUTES = (Public, ); }; }; 32A5DB2822755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 32A5DB2622755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.m */; }; + 8064F7C450331CB287932F2E /* Pods_FirebaseStorageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7221D88AF442AC8A50757733 /* Pods_FirebaseStorageUI.framework */; }; 8D69E60621DE968300CFA49B /* FirebaseStorageUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 8D69E5FC21DE968300CFA49B /* FirebaseStorageUI.framework */; }; 8D69E60D21DE968300CFA49B /* FirebaseStorageUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E5FF21DE968300CFA49B /* FirebaseStorageUI.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8D69E61821DE96CF00CFA49B /* UIImageView+FirebaseStorage.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E61621DE96CF00CFA49B /* UIImageView+FirebaseStorage.m */; }; @@ -33,6 +35,7 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 1E87C650E54C0206A30BF83F /* Pods-FirebaseStorageUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseStorageUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseStorageUI/Pods-FirebaseStorageUI.debug.xcconfig"; sourceTree = ""; }; 3245015F224B963B00AF2E90 /* FUIStorageImageLoader.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FUIStorageImageLoader.h; sourceTree = ""; }; 32450160224B963B00AF2E90 /* FUIStorageImageLoader.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUIStorageImageLoader.m; sourceTree = ""; }; 32450163224B96B400AF2E90 /* NSURL+FirebaseStorage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "NSURL+FirebaseStorage.h"; sourceTree = ""; }; @@ -41,6 +44,9 @@ 3245016C224B987400AF2E90 /* FUIStorageDefine.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = FUIStorageDefine.m; sourceTree = ""; }; 32A5DB2522755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "FIRStorageDownloadTask+SDWebImage.h"; sourceTree = ""; }; 32A5DB2622755E480029B3D5 /* FIRStorageDownloadTask+SDWebImage.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = "FIRStorageDownloadTask+SDWebImage.m"; sourceTree = ""; }; + 36EBD440217813CE222C96A7 /* Pods-FirebaseStorageUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseStorageUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseStorageUITests/Pods-FirebaseStorageUITests.release.xcconfig"; sourceTree = ""; }; + 51A6848D2F65A3D138BE3886 /* Pods-FirebaseStorageUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseStorageUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseStorageUITests/Pods-FirebaseStorageUITests.debug.xcconfig"; sourceTree = ""; }; + 7221D88AF442AC8A50757733 /* Pods_FirebaseStorageUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseStorageUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E5FC21DE968300CFA49B /* FirebaseStorageUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseStorageUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E5FF21DE968300CFA49B /* FirebaseStorageUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseStorageUI.h; sourceTree = ""; }; 8D69E60021DE968300CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -49,6 +55,8 @@ 8D69E61621DE96CF00CFA49B /* UIImageView+FirebaseStorage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "UIImageView+FirebaseStorage.m"; sourceTree = ""; }; 8D69E61721DE96CF00CFA49B /* UIImageView+FirebaseStorage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "UIImageView+FirebaseStorage.h"; sourceTree = ""; }; 8D69E61A21DE96D900CFA49B /* FUIImageViewCategoryTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIImageViewCategoryTests.m; sourceTree = ""; }; + 95C2097A79A802C38403F32F /* Pods-FirebaseStorageUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseStorageUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseStorageUI/Pods-FirebaseStorageUI.release.xcconfig"; sourceTree = ""; }; + A5C8957A3AC2CB1742FBEDD3 /* Pods_FirebaseStorageUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseStorageUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -56,6 +64,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 8064F7C450331CB287932F2E /* Pods_FirebaseStorageUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -64,6 +73,7 @@ buildActionMask = 2147483647; files = ( 8D69E60621DE968300CFA49B /* FirebaseStorageUI.framework in Frameworks */, + 2C104ECEB924319EFF003F87 /* Pods_FirebaseStorageUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -76,6 +86,8 @@ 8D69E5FE21DE968300CFA49B /* FirebaseStorageUI */, 8D69E60921DE968300CFA49B /* FirebaseStorageUITests */, 8D69E5FD21DE968300CFA49B /* Products */, + E3D604E8D1C7578D22E758BC /* Pods */, + AC40885927622B81317FB243 /* Frameworks */, ); sourceTree = ""; }; @@ -116,6 +128,26 @@ path = FirebaseStorageUITests; sourceTree = ""; }; + AC40885927622B81317FB243 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 7221D88AF442AC8A50757733 /* Pods_FirebaseStorageUI.framework */, + A5C8957A3AC2CB1742FBEDD3 /* Pods_FirebaseStorageUITests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; + E3D604E8D1C7578D22E758BC /* Pods */ = { + isa = PBXGroup; + children = ( + 1E87C650E54C0206A30BF83F /* Pods-FirebaseStorageUI.debug.xcconfig */, + 95C2097A79A802C38403F32F /* Pods-FirebaseStorageUI.release.xcconfig */, + 51A6848D2F65A3D138BE3886 /* Pods-FirebaseStorageUITests.debug.xcconfig */, + 36EBD440217813CE222C96A7 /* Pods-FirebaseStorageUITests.release.xcconfig */, + ); + path = Pods; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -139,6 +171,7 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E61021DE968300CFA49B /* Build configuration list for PBXNativeTarget "FirebaseStorageUI" */; buildPhases = ( + 831A1849031B15385171BB72 /* [CP] Check Pods Manifest.lock */, 8D69E5F721DE968300CFA49B /* Headers */, 8D69E5F821DE968300CFA49B /* Sources */, 8D69E5F921DE968300CFA49B /* Frameworks */, @@ -157,9 +190,11 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E61321DE968300CFA49B /* Build configuration list for PBXNativeTarget "FirebaseStorageUITests" */; buildPhases = ( + 1E68BC9E41E27D445A552830 /* [CP] Check Pods Manifest.lock */, 8D69E60121DE968300CFA49B /* Sources */, 8D69E60221DE968300CFA49B /* Frameworks */, 8D69E60321DE968300CFA49B /* Resources */, + 6026362A74D3C8C01E6FAF3E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -223,6 +258,70 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 1E68BC9E41E27D445A552830 /* [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-FirebaseStorageUITests-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; + }; + 6026362A74D3C8C01E6FAF3E /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FirebaseStorageUITests/Pods-FirebaseStorageUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FirebaseStorageUITests/Pods-FirebaseStorageUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseStorageUITests/Pods-FirebaseStorageUITests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 831A1849031B15385171BB72 /* [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-FirebaseStorageUI-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 */ 8D69E5F821DE968300CFA49B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -375,6 +474,7 @@ }; 8D69E61121DE968300CFA49B /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 1E87C650E54C0206A30BF83F /* Pods-FirebaseStorageUI.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -398,6 +498,7 @@ }; 8D69E61221DE968300CFA49B /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 95C2097A79A802C38403F32F /* Pods-FirebaseStorageUI.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -421,6 +522,7 @@ }; 8D69E61421DE968300CFA49B /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 51A6848D2F65A3D138BE3886 /* Pods-FirebaseStorageUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseStorageUITests/Info.plist; @@ -428,6 +530,12 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseStorage\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/OCMock\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseStorageUITests; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -437,6 +545,7 @@ }; 8D69E61521DE968300CFA49B /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 36EBD440217813CE222C96A7 /* Pods-FirebaseStorageUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseStorageUITests/Info.plist; @@ -444,6 +553,12 @@ "$(inherited)", "@executable_path/Frameworks", "@loader_path/Frameworks", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseCore\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/FirebaseStorage\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GTMSessionFetcher\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/GoogleUtilities\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/OCMock\"", + "\"${PODS_CONFIGURATION_BUILD_DIR}/SDWebImage\"", ); PRODUCT_BUNDLE_IDENTIFIER = com.firebase.FirebaseStorageUITests; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Storage/Podfile b/Storage/Podfile index 4a5ac470cd6..4131339ae74 100644 --- a/Storage/Podfile +++ b/Storage/Podfile @@ -1,4 +1,4 @@ -source 'sso://cpdc-internal/firebase' +# source 'sso://cpdc-internal/firebase' source 'https://github.com/CocoaPods/Specs.git' platform :ios, '8.0' diff --git a/Storage/Podfile.lock b/Storage/Podfile.lock index 4168b369f14..465e97de18a 100644 --- a/Storage/Podfile.lock +++ b/Storage/Podfile.lock @@ -47,6 +47,6 @@ SPEC CHECKSUMS: OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab SDWebImage: 6764b5fa0f73c203728052955dbefa2bf1f33282 -PODFILE CHECKSUM: 1a45efdec565d8fc9c3215d09a119d3ca609f0a6 +PODFILE CHECKSUM: 4ee09a538f9ded78a1ee0184c63b1157301e92e4 -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.0 diff --git a/UITests/FirebaseUISample.xcodeproj/project.pbxproj b/UITests/FirebaseUISample.xcodeproj/project.pbxproj index f00f725ad28..78129e0cdb5 100644 --- a/UITests/FirebaseUISample.xcodeproj/project.pbxproj +++ b/UITests/FirebaseUISample.xcodeproj/project.pbxproj @@ -7,6 +7,8 @@ objects = { /* Begin PBXBuildFile section */ + 384216B4B7F229763F82AB3A /* Pods_FirebaseUISample.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2D41B820459F0A00A8AD1596 /* Pods_FirebaseUISample.framework */; }; + 3BB48A4F055BE5C69B6BFF97 /* Pods_FirebaseUISampleUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D281C0AD34285FC512A5C7BF /* Pods_FirebaseUISampleUITests.framework */; }; 8D69E6B621DEC97E00CFA49B /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E6B421DEC97E00CFA49B /* Main.storyboard */; }; 8D69E6B821DEC97F00CFA49B /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E6B721DEC97F00CFA49B /* Assets.xcassets */; }; 8D69E6BB21DEC97F00CFA49B /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E6B921DEC97F00CFA49B /* LaunchScreen.storyboard */; }; @@ -38,6 +40,10 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0956B704CE67A275CA6CAF73 /* Pods-FirebaseUISample.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUISample.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseUISample/Pods-FirebaseUISample.debug.xcconfig"; sourceTree = ""; }; + 2D41B820459F0A00A8AD1596 /* Pods_FirebaseUISample.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseUISample.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 31B8690B9EA722A89DF1BFBF /* Pods-FirebaseUISampleUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUISampleUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseUISampleUITests/Pods-FirebaseUISampleUITests.debug.xcconfig"; sourceTree = ""; }; + 693E42C838C4CC5869E33629 /* Pods-FirebaseUISampleUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUISampleUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseUISampleUITests/Pods-FirebaseUISampleUITests.release.xcconfig"; sourceTree = ""; }; 8D69E6AB21DEC97E00CFA49B /* FirebaseUISample.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = FirebaseUISample.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E6B521DEC97E00CFA49B /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 8D69E6B721DEC97F00CFA49B /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -140,6 +146,8 @@ 8D69E73B21DECA7000CFA49B /* ca */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ca; path = ca.lproj/Localizable.strings; sourceTree = ""; }; 8D69E73C21DECA7000CFA49B /* zh */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = zh; path = zh.lproj/Localizable.strings; sourceTree = ""; }; 8D69E73D21DECA7000CFA49B /* en-IN */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "en-IN"; path = "en-IN.lproj/Localizable.strings"; sourceTree = ""; }; + D281C0AD34285FC512A5C7BF /* Pods_FirebaseUISampleUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseUISampleUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + FD82E556B9F3A8847E367537 /* Pods-FirebaseUISample.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseUISample.release.xcconfig"; path = "Target Support Files/Pods-FirebaseUISample/Pods-FirebaseUISample.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -147,6 +155,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 384216B4B7F229763F82AB3A /* Pods_FirebaseUISample.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -161,12 +170,25 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 3BB48A4F055BE5C69B6BFF97 /* Pods_FirebaseUISampleUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 74988A7C0F0D66CC81B546F1 /* Pods */ = { + isa = PBXGroup; + children = ( + 0956B704CE67A275CA6CAF73 /* Pods-FirebaseUISample.debug.xcconfig */, + FD82E556B9F3A8847E367537 /* Pods-FirebaseUISample.release.xcconfig */, + 31B8690B9EA722A89DF1BFBF /* Pods-FirebaseUISampleUITests.debug.xcconfig */, + 693E42C838C4CC5869E33629 /* Pods-FirebaseUISampleUITests.release.xcconfig */, + ); + name = Pods; + path = Pods; + sourceTree = ""; + }; 8D69E6A221DEC97E00CFA49B = { isa = PBXGroup; children = ( @@ -174,6 +196,8 @@ 8D69E6C621DEC98000CFA49B /* FirebaseUISampleTests */, 8D69E6D121DEC98000CFA49B /* FirebaseUISampleUITests */, 8D69E6AC21DEC97E00CFA49B /* Products */, + 74988A7C0F0D66CC81B546F1 /* Pods */, + BE3E2EB05043AA9C4D5AE8D7 /* Frameworks */, ); sourceTree = ""; }; @@ -232,6 +256,15 @@ path = Resources; sourceTree = ""; }; + BE3E2EB05043AA9C4D5AE8D7 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 2D41B820459F0A00A8AD1596 /* Pods_FirebaseUISample.framework */, + D281C0AD34285FC512A5C7BF /* Pods_FirebaseUISampleUITests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -239,9 +272,12 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E6D721DEC98000CFA49B /* Build configuration list for PBXNativeTarget "FirebaseUISample" */; buildPhases = ( + 0DF63DA2354EB44F5A2D2D61 /* [CP] Check Pods Manifest.lock */, 8D69E6A721DEC97E00CFA49B /* Sources */, 8D69E6A821DEC97E00CFA49B /* Frameworks */, 8D69E6A921DEC97E00CFA49B /* Resources */, + 9770CA281FA9338EAAD7A794 /* [CP] Embed Pods Frameworks */, + 51DE22925CB8340B0AD8760A /* [CP] Copy Pods Resources */, ); buildRules = ( ); @@ -274,6 +310,7 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E6DD21DEC98000CFA49B /* Build configuration list for PBXNativeTarget "FirebaseUISampleUITests" */; buildPhases = ( + EEBB22A4A2D9891F4E4EADCD /* [CP] Check Pods Manifest.lock */, 8D69E6CA21DEC98000CFA49B /* Sources */, 8D69E6CB21DEC98000CFA49B /* Frameworks */, 8D69E6CC21DEC98000CFA49B /* Resources */, @@ -443,6 +480,87 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 0DF63DA2354EB44F5A2D2D61 /* [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-FirebaseUISample-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; + }; + 51DE22925CB8340B0AD8760A /* [CP] Copy Pods Resources */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FirebaseUISample/Pods-FirebaseUISample-resources-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Copy Pods Resources"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FirebaseUISample/Pods-FirebaseUISample-resources-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseUISample/Pods-FirebaseUISample-resources.sh\"\n"; + showEnvVarsInLog = 0; + }; + 9770CA281FA9338EAAD7A794 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FirebaseUISample/Pods-FirebaseUISample-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FirebaseUISample/Pods-FirebaseUISample-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseUISample/Pods-FirebaseUISample-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + EEBB22A4A2D9891F4E4EADCD /* [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-FirebaseUISampleUITests-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 */ 8D69E6A721DEC97E00CFA49B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -712,6 +830,7 @@ }; 8D69E6D821DEC98000CFA49B /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 0956B704CE67A275CA6CAF73 /* Pods-FirebaseUISample.debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -728,6 +847,7 @@ }; 8D69E6D921DEC98000CFA49B /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = FD82E556B9F3A8847E367537 /* Pods-FirebaseUISample.release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_STYLE = Automatic; @@ -780,6 +900,7 @@ }; 8D69E6DE21DEC98000CFA49B /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 31B8690B9EA722A89DF1BFBF /* Pods-FirebaseUISampleUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseUISampleUITests/Info.plist; @@ -871,6 +992,7 @@ }; 8D69E6DF21DEC98000CFA49B /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 693E42C838C4CC5869E33629 /* Pods-FirebaseUISampleUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseUISampleUITests/Info.plist; diff --git a/UITests/Podfile.lock b/UITests/Podfile.lock index 60f9f7a20ed..abd0e3f0544 100644 --- a/UITests/Podfile.lock +++ b/UITests/Podfile.lock @@ -1,134 +1,142 @@ PODS: - - Bolts (1.9.0): - - Bolts/AppLinks (= 1.9.0) - - Bolts/Tasks (= 1.9.0) - - Bolts/AppLinks (1.9.0): - - Bolts/Tasks - - Bolts/Tasks (1.9.0) - - BoringSSL-GRPC (0.0.2): - - BoringSSL-GRPC/Implementation (= 0.0.2) - - BoringSSL-GRPC/Interface (= 0.0.2) - - BoringSSL-GRPC/Implementation (0.0.2): - - BoringSSL-GRPC/Interface (= 0.0.2) - - BoringSSL-GRPC/Interface (0.0.2) - - FBSDKCoreKit (4.41.0): - - Bolts (~> 1.9) - - FBSDKLoginKit (4.41.0): - - FBSDKCoreKit - - Firebase/Auth (5.18.0): - - Firebase/CoreOnly - - FirebaseAuth (= 5.4.0) - - Firebase/CoreOnly (5.18.0): - - FirebaseCore (= 5.3.1) - - Firebase/Database (5.18.0): + - BoringSSL-GRPC (0.0.3): + - BoringSSL-GRPC/Implementation (= 0.0.3) + - BoringSSL-GRPC/Interface (= 0.0.3) + - BoringSSL-GRPC/Implementation (0.0.3): + - BoringSSL-GRPC/Interface (= 0.0.3) + - BoringSSL-GRPC/Interface (0.0.3) + - FBSDKCoreKit (5.0.1): + - FBSDKCoreKit/Basics (= 5.0.1) + - FBSDKCoreKit/Core (= 5.0.1) + - FBSDKCoreKit/Basics (5.0.1) + - FBSDKCoreKit/Core (5.0.1): + - FBSDKCoreKit/Basics + - FBSDKLoginKit (5.0.1): + - FBSDKCoreKit (~> 5.0) + - Firebase/Auth (6.2.0): - Firebase/CoreOnly - - FirebaseDatabase (= 5.1.0) - - Firebase/Firestore (5.18.0): + - FirebaseAuth (~> 6.1.1) + - Firebase/CoreOnly (6.2.0): + - FirebaseCore (= 6.0.2) + - Firebase/Database (6.2.0): - Firebase/CoreOnly - - FirebaseFirestore (= 1.0.2) - - Firebase/Storage (5.18.0): + - FirebaseDatabase (~> 6.0.0) + - Firebase/Firestore (6.2.0): - Firebase/CoreOnly - - FirebaseStorage (= 3.1.0) - - FirebaseAuth (5.4.0): + - FirebaseFirestore (~> 1.3.2) + - FirebaseAuth (6.1.1): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - GoogleUtilities/Environment (~> 5.2) + - FirebaseCore (~> 6.0) + - GoogleUtilities/AppDelegateSwizzler (~> 6.2) + - GoogleUtilities/Environment (~> 6.2) - GTMSessionFetcher/Core (~> 1.1) - FirebaseAuthInterop (1.0.0) - - FirebaseCore (5.3.1): - - GoogleUtilities/Logger (~> 5.2) - - FirebaseDatabase (5.1.0): + - FirebaseCore (6.0.2): + - GoogleUtilities/Environment (~> 6.0) + - GoogleUtilities/Logger (~> 6.0) + - FirebaseDatabase (6.0.0): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) + - FirebaseCore (~> 6.0) - leveldb-library (~> 1.18) - - FirebaseFirestore (1.0.2): + - FirebaseFirestore (1.3.2): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - FirebaseFirestore/abseil-cpp (= 1.0.2) - - "gRPC-C++ (= 0.0.6)" + - FirebaseCore (~> 6.0) + - FirebaseFirestore/abseil-cpp (= 1.3.2) + - "gRPC-C++ (= 0.0.9)" - leveldb-library (~> 1.20) - nanopb (~> 0.3.901) - Protobuf (~> 3.1) - - FirebaseFirestore/abseil-cpp (1.0.2): + - FirebaseFirestore/abseil-cpp (1.3.2): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) - - "gRPC-C++ (= 0.0.6)" + - FirebaseCore (~> 6.0) + - "gRPC-C++ (= 0.0.9)" - leveldb-library (~> 1.20) - nanopb (~> 0.3.901) - Protobuf (~> 3.1) - - FirebaseStorage (3.1.0): + - FirebaseStorage (3.2.1): - FirebaseAuthInterop (~> 1.0) - - FirebaseCore (~> 5.2) + - FirebaseCore (~> 6.0) - GTMSessionFetcher/Core (~> 1.1) - - FirebaseUI (6.2.1): - - FirebaseUI/Anonymous (= 6.2.1) - - FirebaseUI/Auth (= 6.2.1) - - FirebaseUI/Database (= 6.2.1) - - FirebaseUI/Email (= 6.2.1) - - FirebaseUI/Facebook (= 6.2.1) - - FirebaseUI/Firestore (= 6.2.1) - - FirebaseUI/Google (= 6.2.1) - - FirebaseUI/OAuth (= 6.2.1) - - FirebaseUI/Phone (= 6.2.1) - - FirebaseUI/Storage (= 6.2.1) - - FirebaseUI/Anonymous (6.2.1): + - FirebaseUI (7.0.0): + - FirebaseUI/Anonymous (= 7.0.0) + - FirebaseUI/Auth (= 7.0.0) + - FirebaseUI/Database (= 7.0.0) + - FirebaseUI/Email (= 7.0.0) + - FirebaseUI/Facebook (= 7.0.0) + - FirebaseUI/Firestore (= 7.0.0) + - FirebaseUI/Google (= 7.0.0) + - FirebaseUI/OAuth (= 7.0.0) + - FirebaseUI/Phone (= 7.0.0) + - FirebaseUI/Storage (= 7.0.0) + - FirebaseUI/Anonymous (7.0.0): - FirebaseUI/Auth - - FirebaseUI/Auth (6.2.1): - - Firebase/Auth (~> 5.4) + - FirebaseUI/Auth (7.0.0): + - Firebase/Auth (~> 6.0) - GoogleUtilities/UserDefaults - - FirebaseUI/Database (6.2.1): - - Firebase/Database (~> 5.0) - - FirebaseUI/Email (6.2.1): + - FirebaseUI/Database (7.0.0): + - Firebase/Database (~> 6.0) + - FirebaseUI/Email (7.0.0): - FirebaseUI/Auth - - FirebaseUI/Facebook (6.2.1): - - FBSDKLoginKit (~> 4.35) + - FirebaseUI/Facebook (7.0.0): + - FBSDKLoginKit (~> 5.0) - FirebaseUI/Auth - - FirebaseUI/Firestore (6.2.1): + - FirebaseUI/Firestore (7.0.0): - Firebase/Firestore - - FirebaseUI/Google (6.2.1): + - FirebaseUI/Google (7.0.0): - FirebaseUI/Auth - GoogleSignIn (~> 4.0) - - FirebaseUI/OAuth (6.2.1): + - FirebaseUI/OAuth (7.0.0): - FirebaseUI/Auth - - FirebaseUI/Phone (6.2.1): + - FirebaseUI/Phone (7.0.0): - FirebaseUI/Auth - - FirebaseUI/Storage (6.2.1): - - Firebase/Storage (~> 5.0) - - SDWebImage (~> 4.0) + - FirebaseUI/Storage (7.0.0): + - FirebaseStorage (~> 3.2.0) + - SDWebImage (~> 5.0) - GoogleSignIn (4.4.0): - "GoogleToolboxForMac/NSDictionary+URLArguments (~> 2.1)" - "GoogleToolboxForMac/NSString+URLArguments (~> 2.1)" - GTMSessionFetcher/Core (~> 1.1) - - GoogleToolboxForMac/DebugUtils (2.2.0): - - GoogleToolboxForMac/Defines (= 2.2.0) - - GoogleToolboxForMac/Defines (2.2.0) - - "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.0)": - - GoogleToolboxForMac/DebugUtils (= 2.2.0) - - GoogleToolboxForMac/Defines (= 2.2.0) - - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.0)" - - "GoogleToolboxForMac/NSString+URLArguments (2.2.0)" - - GoogleUtilities/Environment (5.4.0) - - GoogleUtilities/Logger (5.4.0): + - GoogleToolboxForMac/DebugUtils (2.2.1): + - GoogleToolboxForMac/Defines (= 2.2.1) + - GoogleToolboxForMac/Defines (2.2.1) + - "GoogleToolboxForMac/NSDictionary+URLArguments (2.2.1)": + - GoogleToolboxForMac/DebugUtils (= 2.2.1) + - GoogleToolboxForMac/Defines (= 2.2.1) + - "GoogleToolboxForMac/NSString+URLArguments (= 2.2.1)" + - "GoogleToolboxForMac/NSString+URLArguments (2.2.1)" + - GoogleUtilities/AppDelegateSwizzler (6.2.0): + - GoogleUtilities/Environment + - GoogleUtilities/Logger + - GoogleUtilities/Network + - GoogleUtilities/Environment (6.2.0) + - GoogleUtilities/Logger (6.2.0): - GoogleUtilities/Environment - - GoogleUtilities/UserDefaults (5.4.0): + - GoogleUtilities/Network (6.2.0): - GoogleUtilities/Logger - - "gRPC-C++ (0.0.6)": - - "gRPC-C++/Implementation (= 0.0.6)" - - "gRPC-C++/Interface (= 0.0.6)" - - "gRPC-C++/Implementation (0.0.6)": - - "gRPC-C++/Interface (= 0.0.6)" - - gRPC-Core (= 1.17.0) + - "GoogleUtilities/NSData+zlib" + - GoogleUtilities/Reachability + - "GoogleUtilities/NSData+zlib (6.2.0)" + - GoogleUtilities/Reachability (6.2.0): + - GoogleUtilities/Logger + - GoogleUtilities/UserDefaults (6.2.0): + - GoogleUtilities/Logger + - "gRPC-C++ (0.0.9)": + - "gRPC-C++/Implementation (= 0.0.9)" + - "gRPC-C++/Interface (= 0.0.9)" + - "gRPC-C++/Implementation (0.0.9)": + - "gRPC-C++/Interface (= 0.0.9)" + - gRPC-Core (= 1.21.0) - nanopb (~> 0.3) - - "gRPC-C++/Interface (0.0.6)" - - gRPC-Core (1.17.0): - - gRPC-Core/Implementation (= 1.17.0) - - gRPC-Core/Interface (= 1.17.0) - - gRPC-Core/Implementation (1.17.0): - - BoringSSL-GRPC (= 0.0.2) - - gRPC-Core/Interface (= 1.17.0) + - "gRPC-C++/Interface (0.0.9)" + - gRPC-Core (1.21.0): + - gRPC-Core/Implementation (= 1.21.0) + - gRPC-Core/Interface (= 1.21.0) + - gRPC-Core/Implementation (1.21.0): + - BoringSSL-GRPC (= 0.0.3) + - gRPC-Core/Interface (= 1.21.0) - nanopb (~> 0.3) - - gRPC-Core/Interface (1.17.0) - - GTMSessionFetcher/Core (1.2.1) + - gRPC-Core/Interface (1.21.0) + - GTMSessionFetcher/Core (1.2.2) - leveldb-library (1.20) - nanopb (0.3.901): - nanopb/decode (= 0.3.901) @@ -136,10 +144,10 @@ PODS: - nanopb/decode (0.3.901) - nanopb/encode (0.3.901) - OCMock (3.4.3) - - Protobuf (3.7.0) - - SDWebImage (4.4.6): - - SDWebImage/Core (= 4.4.6) - - SDWebImage/Core (4.4.6) + - Protobuf (3.8.0) + - SDWebImage (5.0.4): + - SDWebImage/Core (= 5.0.4) + - SDWebImage/Core (5.0.4) DEPENDENCIES: - FirebaseUI (from `../`) @@ -147,16 +155,11 @@ DEPENDENCIES: SPEC REPOS: https://github.com/cocoapods/specs.git: - - Bolts - BoringSSL-GRPC - FBSDKCoreKit - FBSDKLoginKit - - Firebase - - FirebaseAuth - FirebaseAuthInterop - - FirebaseCore - FirebaseDatabase - - FirebaseFirestore - FirebaseStorage - GoogleSignIn - GoogleToolboxForMac @@ -169,36 +172,40 @@ SPEC REPOS: - OCMock - Protobuf - SDWebImage + sso://cpdc-internal/firebase: + - Firebase + - FirebaseAuth + - FirebaseCore + - FirebaseFirestore EXTERNAL SOURCES: FirebaseUI: :path: "../" SPEC CHECKSUMS: - Bolts: ac6567323eac61e203f6a9763667d0f711be34c8 - BoringSSL-GRPC: 2a230d9cd93e7ce39916044f645cebb31f37dde6 - FBSDKCoreKit: 974810fe3806173f3777c68062fa8ed6fa59b59d - FBSDKLoginKit: 159a5c2eebe6a0774c3b128f5085128679233d2b - Firebase: 02f3281965c075426141a0ce1277e9de6649cab9 - FirebaseAuth: d85d052354447f30b4b2a805ab91b511458b56a6 + BoringSSL-GRPC: db8764df3204ccea016e1c8dd15d9a9ad63ff318 + FBSDKCoreKit: 4a19534474ade7c71bd016d800aa5e7722bcdda1 + FBSDKLoginKit: 41efa754b909b0ea813fa9a8596dacc8ed196d50 + Firebase: 2b6ffcbe90cce1552d1d0500ccf8bceda3fb954e + FirebaseAuth: 86bc609c56b537aab64867948efdf5ddf17377f9 FirebaseAuthInterop: 0ffa57668be100582bb7643d4fcb7615496c41fc - FirebaseCore: 52f851b30e11360f1e67cf04b1edfebf0a47a2d3 - FirebaseDatabase: 23acb0c53cd4d4070a427b60100b2e4aaa97c45d - FirebaseFirestore: ccdaffb8a73c591ff61872b8f7905ad0c237ef50 - FirebaseStorage: 29075f874c2b3cf61e5221a62c4ceefc809e5412 - FirebaseUI: a2edbe63a90dff4a9ac715f4dd2869411528eedc + FirebaseCore: b0f0262acebfa540e5f97b3832dbb13186980822 + FirebaseDatabase: f48e067716864be2b855cf716b927ef375d6cfa0 + FirebaseFirestore: d9c55dfd0cd648f420cc8340c4940dc3eab2d860 + FirebaseStorage: 926d41552072b9fee67aa645760f05f87b7ce604 + FirebaseUI: f9367cd5cacde991d9bcce9278d3fcb858f84f6a GoogleSignIn: 7ff245e1a7b26d379099d3243a562f5747e23d39 - GoogleToolboxForMac: ff31605b7d66400dcec09bed5861689aebadda4d - GoogleUtilities: fa768ad04b264be250ee9edf9f378ad006f7a560 - "gRPC-C++": e76441995900ac90e9bd98644ab4733f12521edf - gRPC-Core: 4028031ed2c5267cca0d846c876d8046b1ecb9b6 - GTMSessionFetcher: 32aeca0aa144acea523e1c8e053089dec2cb98ca + GoogleToolboxForMac: b3553629623a3b1bff17f555e736cd5a6d95ad55 + GoogleUtilities: 996e0db07153674fd1b54b220fda3a3dc3547cba + "gRPC-C++": 9dfe7b44821e7b3e44aacad2af29d2c21f7cde83 + gRPC-Core: c9aef9a261a1247e881b18059b84d597293c9947 + GTMSessionFetcher: 61bb0f61a4cb560030f1222021178008a5727a23 leveldb-library: 08cba283675b7ed2d99629a4bc5fd052cd2bb6a5 nanopb: 2901f78ea1b7b4015c860c2fdd1ea2fee1a18d48 OCMock: 43565190abc78977ad44a61c0d20d7f0784d35ab - Protobuf: 7a877b7f3e5964e3fce995e2eb323dbc6831bb5a - SDWebImage: 3f3f0c02f09798048c47a5ed0a13f17b063572d8 + Protobuf: 3f617b9a6e73605565086864c9bc26b2bf2dd5a3 + SDWebImage: c739016e4bdf0a4a1f9a04b5e0385395ad63a282 -PODFILE CHECKSUM: 7865b2c90bcd66ccbc77a55fe5ad402dbe2b63a0 +PODFILE CHECKSUM: 25ee3222514135ac01cd7ae930ab3a8da19e0dc6 -COCOAPODS: 1.6.1 +COCOAPODS: 1.7.0 diff --git a/test.sh b/test.sh index 84b9b2ab4a5..44fb41c055d 100755 --- a/test.sh +++ b/test.sh @@ -5,28 +5,27 @@ set -eo pipefail EXIT_STATUS=0 folders=( "AnonymousAuth" "Auth" "Database" "EmailAuth" "FacebookAuth" \ - "Firestore" "GoogleAuth" "PhoneAuth" "Storage" "UITests" ) + "Firestore" "GoogleAuth" "PhoneAuth" "Storage" ) schemes=( "FirebaseAnonymousAuthUI" "FirebaseAuthUI" "FirebaseDatabaseUI" \ "FirebaseEmailAuthUI" "FirebaseFacebookAuthUI" "FirebaseFirestoreUI" \ - "FirebaseGoogleAuthUI" "FirebasePhoneAuthUI" "FirebaseStorageUI" \ - "FirebaseUISample") + "FirebaseGoogleAuthUI" "FirebasePhoneAuthUI" "FirebaseStorageUI" ) pod repo update; for ((i=0; i<${#folders[*]}; i++)); do cd ${folders[i]}; - pod install >/dev/null; + pod install; (xcodebuild \ -workspace ${schemes[i]}.xcworkspace \ -scheme ${schemes[i]} \ -sdk iphonesimulator \ - -destination 'platform=iOS Simulator,OS=12.1,name=iPhone XS' \ + -destination 'platform=iOS Simulator,OS=12.2,name=iPhone XS' \ build \ test \ ONLY_ACTIVE_ARCH=YES \ | xcpretty) || EXIT_STATUS=$?; - pod deintegrate >/dev/null; + pod deintegrate; cd ..; done