Merge remote-tracking branch 'origin/master' into LevelDbDocumentOverlayCache

Author: dconeybe

.github/workflows/zip.yml

@@ -199,9 +199,11 @@ jobs:
         mkdir -p "${HOME}"/ios_frameworks/
         find "${GITHUB_WORKSPACE}/${FRAMEWORK_DIR}" -name "Firebase*latest.zip" -exec unzip -d "${HOME}"/ios_frameworks/ {} +
     - name: Setup Swift Quickstart
-      run: SAMPLE="$SDK" TARGET="${SDK}Example" scripts/setup_quickstart_framework.sh \
+
+      run: SAMPLE="$SDK" TARGET="${SDK}Example" NON_FIREBASE_SDKS="FirebaseRemoteConfigSwift FirebaseSharedSwift" scripts/setup_quickstart_framework.sh \
                                                "${HOME}"/ios_frameworks/Firebase/FirebaseRemoteConfig/* \
-                                               "${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/*
+                                               "${HOME}"/ios_frameworks/Firebase/FirebaseAnalytics/* \
+                                               "${HOME}"/ios_frameworks/Firebase/NonFirebaseSDKs/*
     - name: Install Secret GoogleService-Info.plist
       run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/qs-config.plist.gpg \
         quickstart-ios/config/GoogleService-Info.plist "$plist_secret"

FirebaseMessaging/Tests/UnitTestsSwift/FIRMessagingAPITest.swift

@@ -22,15 +22,69 @@ import UserNotifications
 // exercised in the integration tests.
 func apis() {
   let messaging = Messaging.messaging()
+  let delegate = CustomDelegate()
+  messaging.delegate = delegate
+  messaging.isAutoInitEnabled = false
+  messaging.token(completion: { _, _ in
+  })
+  messaging.deleteToken { _ in
+  }
+  messaging.retrieveFCMToken(forSenderID: "fakeSenderID") { _, _ in
+  }
+  messaging.deleteData { _ in
+  }
+  messaging.deleteFCMToken(forSenderID: "fakeSenderID") { _ in
+  }
 
   if let _ = messaging.apnsToken {}
 
   let apnsToken = Data()
   messaging.setAPNSToken(apnsToken, type: .prod)
 
+  // Use random to eliminate the warning that we're evaluating to a constant.
+  let type: MessagingAPNSTokenType = Bool.random() ? .prod : .sandbox
+  switch type {
+  case .prod: ()
+  case .sandbox: ()
+  case .unknown: ()
+    // Intentionally leave the warning for not handling unknown values as that's the only way this
+    // will fail to compile if we add a case.
+  }
+
+  // Use random to eliminate the warning that we're evaluating to a constant.
+  let messagingError: MessagingError = Bool.random() ? .unknown : .authentication
+  switch messagingError {
+  case .unknown: ()
+  case .authentication: ()
+  case .noAccess: ()
+  case .timeout: ()
+  case .network: ()
+  case .operationInProgress: ()
+  case .invalidRequest: ()
+  case .invalidTopicName: ()
+    // Intentionally leave the warning for not handling unknown values as that's the only way this
+    // will fail to compile if we add a case.
+  }
+
+  // Use random to eliminate the warning that we're evaluating to a constant.
+  let status: MessagingMessageStatus = Bool.random() ? .unknown : .new
+  switch status {
+  case .new: ()
+  case .unknown: ()
+    // Intentionally leave the warning for not handling unknown values as that's the only way this
+    // will fail to compile if we add a case.
+  }
+
+  // TODO: Mark the initializer as unavialable, as devs shouldn't be able to instantiate this.
+  _ = MessagingMessageInfo().status
+
+  NotificationCenter.default.post(name: .MessagingRegistrationTokenRefreshed, object: nil)
+
   let topic = "cat_video"
   messaging.subscribe(toTopic: topic)
   messaging.unsubscribe(fromTopic: topic)
+  messaging.unsubscribe(fromTopic: topic) { _ in
+  }
 
   messaging.appDidReceiveMessage([:])
 
@@ -43,6 +97,10 @@ func apis() {
   }
 }
 
+class CustomDelegate: NSObject, MessagingDelegate {
+  func messaging(_ messaging: Messaging, didReceiveRegistrationToken fcmToken: String?) {}
+}
+
 @available(iOS 15, tvOS 15, macOS 12, watchOS 8, *)
 func apiAsync() async throws {
   let messaging = Messaging.messaging()

SwiftDashboard.md

@@ -10,7 +10,7 @@ tasks for additional Swift improvements.
 |                       | AB  | An     | ApC    | ApD    | Aut    | Cor    | Crs    | DB     | Fst    | Fn     | IAM    | Ins    | Msg    | MLM    | Prf    | RC     |    Str |
 |   :---                | :--- | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: | :----: |
 | **Swift Library**     | ❌   |   ✔   | ❌     |❌     | ❌     | ❌     | ❌      |  ✔     |  ✔    | 1      |  ✔     | ❌    | ❌     | ✔      | ❌     |  ✔    | ✔     |
-| **API Tests**         | ❌   |  ❌    |  ✔    |❌     | ✔      | ✔       | ❌     | 3      | 2     |  ✔     | 2      | ✔      | 2     | 2      | ❌    |  ✔     | ✔    |
+| **API Tests**         | ❌   |  ❌    |  ✔    |❌     | ✔      | ✔       | ❌     | 3      | 2     |  ✔     | 2      | ✔      | ✔     | 2      | ❌    |  ✔     | ✔    |
 | **async/await**       | ❌   |  n/a   |  ✔    |❌     | ✔      |  ✔      | ❌     | 3     |  ✔     |  ✔     | ❌     | ❌    | ✔     | ❌    | ❌     |  ✔    | ✔    |
 | **Swift Errors**      |  ❌  |  ❌    | ❌    |❌     | 4      | ❌     | ❌     | ❌     | ❌    | ❌     | ❌     | ❌    | ❌     | ✔      | ❌     |  ✔   | 5   |
 | **Codable**           | n/a  | n/a     | n/a   |n/a    | n/a     | n/a    |n/a     |  ✔     |  ✔     | 1      | n/a     | n/a   | ❌     | n/a    | n/a    |   ✔  |n/a   |

scripts/build_non_firebase_sdks.sh

@@ -30,7 +30,9 @@ do
   if [ ${sdk} == "FirebaseFirestoreSwift" ]; then
     echo "{\"name\":\"FirebaseFirestoreSwift\", \"version\" : \"> 8.2-beta\"}" >>  "${ZIP_POD_JSON}"
   elif [ ${sdk} == "FirebaseStorageSwift" ]; then
-    echo "{\"name\":\"FirebaseStorageSwift\", \"version\" : \"> 8.2-beta\"}" >>  "${ZIP_POD_JSON}"
+    echo "{\"name\":\"FirebaseStorageSwift\", \"version\" : \"> 8.12-beta\"}" >>  "${ZIP_POD_JSON}"
+  elif [ ${sdk} == "FirebaseRemoteConfigSwift" ]; then
+    echo "{\"name\":\"FirebaseRemoteConfigSwift\", \"version\" : \"> 8.12-beta\"}" >>  "${ZIP_POD_JSON}"
   else
     echo "{\"name\":\"${sdk}\"}" >>  "${ZIP_POD_JSON}"
   fi

scripts/health_metrics/get_updated_files.sh

@@ -37,7 +37,7 @@ cd scripts/health_metrics/generate_code_coverage_report
 # merge commit to the head commit from the target branch.
 git diff --name-only remotes/origin/${GITHUB_BASE_REF} ${GITHUB_SHA} > updated_files.txt
 
-if [ -z $spec_output_file] ; then
+if [ -z $spec_output_file ] ; then
   swift run UpdatedFilesCollector --changed-file-paths updated_files.txt --code-coverage-file-patterns ../file_patterns.json
 else
   swift run UpdatedFilesCollector --changed-file-paths updated_files.txt --code-coverage-file-patterns ../file_patterns.json --output-sdk-file-url "${spec_output_file}" --exclude-podspecs ${exclude_specs}