Recaptcha Phone Auth

.github/workflows/client_app.yml

@@ -30,7 +30,9 @@ jobs:
       matrix:
         #TODO(ncooke3): Add multi-platform support: tvOS, macOS, catalyst
         platform: [iOS]
-        scheme: [ClientApp, ClientApp-iOS13]
+        scheme: [ClientApp-iOS13]
+        # TODO(ncooke3): Re-enable after updating Firestore binary.
+        #scheme: [ClientApp, ClientApp-iOS13]
     steps:
       - uses: actions/checkout@v4
       - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126

.github/workflows/firestore.yml

@@ -50,7 +50,6 @@ jobs:
               # Podspec
               - 'FirebaseFirestoreInternal.podspec'
               - 'FirebaseFirestore.podspec'
-              - 'FirebaseFirestoreSwift.podspec'
 
               # CMake
               - '**CMakeLists.txt'
@@ -462,8 +461,6 @@ jobs:
       run: scripts/setup_spm_tests.sh
     - name: iOS Build Test
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestore ${{ matrix.target }} spmbuildonly
-    - name: Swift Build
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift ${{ matrix.target }} spmbuildonly
 
   spm-binary:
     # Either a scheduled run from public repo, or a pull request with firestore changes.
@@ -481,8 +478,6 @@ jobs:
       run: scripts/setup_spm_tests.sh
     - name: iOS Build Test
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestore iOS spmbuildonly
-    - name: Swift Build
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift iOS spmbuildonly
 
   check-firestore-internal-public-headers:
     # Either a scheduled run from public repo, or a pull request with firestore changes.
@@ -534,8 +529,6 @@ jobs:
   #     run: scripts/setup_spm_tests.sh
   #   - name: Build Test - Binary
   #     run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestore ${{ matrix.target }} spmbuildonly
-  #   - name: Swift Build
-  #     run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift ${{ matrix.target }} spmbuildonly
 
   spm-binary-cron:
     # Don't run on private repo.
@@ -553,8 +546,6 @@ jobs:
       run: scripts/setup_spm_tests.sh
     - name: Build Test - Binary
       run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestore ${{ matrix.target }} spmbuildonly
-    - name: Swift Build
-      run: scripts/third_party/travis/retry.sh ./scripts/build.sh FirebaseFirestoreSwift ${{ matrix.target }} spmbuildonly
 
   # A job that fails if any required job in the test matrix fails,
   # to be used as a required check for merging.

.github/workflows/remoteconfig.yml

@@ -24,10 +24,11 @@ jobs:
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
     env:
       plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+      USE_REAL_CONSOLE: true
     runs-on: macos-14
     strategy:
       matrix:
-        target: [iOS, tvOS, macOS]
+        target: [iOS]
     steps:
     - uses: actions/checkout@v4
     - uses: mikehardy/buildcache-action@c87cea0ccd718971d6cc39e672c4f26815b6c126
@@ -40,13 +41,13 @@ jobs:
       run: gem install xcpretty
     - name: Install Secret GoogleService-Info.plist
       run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/RemoteConfigSwiftAPI/GoogleService-Info.plist.gpg \
-          FirebaseRemoteConfigSwift/Tests/SwiftAPI/GoogleService-Info.plist "$plist_secret"
+          FirebaseRemoteConfig/Tests/Swift/SwiftAPI/GoogleService-Info.plist "$plist_secret"
     - name: Generate Access Token for RemoteConfigConsoleAPI in IntegrationTests
       if: matrix.target == 'iOS'
       run: ([ -z $plist_secret ] || scripts/generate_access_token.sh "$plist_secret" scripts/gha-encrypted/RemoteConfigSwiftAPI/ServiceAccount.json.gpg
-          FirebaseRemoteConfigSwift/Tests/AccessToken.json)
+          FirebaseRemoteConfig/Tests/Swift/AccessToken.json)
     - name: Fake Console API Tests
