From 47c133d1e207c92fa090122d2b62809e00a6a0f3 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 14 May 2024 10:27:30 -0400
Subject: [PATCH 1/5] [Bug] Fix firebase-ios-sdk/#12960

---
 FirebaseAuthUI/Sources/FUIAuthStrings.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FirebaseAuthUI/Sources/FUIAuthStrings.m b/FirebaseAuthUI/Sources/FUIAuthStrings.m
index 99810b10a00..2ada2d22d82 100644
--- 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);

From 1ea708afb3eda113ae2b60c9becf52ab1ef1225c Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 14 May 2024 10:39:19 -0400
Subject: [PATCH 2/5] CI ctrl run

---
 FirebaseAuthUI/Sources/FUIAuthStrings.m | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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

From 0030345f0c9fa343b416b37b948c8c3dbf2b75cb Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 14 May 2024 11:41:14 -0400
Subject: [PATCH 3/5] Attempt to fix CI

---
 .github/workflows/anonymousauth.yml | 2 +-
 .github/workflows/auth.yml          | 2 +-
 .github/workflows/database.yml      | 2 +-
 .github/workflows/emailauth.yml     | 2 +-
 .github/workflows/facebookauth.yml  | 2 +-
 .github/workflows/firestore.yml     | 2 +-
 .github/workflows/googleauth.yml    | 2 +-
 .github/workflows/oauth.yml         | 2 +-
 .github/workflows/phoneauth.yml     | 2 +-
 .github/workflows/storage.yml       | 2 +-
 test.sh                             | 2 +-
 11 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/anonymousauth.yml b/.github/workflows/anonymousauth.yml
index 27907ba15ca..dc812506260 100644
--- 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
index 2f5828f8a11..a993d61a6da 100644
--- 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
diff --git a/.github/workflows/database.yml b/.github/workflows/database.yml
index d1950a09426..3afc10d6d73 100644
--- 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
index ccc2c285097..eec8cafa0ae 100644
--- 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
diff --git a/.github/workflows/facebookauth.yml b/.github/workflows/facebookauth.yml
index eacad8aec65..03708fff25b 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 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
index 334c26353e0..51a6f9931d0 100644
--- 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
index c6c49bcb560..817996e03b3 100644
--- 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
index b019995ab16..a119bfbe828 100644
--- 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
index e0e0ae70a8c..fa49dfbcb70 100644
--- 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
index 8ae7d3a7e31..51550d25fba 100644
--- 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/test.sh b/test.sh
index 6c678f076e6..921b332d412 100755
--- 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=$?;

From 076fd029da59b3fa0d33a99d6e959185772aa676 Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 14 May 2024 13:18:04 -0400
Subject: [PATCH 4/5] Allow warnings for pods affected by Auth API deprecation

---
 .github/workflows/auth.yml      | 3 ++-
 .github/workflows/emailauth.yml | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/auth.yml b/.github/workflows/auth.yml
index a993d61a6da..3ca95c4e5f8 100644
--- a/.github/workflows/auth.yml
+++ b/.github/workflows/auth.yml
@@ -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/emailauth.yml b/.github/workflows/emailauth.yml
index eec8cafa0ae..afbe7c00cb5 100644
--- a/.github/workflows/emailauth.yml
+++ b/.github/workflows/emailauth.yml
@@ -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

From 5ae9c08b38d51bb52570159824b3e5032d032fea Mon Sep 17 00:00:00 2001
From: Nick Cooke <36927374+ncooke3@users.noreply.github.com>
Date: Tue, 14 May 2024 13:18:18 -0400
Subject: [PATCH 5/5] Re-add fix

---
 FirebaseAuthUI/Sources/FUIAuthStrings.m | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

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