Merge branch 'master'

Author: qdpham13

.github/workflows/abtesting.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos]
+        target: [ios, tvos, macos]
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1

.github/workflows/auth.yml

@@ -27,7 +27,7 @@ jobs:
       POD_LIB_LINT_ONLY: 1
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos]
+        target: [ios, tvos, macos]
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
@@ -141,8 +141,8 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        # The macos and tvos tests can hang, and watchOS doesn't have tests.
-        target: [ios, tvos --skip-tests, macos --skip-tests, watchos --skip-tests]
+        # The macos and tvos tests can hang.
+        target: [ios, tvos --skip-tests, macos --skip-tests]
         flags: [
           '--use-static-frameworks'
         ]

.github/workflows/crashlytics.yml

@@ -26,7 +26,7 @@ jobs:
 
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos --skip-tests]
+        target: [ios, tvos, macos]
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
@@ -110,8 +110,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        # Disable watchos because it does not support XCTest.
-        target: [ios, tvos, macos, watchos --skip-tests]
+        target: [ios, tvos, macos]
         flags: [
           '--use-static-frameworks'
         ]

.github/workflows/database.yml

@@ -120,7 +120,7 @@ jobs:
 
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos]
+        target: [ios, tvos, macos]
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1

.github/workflows/firestore.yml

@@ -126,14 +126,15 @@ jobs:
   sanitizers:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    # TODO(b/231154868): GRPC 1.44 cause link issues on Mac, moving it to Ubuntu for now and add Mac when it is resolved.
-    runs-on: ubuntu-latest
     needs: check
 
     strategy:
       matrix:
+        os: [macos-12, ubuntu-latest]
         sanitizer: [asan, tsan]
 
+    runs-on: ${{ matrix.os }}
+
     env:
       SANITIZERS: ${{ matrix.sanitizer }}
 

.github/workflows/functions.yml

@@ -30,7 +30,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos]
+        target: [ios, tvos, macos]
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1

.github/workflows/messaging.yml

@@ -138,20 +138,6 @@ jobs:
       run: ([ -z $plist_secret ] ||
             scripts/third_party/travis/retry.sh scripts/test_quickstart.sh Messaging false swift)
 
-  pod-lib-lint-watchos:
-    # Don't run on private repo unless it is a PR.
-    if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'
-    runs-on: macos-12
-
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-    - name: Setup Bundler
-      run: scripts/setup_bundler.sh
-    - name: Build and test
-      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMessaging.podspec --skip-tests --platforms=watchos
-
-
   messaging-cron-only:
     # Don't run on private repo.
     if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
@@ -171,24 +157,6 @@ jobs:
     - name: PodLibLint Messaging Cron
       run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=${{ matrix.target }}
 
-  messaging-watchos-cron-only:
-    # Don't run on private repo.
-    if: github.event_name == 'schedule' && github.repository == 'Firebase/firebase-ios-sdk'
-    runs-on: macos-12
-    strategy:
-      matrix:
-        flags: [
-          '--use-static-frameworks'
-        ]
-    needs: pod-lib-lint-watchos
-    steps:
-    - uses: actions/checkout@v2
-    - uses: ruby/setup-ruby@v1
-    - name: Setup Bundler
-      run: scripts/setup_bundler.sh
-    - name: PodLibLint Messaging Cron
-      run: scripts/third_party/travis/retry.sh scripts/pod_lib_lint.rb FirebaseMessaging.podspec --platforms=watchos
-
   messaging-sample-build-test:
     # Don't run on private repo unless it is a PR.
     if: (github.repository == 'Firebase/firebase-ios-sdk' && github.event_name == 'schedule') || github.event_name == 'pull_request'

.github/workflows/remoteconfig.yml

@@ -59,7 +59,7 @@ jobs:
 
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos]
+        target: [ios, tvos, macos]
         podspec: [FirebaseRemoteConfig.podspec, FirebaseRemoteConfigSwift.podspec --skip-tests]
     steps:
     - uses: actions/checkout@v2

.github/workflows/sessions.yml

@@ -25,7 +25,7 @@ jobs:
 
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos --skip-tests]
+        target: [ios, tvos, macos]
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1

.github/workflows/shared-swift.yml

@@ -23,7 +23,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos]
+        target: [ios, tvos, macos]
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1

.github/workflows/storage.yml

@@ -106,7 +106,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos]
+        target: [ios, tvos, macos]
     steps:
     - uses: actions/checkout@v2
     - uses: ruby/setup-ruby@v1
@@ -122,7 +122,7 @@ jobs:
     runs-on: macos-12
     strategy:
       matrix:
-        target: [ios, tvos, macos, watchos]
+        target: [ios, tvos, macos]
     needs: pod-lib-lint
     steps:
     - uses: actions/checkout@v2

.github/workflows/zip.yml

@@ -402,6 +402,9 @@ jobs:
       SDK: "Firestore"
     runs-on: macos-12
     steps:
+      # Xcode 14 fails to build FirebaseAuthUI because it includes Resources. See #9886.
+    - name: Xcode 13.3.1
+      run: sudo xcode-select -s /Applications/Xcode_13.3.1.app/Contents/Developer
     - uses: actions/checkout@v2
     - name: Get framework dir
       uses: actions/download-artifact@v1

Carthage.md

@@ -50,7 +50,7 @@ binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseRemoteConfigBinar
 binary "https://dl.google.com/dl/firebase/ios/carthage/FirebaseStorageBinary.json"
 ```
 - Run `carthage update`
-- Use Finder to open `Carthage/Build/iOS`.
+- Use Finder to open `Carthage/Build`.
 - Copy the contents into the top level of your Xcode project and make sure
     they're added to the right build target(s).
     - To disable AdId support, do not copy

Dangerfile

@@ -24,6 +24,18 @@ def hasChangesIn(paths)
   return false
 end
 
+# Determine if any new files were added to paths matching any of the
+# path patterns provided.
+def hasAdditionsIn(paths)
+  path_array = Array(paths)
+  path_array.each do |dir|
+    if !git.added_files.grep(/#{dir}/).empty?
+      return true
+    end
+  end
+  return false
+end
+
 # Adds the provided labels to the current PR.
 def addLabels(label_array)
   issue_number = github.pr_json["number"]
@@ -118,6 +130,8 @@ has_license_changes = didModify(["LICENSE"])
 @has_storage_changes = hasChangesIn("FirebaseStorage")
 
 @has_releasetooling_changes = hasChangesIn("ReleaseTooling/")
+@has_public_additions = hasAdditionsIn("Public/")
+@has_umbrella_changes = hasChangesIn("Firebase*.h")
 
 # Convenient flag for all API changes.
 @has_api_changes = @has_abtesting_api_changes ||
@@ -164,6 +178,14 @@ if has_sdk_changes
   end
 end
 
+# Warn if a new public header file is added but no umbrella header changes
+# are detected. Prevents regression of #10301
+if @has_public_additions && !@has_umbrella_changes
+  error = "New public headers were added, "\
+      "did you remember to add them to the umbrella header?"
+  fail(error)
+end
+
 # Error on license edits
 fail("LICENSE changes are explicitly disallowed.") if has_license_changes