-      run: scripts/third_party/travis/retry.sh scripts/build.sh RemoteConfig iOS fakeconsole
+      run: scripts/third_party/travis/retry.sh scripts/build.sh RemoteConfig ${{ matrix.target }} fakeconsole
     - name: IntegrationTest
       if: matrix.target == 'iOS'
       # No retry to avoid exhausting AccessToken quota.
@@ -65,7 +66,8 @@ jobs:
         include:
           - os: macos-14
             xcode: Xcode_15.3
-            tests:
+            # TODO(#13078): Fix testing infra to enforce warnings again.
+            tests: --allow-warnings
           # Flaky tests on CI
           - os: macos-13
             xcode: Xcode_15.2

CoreOnly/Tests/FirebasePodTest/FirebasePodTest/AppDelegate.swift

@@ -15,9 +15,8 @@
 import Firebase
 
 // Verify that the following Firebase Swift APIs can be found.
-import FirebaseAnalyticsSwift
-import FirebaseFirestoreSwift
-import FirebaseInAppMessagingSwift
+import FirebaseAnalytics
+import FirebaseInAppMessaging
 import UIKit
 
 class CoreExists: FirebaseApp {}

CoreOnly/Tests/FirebasePodTest/Podfile

@@ -11,18 +11,16 @@ target 'FirebasePodTest' do
 
   pod 'Firebase', :path => '../../../'
   pod 'FirebaseABTesting', :path => '../../../'
-  pod 'FirebaseAnalyticsSwift', :path => '../../../'
   pod 'FirebaseAppDistribution', :path => '../../../'
   pod 'FirebaseAuth', :path => '../../../'
   pod 'FirebaseCore', :path => '../../../'
   pod 'FirebaseCrashlytics', :path => '../../../'
   pod 'FirebaseDatabase', :path => '../../../'
   pod 'FirebaseDynamicLinks', :path => '../../../'
   pod 'FirebaseFirestore', :path => '../../../'
-  pod 'FirebaseFirestoreSwift', :path => '../../../'
+  pod 'FirebaseFirestoreInternal', :path => '../../../'
   pod 'FirebaseFunctions', :path => '../../../'
   pod 'FirebaseInAppMessaging', :path => '../../../'
-  pod 'FirebaseInAppMessagingSwift', :path => '../../../'
   pod 'FirebaseInstallations', :path => '../../../'
   pod 'FirebaseMessaging', :path => '../../../'
   pod 'FirebasePerformance', :path => '../../../'

Crashlytics/Crashlytics/FIRCrashlytics.m

