Merge pull request #1188 from firebase/nc/12960

[Bug] Fix firebase-ios-sdk/#12960
firebase · May 14, 2024 · 6ed31d5 · 6ed31d5
2 parents d5c037c + 5ae9c08
commit 6ed31d5
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 14 deletions.
diff --git a/.github/workflows/anonymousauth.yml b/.github/workflows/anonymousauth.yml
@@ -54,7 +54,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseAnonymousAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
+          xcodebuild -scheme FirebaseAnonymousAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml
@@ -50,7 +50,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
+          xcodebuild -scheme FirebaseAuthUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest
@@ -61,5 +61,6 @@ jobs:
       - name: Setup
         run: gem install bundler; bundle install
       - name: Build
+        # Allow warnings for deprecated `updateEmail:completion:` API.
         run: |
-          bundle exec pod lib lint FirebaseAuthUI.podspec
+          bundle exec pod lib lint FirebaseAuthUI.podspec --allow-warnings
diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
@@ -50,7 +50,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseDatabaseUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
+          xcodebuild -scheme FirebaseDatabaseUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/emailauth.yml b/.github/workflows/emailauth.yml
@@ -54,7 +54,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseEmailAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
+          xcodebuild -scheme FirebaseEmailAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest
@@ -65,6 +65,8 @@ jobs:
       - name: Setup
         run: gem install bundler; bundle install
       - name: Build
+        # Allow warnings for deprecated `updateEmail:completion:` API.
         run: |
           bundle exec pod lib lint FirebaseEmailAuthUI.podspec \
-            --include-podspecs=FirebaseAuthUI.podspec
+            --include-podspecs=FirebaseAuthUI.podspec \
+            --allow-warnings
diff --git 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 13 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/.github/workflows/firestore.yml b/.github/workflows/firestore.yml
@@ -50,7 +50,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseFirestoreUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
+          xcodebuild -scheme FirebaseFirestoreUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/googleauth.yml b/.github/workflows/googleauth.yml
@@ -52,7 +52,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseGoogleAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
+          xcodebuild -scheme FirebaseGoogleAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/oauth.yml b/.github/workflows/oauth.yml
@@ -54,7 +54,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseOAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
+          xcodebuild -scheme FirebaseOAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/phoneauth.yml b/.github/workflows/phoneauth.yml
@@ -54,7 +54,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebasePhoneAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
+          xcodebuild -scheme FirebasePhoneAuthUI -sdk iphonesimulator  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/.github/workflows/storage.yml b/.github/workflows/storage.yml
@@ -50,7 +50,7 @@ jobs:
           xcodebuild -list
       - name: Build
         run: |
-          xcodebuild -scheme FirebaseStorageUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro'
+          xcodebuild -scheme FirebaseStorageUI -sdk iphonesimulator -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro'
   pod:
     name: pod lib lint
     runs-on: macOS-latest

diff --git a/FirebaseAuthUI/Sources/FUIAuthStrings.m b/FirebaseAuthUI/Sources/FUIAuthStrings.m
@@ -123,7 +123,7 @@
 /** @var kTableName
     @brief The name of the strings table to search for localized strings.
  */
-NSString *const kTableName = @"FirebaseAuthUI";
+static NSString *const kTableName = @"FirebaseAuthUI";
 
 NSString *FUILocalizedString(NSString *key) {
   return FUILocalizedStringFromTable(key, kTableName);

diff --git a/test.sh b/test.sh
@@ -11,7 +11,7 @@ pushd "$module_name";
   -workspace "$module_name.xcworkspace" \
   -scheme "$module_name" \
   -sdk iphonesimulator \
-  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 13 Pro' \
+  -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15 Pro' \
   clean build test \
   ONLY_ACTIVE_ARCH=YES \
   | xcpretty) || EXIT_STATUS=$?;