From 368a64d94674a6d4262a7490421ea412e653914c Mon Sep 17 00:00:00 2001 From: Morgan Chen Date: Tue, 3 Dec 2024 13:23:45 -0800 Subject: [PATCH] update to swift 6 --- .github/workflows/facebookauth.yml | 2 +- FirebaseAnonymousAuthUI.podspec | 4 +- FirebaseAuthUI.podspec | 4 +- FirebaseDatabaseUI.podspec | 4 +- FirebaseEmailAuthUI.podspec | 4 +- FirebaseFacebookAuthUI.podspec | 8 +- .../project.pbxproj | 95 ++++++++++ FirebaseFacebookAuthUI/Podfile | 2 +- FirebaseFirestoreUI.podspec | 4 +- FirebaseGoogleAuthUI.podspec | 4 +- FirebaseOAuthUI.podspec | 4 +- FirebasePhoneAuthUI.podspec | 4 +- FirebaseStorageUI.podspec | 4 +- FirebaseUI.podspec | 4 +- Package.resolved | 169 ++++++++++++++++++ Package.swift | 4 +- 16 files changed, 292 insertions(+), 28 deletions(-) create mode 100644 Package.resolved diff --git a/.github/workflows/facebookauth.yml b/.github/workflows/facebookauth.yml index 03708fff25..422a0a0037 100644 --- a/.github/workflows/facebookauth.yml +++ b/.github/workflows/facebookauth.yml @@ -54,7 +54,7 @@ jobs: xcodebuild -list - name: Build run: | - xcodebuild -scheme FirebaseFacebookAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro' + xcodebuild -scheme FirebaseFacebookAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro' pod: name: pod lib lint runs-on: macOS-latest diff --git a/FirebaseAnonymousAuthUI.podspec b/FirebaseAnonymousAuthUI.podspec index 5483f68513..9e7842ede3 100644 --- a/FirebaseAnonymousAuthUI.podspec +++ b/FirebaseAnonymousAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseAnonymousAuthUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'Provides anonymous auth support for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', } - s.swift_version = '5.3' + s.swift_version = '6.0' s.public_header_files = 'FirebaseAnonymousAuthUI/Sources/Public/FirebaseAnonymousAuthUI/*.h' s.source_files = 'FirebaseAnonymousAuthUI/Sources/**/*.{h,m}' diff --git a/FirebaseAuthUI.podspec b/FirebaseAuthUI.podspec index 11ed081a2f..8b8db7bb83 100644 --- a/FirebaseAuthUI.podspec +++ b/FirebaseAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseAuthUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'A prebuilt authentication UI flow for Firebase Auth.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', } - s.swift_version = '5.3' + s.swift_version = '6.0' s.public_header_files = 'FirebaseAuthUI/Sources/Public/FirebaseAuthUI/*.h' s.source_files = 'FirebaseAuthUI/Sources/**/*.{h,m}' diff --git a/FirebaseDatabaseUI.podspec b/FirebaseDatabaseUI.podspec index a1192a8dc6..1fbd3f9543 100644 --- a/FirebaseDatabaseUI.podspec +++ b/FirebaseDatabaseUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseDatabaseUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'Prebuilt data sources and UI bindings for Firebase Database.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', } - s.swift_version = '5.3' + s.swift_version = '6.0' s.public_header_files = 'FirebaseDatabaseUI/Sources/Public/FirebaseDatabaseUI/*.h' s.source_files = 'FirebaseDatabaseUI/Sources/**/*.{h,m}' diff --git a/FirebaseEmailAuthUI.podspec b/FirebaseEmailAuthUI.podspec index a08e2942e0..dfd089b892 100644 --- a/FirebaseEmailAuthUI.podspec +++ b/FirebaseEmailAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseEmailAuthUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'An email authentication provider for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', } - s.swift_version = '5.3' + s.swift_version = '6.0' s.public_header_files = 'FirebaseEmailAuthUI/Sources/Public/FirebaseEmailAuthUI/*.h' s.source_files = 'FirebaseEmailAuthUI/Sources/**/*.{h,m}' diff --git a/FirebaseFacebookAuthUI.podspec b/FirebaseFacebookAuthUI.podspec index 33470f903f..a967f675d2 100644 --- a/FirebaseFacebookAuthUI.podspec +++ b/FirebaseFacebookAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseFacebookAuthUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'A Facebook auth provider for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -15,15 +15,15 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', } - s.swift_version = '5.3' + s.swift_version = '6.0' s.platform = :ios, '13.0' s.public_header_files = 'FirebaseFacebookAuthUI/Sources/Public/FirebaseFacebookAuthUI/*.h' s.source_files = 'FirebaseFacebookAuthUI/Sources/**/*.{h,m}' s.dependency 'FirebaseAuth' s.dependency 'FirebaseCore' - s.dependency 'FirebaseAuthUI', '>= 14.2' - s.dependency 'FBSDKLoginKit', '>= 11.0', '< 18.0' + s.dependency 'FirebaseAuthUI', '>= 15.0' + s.dependency 'FBSDKLoginKit', '>= 17.0', '< 18.0' s.dependency 'FBSDKCoreKit_Basics' s.resource_bundles = { 'FirebaseFacebookAuthUI' => ['FirebaseFacebookAuthUI/Sources/{Resources,Strings}/*.{png,lproj}'] diff --git a/FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj b/FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj index 1147652ba1..1f59f81479 100644 --- a/FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj +++ b/FirebaseFacebookAuthUI/FirebaseFacebookAuthUI.xcodeproj/project.pbxproj @@ -7,6 +7,7 @@ objects = { /* Begin PBXBuildFile section */ + 71A0036D4B4DD7A226F21CCC /* Pods_FirebaseFacebookAuthUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 65E4D73824532738697ED943 /* Pods_FirebaseFacebookAuthUI.framework */; }; 8D69E3DB21DD83EB00CFA49B /* FirebaseFacebookAuthUITests.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E3DA21DD83EB00CFA49B /* FirebaseFacebookAuthUITests.m */; }; 8D69E3DD21DD83EB00CFA49B /* FirebaseFacebookAuthUI.h in Headers */ = {isa = PBXBuildFile; fileRef = 8D69E3CF21DD83EB00CFA49B /* FirebaseFacebookAuthUI.h */; settings = {ATTRIBUTES = (Public, ); }; }; 8D69E3E821DD843800CFA49B /* FUIFacebookAuth.m in Sources */ = {isa = PBXBuildFile; fileRef = 8D69E3E621DD843800CFA49B /* FUIFacebookAuth.m */; }; @@ -21,6 +22,7 @@ 8D69E45121DD8A6D00CFA49B /* ic_facebook.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E44121DD843F00CFA49B /* ic_facebook.png */; }; 8D69E45221DD8A6D00CFA49B /* ic_facebook@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E44321DD843F00CFA49B /* ic_facebook@2x.png */; }; 8D69E45321DD8A6D00CFA49B /* ic_facebook@3x.png in Resources */ = {isa = PBXBuildFile; fileRef = 8D69E44221DD843F00CFA49B /* ic_facebook@3x.png */; }; + F443D5EB98B52025A2E06A33 /* Pods_FirebaseFacebookAuthUITests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 6A6BACEAA08E31741A0F40B0 /* Pods_FirebaseFacebookAuthUITests.framework */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -34,6 +36,11 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ + 0EDC2EC0EEA1ABF50D1101D5 /* Pods-FirebaseFacebookAuthUITests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseFacebookAuthUITests.release.xcconfig"; path = "Target Support Files/Pods-FirebaseFacebookAuthUITests/Pods-FirebaseFacebookAuthUITests.release.xcconfig"; sourceTree = ""; }; + 19A7CA6DEFD55A873A1F391A /* Pods-FirebaseFacebookAuthUI.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseFacebookAuthUI.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseFacebookAuthUI/Pods-FirebaseFacebookAuthUI.debug.xcconfig"; sourceTree = ""; }; + 36C5CC76720F2D09BF0966AB /* Pods-FirebaseFacebookAuthUITests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseFacebookAuthUITests.debug.xcconfig"; path = "Target Support Files/Pods-FirebaseFacebookAuthUITests/Pods-FirebaseFacebookAuthUITests.debug.xcconfig"; sourceTree = ""; }; + 65E4D73824532738697ED943 /* Pods_FirebaseFacebookAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseFacebookAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + 6A6BACEAA08E31741A0F40B0 /* Pods_FirebaseFacebookAuthUITests.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_FirebaseFacebookAuthUITests.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E3CC21DD83EB00CFA49B /* FirebaseFacebookAuthUI.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = FirebaseFacebookAuthUI.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8D69E3CF21DD83EB00CFA49B /* FirebaseFacebookAuthUI.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FirebaseFacebookAuthUI.h; sourceTree = ""; }; 8D69E3D021DD83EB00CFA49B /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -132,6 +139,7 @@ 8D69E44821DD845100CFA49B /* FUIFacebookAuthTest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = FUIFacebookAuthTest.m; sourceTree = ""; }; 8D69E44921DD845100CFA49B /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 8D69E44A21DD845100CFA49B /* FUIFacebookAuthTest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FUIFacebookAuthTest.h; sourceTree = ""; }; + F812755C8603AF592D3EA9B1 /* Pods-FirebaseFacebookAuthUI.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-FirebaseFacebookAuthUI.release.xcconfig"; path = "Target Support Files/Pods-FirebaseFacebookAuthUI/Pods-FirebaseFacebookAuthUI.release.xcconfig"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -139,6 +147,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 71A0036D4B4DD7A226F21CCC /* Pods_FirebaseFacebookAuthUI.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -147,15 +156,29 @@ buildActionMask = 2147483647; files = ( 8D69E44D21DD88BB00CFA49B /* FirebaseFacebookAuthUI.framework in Frameworks */, + F443D5EB98B52025A2E06A33 /* Pods_FirebaseFacebookAuthUITests.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ + 0BC567CD168FA9BD7D20A097 /* Frameworks */ = { + isa = PBXGroup; + children = ( + 65E4D73824532738697ED943 /* Pods_FirebaseFacebookAuthUI.framework */, + 6A6BACEAA08E31741A0F40B0 /* Pods_FirebaseFacebookAuthUITests.framework */, + ); + name = Frameworks; + sourceTree = ""; + }; 7DC88936A359F0A20973DC4C /* Pods */ = { isa = PBXGroup; children = ( + 19A7CA6DEFD55A873A1F391A /* Pods-FirebaseFacebookAuthUI.debug.xcconfig */, + F812755C8603AF592D3EA9B1 /* Pods-FirebaseFacebookAuthUI.release.xcconfig */, + 36C5CC76720F2D09BF0966AB /* Pods-FirebaseFacebookAuthUITests.debug.xcconfig */, + 0EDC2EC0EEA1ABF50D1101D5 /* Pods-FirebaseFacebookAuthUITests.release.xcconfig */, ); path = Pods; sourceTree = ""; @@ -175,6 +198,7 @@ 8D69E3D921DD83EB00CFA49B /* FirebaseFacebookAuthUITests */, 8D69E3CD21DD83EB00CFA49B /* Products */, 7DC88936A359F0A20973DC4C /* Pods */, + 0BC567CD168FA9BD7D20A097 /* Frameworks */, ); sourceTree = ""; }; @@ -257,6 +281,7 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E3E021DD83EB00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseFacebookAuthUI" */; buildPhases = ( + 006C163B79159F9F60AB8CD6 /* [CP] Check Pods Manifest.lock */, 8D69E3C721DD83EB00CFA49B /* Headers */, 8D69E3C821DD83EB00CFA49B /* Sources */, 8D69E3C921DD83EB00CFA49B /* Frameworks */, @@ -275,9 +300,11 @@ isa = PBXNativeTarget; buildConfigurationList = 8D69E3E321DD83EB00CFA49B /* Build configuration list for PBXNativeTarget "FirebaseFacebookAuthUITests" */; buildPhases = ( + 34734ADDEC1D54C43334E0FF /* [CP] Check Pods Manifest.lock */, 8D69E3D121DD83EB00CFA49B /* Sources */, 8D69E3D221DD83EB00CFA49B /* Frameworks */, 8D69E3D321DD83EB00CFA49B /* Resources */, + 0600E3EC70E72E1F64C969C9 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -432,6 +459,70 @@ }; /* End PBXResourcesBuildPhase section */ +/* Begin PBXShellScriptBuildPhase section */ + 006C163B79159F9F60AB8CD6 /* [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-FirebaseFacebookAuthUI-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; + }; + 0600E3EC70E72E1F64C969C9 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FirebaseFacebookAuthUITests/Pods-FirebaseFacebookAuthUITests-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-FirebaseFacebookAuthUITests/Pods-FirebaseFacebookAuthUITests-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-FirebaseFacebookAuthUITests/Pods-FirebaseFacebookAuthUITests-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; + 34734ADDEC1D54C43334E0FF /* [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-FirebaseFacebookAuthUITests-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 */ 8D69E3C821DD83EB00CFA49B /* Sources */ = { isa = PBXSourcesBuildPhase; @@ -679,6 +770,7 @@ }; 8D69E3E121DD83EB00CFA49B /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 19A7CA6DEFD55A873A1F391A /* Pods-FirebaseFacebookAuthUI.debug.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -722,6 +814,7 @@ }; 8D69E3E221DD83EB00CFA49B /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = F812755C8603AF592D3EA9B1 /* Pods-FirebaseFacebookAuthUI.release.xcconfig */; buildSettings = { CODE_SIGN_IDENTITY = ""; CODE_SIGN_STYLE = Automatic; @@ -765,6 +858,7 @@ }; 8D69E3E421DD83EB00CFA49B /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 36C5CC76720F2D09BF0966AB /* Pods-FirebaseFacebookAuthUITests.debug.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseFacebookAuthUITests/Info.plist; @@ -825,6 +919,7 @@ }; 8D69E3E521DD83EB00CFA49B /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = 0EDC2EC0EEA1ABF50D1101D5 /* Pods-FirebaseFacebookAuthUITests.release.xcconfig */; buildSettings = { CODE_SIGN_STYLE = Automatic; INFOPLIST_FILE = FirebaseFacebookAuthUITests/Info.plist; diff --git a/FirebaseFacebookAuthUI/Podfile b/FirebaseFacebookAuthUI/Podfile index 882d15f2a4..eacb2eac8a 100644 --- a/FirebaseFacebookAuthUI/Podfile +++ b/FirebaseFacebookAuthUI/Podfile @@ -9,7 +9,7 @@ target 'FirebaseFacebookAuthUI' do # The facebook pods generate an unreasonable number of warnings. inhibit_all_warnings! - pod 'FBSDKLoginKit', '~> 16.0' + pod 'FBSDKLoginKit', '~> 17.0' pod 'FBSDKCoreKit' pod 'FirebaseAuthUI', :path => '../' diff --git a/FirebaseFirestoreUI.podspec b/FirebaseFirestoreUI.podspec index 3b715e45dc..aefeb19986 100644 --- a/FirebaseFirestoreUI.podspec +++ b/FirebaseFirestoreUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseFirestoreUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'Data libraries and UI bindings for Firestore.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', } - s.swift_version = '5.3' + s.swift_version = '6.0' s.public_header_files = 'FirebaseFirestoreUI/Sources/Public/FirebaseFirestoreUI/*.h' s.source_files = 'FirebaseFirestoreUI/Sources/**/*.{h,m}' diff --git a/FirebaseGoogleAuthUI.podspec b/FirebaseGoogleAuthUI.podspec index dcc44c26bd..f7282fa20c 100644 --- a/FirebaseGoogleAuthUI.podspec +++ b/FirebaseGoogleAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseGoogleAuthUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'Google authentication for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', } - s.swift_version = '5.3' + s.swift_version = '6.0' s.public_header_files = 'FirebaseGoogleAuthUI/Sources/Public/FirebaseGoogleAuthUI/*.h' s.source_files = 'FirebaseGoogleAuthUI/Sources/**/*.{h,m}' diff --git a/FirebaseOAuthUI.podspec b/FirebaseOAuthUI.podspec index f6150a980e..f166fedbf1 100644 --- a/FirebaseOAuthUI.podspec +++ b/FirebaseOAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseOAuthUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'A collection of OAuth providers for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', } - s.swift_version = '5.3' + s.swift_version = '6.0' s.public_header_files = 'FirebaseOAuthUI/Sources/Public/FirebaseOAuthUI/*.h' s.source_files = 'FirebaseOAuthUI/Sources/**/*.{h,m}' diff --git a/FirebasePhoneAuthUI.podspec b/FirebasePhoneAuthUI.podspec index bb2c33fa3f..ba26f7df07 100644 --- a/FirebasePhoneAuthUI.podspec +++ b/FirebasePhoneAuthUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebasePhoneAuthUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'A phone auth provider for FirebaseAuthUI.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -14,7 +14,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', } - s.swift_version = '5.3' + s.swift_version = '6.0' s.public_header_files = 'FirebasePhoneAuthUI/Sources/Public/FirebasePhoneAuthUI/*.h' s.source_files = 'FirebasePhoneAuthUI/Sources/**/*.{h,m}' diff --git a/FirebaseStorageUI.podspec b/FirebaseStorageUI.podspec index 9bbd569b1b..4eef6c3a01 100644 --- a/FirebaseStorageUI.podspec +++ b/FirebaseStorageUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseStorageUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'UI binding libraries for Firebase.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -15,7 +15,7 @@ Pod::Spec.new do |s| s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', } - s.swift_version = '5.3' + s.swift_version = '6.0' s.tvos.deployment_target = '13.0' s.public_header_files = 'FirebaseStorageUI/Sources/Public/FirebaseStorageUI/*.h' diff --git a/FirebaseUI.podspec b/FirebaseUI.podspec index 275d450cc4..e5acffd446 100644 --- a/FirebaseUI.podspec +++ b/FirebaseUI.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = 'FirebaseUI' - s.version = '14.2.7' + s.version = '15.0.0' s.summary = 'UI binding libraries for Firebase.' s.homepage = 'https://github.com/firebase/FirebaseUI-iOS' s.license = { :type => 'Apache 2.0', :file => 'LICENSE' } @@ -12,7 +12,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.public_header_files = 'FirebaseUI.h' s.source_files = 'FirebaseUI.h' - s.swift_versions = '5.3' + s.swift_version = '6.0' s.cocoapods_version = '>= 1.8.0' s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '"${PODS_TARGET_SRCROOT}"', diff --git a/Package.resolved b/Package.resolved new file mode 100644 index 0000000000..708a6697f7 --- /dev/null +++ b/Package.resolved @@ -0,0 +1,169 @@ +{ + "object": { + "pins": [ + { + "package": "abseil", + "repositoryURL": "https://github.com/google/abseil-cpp-binary.git", + "state": { + "branch": null, + "revision": "194a6706acbd25e4ef639bcaddea16e8758a3e27", + "version": "1.2024011602.0" + } + }, + { + "package": "AppCheck", + "repositoryURL": "https://github.com/google/app-check.git", + "state": { + "branch": null, + "revision": "61b85103a1aeed8218f17c794687781505fbbef5", + "version": "11.2.0" + } + }, + { + "package": "AppAuth", + "repositoryURL": "https://github.com/openid/AppAuth-iOS.git", + "state": { + "branch": null, + "revision": "c89ed571ae140f8eb1142735e6e23d7bb8c34cb2", + "version": "1.7.5" + } + }, + { + "package": "Facebook", + "repositoryURL": "https://github.com/facebook/facebook-ios-sdk.git", + "state": { + "branch": null, + "revision": "619d1772808425faa010d92293b26eeb9bc1d630", + "version": "17.4.0" + } + }, + { + "package": "Firebase", + "repositoryURL": "https://github.com/firebase/firebase-ios-sdk.git", + "state": { + "branch": null, + "revision": "dbdfdc44bee8b8e4eaa5ec27eb12b9338f3f2bc1", + "version": "11.5.0" + } + }, + { + "package": "GoogleAppMeasurement", + "repositoryURL": "https://github.com/google/GoogleAppMeasurement.git", + "state": { + "branch": null, + "revision": "4f234bcbdae841d7015258fbbf8e7743a39b8200", + "version": "11.4.0" + } + }, + { + "package": "GoogleDataTransport", + "repositoryURL": "https://github.com/google/GoogleDataTransport.git", + "state": { + "branch": null, + "revision": "617af071af9aa1d6a091d59a202910ac482128f9", + "version": "10.1.0" + } + }, + { + "package": "GoogleSignIn", + "repositoryURL": "https://github.com/google/GoogleSignIn-iOS", + "state": { + "branch": null, + "revision": "a7965d134c5d3567026c523e0a8a583f73b62b0d", + "version": "7.1.0" + } + }, + { + "package": "GoogleUtilities", + "repositoryURL": "https://github.com/google/GoogleUtilities.git", + "state": { + "branch": null, + "revision": "53156c7ec267db846e6b64c9f4c4e31ba4cf75eb", + "version": "8.0.2" + } + }, + { + "package": "gRPC", + "repositoryURL": "https://github.com/google/grpc-binary.git", + "state": { + "branch": null, + "revision": "f56d8fc3162de9a498377c7b6cea43431f4f5083", + "version": "1.65.1" + } + }, + { + "package": "GTMSessionFetcher", + "repositoryURL": "https://github.com/google/gtm-session-fetcher.git", + "state": { + "branch": null, + "revision": "a2ab612cb980066ee56d90d60d8462992c07f24b", + "version": "3.5.0" + } + }, + { + "package": "GTMAppAuth", + "repositoryURL": "https://github.com/google/GTMAppAuth.git", + "state": { + "branch": null, + "revision": "5d7d66f647400952b1758b230e019b07c0b4b22a", + "version": "4.1.1" + } + }, + { + "package": "InteropForGoogle", + "repositoryURL": "https://github.com/google/interop-ios-for-google-sdks.git", + "state": { + "branch": null, + "revision": "2d12673670417654f08f5f90fdd62926dc3a2648", + "version": "100.0.0" + } + }, + { + "package": "leveldb", + "repositoryURL": "https://github.com/firebase/leveldb.git", + "state": { + "branch": null, + "revision": "a0bc79961d7be727d258d33d5a6b2f1023270ba1", + "version": "1.22.5" + } + }, + { + "package": "nanopb", + "repositoryURL": "https://github.com/firebase/nanopb.git", + "state": { + "branch": null, + "revision": "b7e1104502eca3a213b46303391ca4d3bc8ddec1", + "version": "2.30910.0" + } + }, + { + "package": "Promises", + "repositoryURL": "https://github.com/google/promises.git", + "state": { + "branch": null, + "revision": "540318ecedd63d883069ae7f1ed811a2df00b6ac", + "version": "2.4.0" + } + }, + { + "package": "SDWebImage", + "repositoryURL": "https://github.com/SDWebImage/SDWebImage.git", + "state": { + "branch": null, + "revision": "10d06f6a33bafae8c164fbfd1f03391f6d4692b3", + "version": "5.20.0" + } + }, + { + "package": "SwiftProtobuf", + "repositoryURL": "https://github.com/apple/swift-protobuf.git", + "state": { + "branch": null, + "revision": "ebc7251dd5b37f627c93698e4374084d98409633", + "version": "1.28.2" + } + } + ] + }, + "version": 1 +} diff --git a/Package.swift b/Package.swift index c4796e2255..937282f068 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.3 +// swift-tools-version:6.0 // The swift-tools-version declares the minimum version of Swift required to build this package. // Copyright 2021 Google LLC @@ -67,7 +67,7 @@ let package = Package( .package( name: "Facebook", url: "https://github.com/facebook/facebook-ios-sdk.git", - "11.0.0"..<"18.0.0" + "17.0.0"..<"18.0.0" ), .package( name: "Firebase",