@@ -227,12 +227,6 @@ + (void)load {
 }
 
 + (NSArray<FIRComponent *> *)componentsToRegister {
-  FIRDependency *analyticsDep =
-      [FIRDependency dependencyWithProtocol:@protocol(FIRAnalyticsInterop)];
-
-  FIRDependency *sessionsDep =
-      [FIRDependency dependencyWithProtocol:@protocol(FIRSessionsProvider)];
-
   FIRComponentCreationBlock creationBlock =
       ^id _Nullable(FIRComponentContainer *container, BOOL *isCacheable) {
     if (!container.app.isDefaultApp) {
@@ -259,7 +253,6 @@ + (void)load {
   FIRComponent *component =
       [FIRComponent componentWithProtocol:@protocol(FIRCrashlyticsInstanceProvider)
                       instantiationTiming:FIRInstantiationTimingEagerInDefaultApp
-                             dependencies:@[ analyticsDep, sessionsDep ]
                             creationBlock:creationBlock];
   return @[ component ];
 }

Dangerfile

@@ -108,12 +108,10 @@ has_license_changes = didModify(["LICENSE"])
 ## Product directories
 @has_analytics_changes = hasChangesIn([
   "FirebaseAnalyticsOnDeviceConversionWrapper",
-  "FirebaseAnalyticsSwift",
   "FirebaseAnalyticsWithoutAdIdSupportWrapper",
   "FirebaseAnalyticsWrapper"
 ]) || didModify([
   "FirebaseAnalytics.podspec",
-  "FirebaseAnalyticsSwift.podspec",
   "FirebaseAnalyticsOnDeviceConversion.podspec",
   "GoogleAppMeasurement.podspec",
   "GoogleAppMeasurementOnDeviceConversion.podspec"

Example/FirestoreSample/FirestoreSample.xcodeproj/project.pbxproj

@@ -8,7 +8,6 @@
 
 /* Begin PBXBuildFile section */
 		8817084726B95A63009E9281 /* FirebaseFirestore in Frameworks */ = {isa = PBXBuildFile; productRef = 8817084626B95A63009E9281 /* FirebaseFirestore */; };
-		8817084926B95A63009E9281 /* FirebaseFirestoreSwift in Frameworks */ = {isa = PBXBuildFile; productRef = 8817084826B95A63009E9281 /* FirebaseFirestoreSwift */; };
 		88327B8826D62908002AA6D9 /* FavouriteFruitsView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88327B8726D62908002AA6D9 /* FavouriteFruitsView.swift */; };
 		8844BA6126E0DD3F000786F0 /* FavouriteFruitsMappingErrorView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8844BA6026E0DD3F000786F0 /* FavouriteFruitsMappingErrorView.swift */; };
 		88D5E37826EBD2F200808AFF /* FavouriteFruitsMappingErrorView2.swift in Sources */ = {isa = PBXBuildFile; fileRef = 88D5E37726EBD2F200808AFF /* FavouriteFruitsMappingErrorView2.swift */; };
@@ -44,7 +43,6 @@
 			files = (
 				8817084726B95A63009E9281 /* FirebaseFirestore in Frameworks */,
 				88D9354C2A39D72300FD8AFF /* FirebaseAuth in Frameworks */,
-				8817084926B95A63009E9281 /* FirebaseFirestoreSwift in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -143,7 +141,6 @@
 			name = FirestoreSample;
 			packageProductDependencies = (
 				8817084626B95A63009E9281 /* FirebaseFirestore */,
-				8817084826B95A63009E9281 /* FirebaseFirestoreSwift */,
 				88D9354B2A39D72300FD8AFF /* FirebaseAuth */,
 			);
 			productName = FirestoreSample;
@@ -418,10 +415,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = FirebaseFirestore;
 		};
-		8817084826B95A63009E9281 /* FirebaseFirestoreSwift */ = {
-			isa = XCSwiftPackageProductDependency;
-			productName = FirebaseFirestoreSwift;
-		};
 		88D9354B2A39D72300FD8AFF /* FirebaseAuth */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = FirebaseAuth;

Example/FirestoreSample/FirestoreSample/Views/FavouriteFruitsAnimationView.swift

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import FirebaseFirestore
-import FirebaseFirestoreSwift
 import SwiftUI
 
 private struct Fruit: Codable, Identifiable, Equatable {

Example/FirestoreSample/FirestoreSample/Views/FavouriteFruitsMappingErrorView.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseFirestoreSwift
+import FirebaseFirestore
 import SwiftUI
 
 private struct Fruit: Codable, Identifiable, Equatable {

Example/FirestoreSample/FirestoreSample/Views/FavouriteFruitsMappingErrorView2.swift

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-import FirebaseFirestoreSwift
+import FirebaseFirestore
 import SwiftUI
 
 private struct Fruit: Codable, Identifiable, Equatable {

Example/FirestoreSample/FirestoreSample/Views/FavouriteFruitsNoAnimationsView.swift

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import FirebaseFirestore
-import FirebaseFirestoreSwift
 import SwiftUI
 
 private struct Fruit: Codable, Identifiable, Equatable {

Example/FirestoreSample/FirestoreSample/Views/FavouriteFruitsView.swift

@@ -13,7 +13,6 @@
 // limitations under the License.
 
 import FirebaseFirestore
-import FirebaseFirestoreSwift
 import SwiftUI
 
 private struct Fruit: Codable, Identifiable, Equatable {