fixes

firebase · Feb 5, 2024 · 9c09cfd · 9c09cfd
1 parent 31663e8
commit 9c09cfd
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 8 deletions.
diff --git a/FirebaseAuth/Sources/Swift/User/User.swift b/FirebaseAuth/Sources/Swift/User/User.swift
@@ -211,7 +211,7 @@ extension User: NSSecureCoding {}
   #if os(iOS)
     /// Updates the phone number for the user. On success, the cached user profile data is updated.
     ///
-    ///  Invoked asynchronously on the main thread in the future.
+    /// Invoked asynchronously on the main thread in the future.
     ///
     /// This method is available on iOS only.
     ///
@@ -220,10 +220,9 @@ extension User: NSSecureCoding {}
     ///    sensitive operation that requires a recent login from the user. This error indicates
     ///    the user has not signed in recently enough. To resolve, reauthenticate the user by
     ///    calling `reauthenticate(with:)`.
-    /// - Parameter phoneNumberCredential: The new phone number credential corresponding to the
+    /// - Parameter credential: The new phone number credential corresponding to the
     /// phone number to be added to the Firebase account, if a phone number is already linked to the
-    /// account
-    /// this new phone number will replace it.
+    /// account this new phone number will replace it.
     /// - Parameter completion: Optionally; the block invoked when the user profile change has
     /// finished.
     @objc(updatePhoneNumberCredential:completion:)
@@ -558,8 +557,9 @@ extension User: NSSecureCoding {}
   /// Retrieves the Firebase authentication token, possibly refreshing it if it has expired.
   ///
   /// The authentication token will be refreshed (by making a network request) if it has
-  /// expired, or if `forceRefresh` is `true`.
-  /// - Parameter forceRefresh: Forces a token refresh. Useful if the token becomes invalid for some
+  /// expired, or if `forcingRefresh` is `true`.
+  /// - Parameter forcingRefresh: Forces a token refresh. Useful if the token becomes invalid for
+  /// some
   /// reason other than an expiration.
   /// - Parameter completion: Optionally; the block invoked when the token is available. Invoked
   /// asynchronously on the main thread in the future.
@@ -1452,7 +1452,7 @@ extension User: NSSecureCoding {}
     /// Updates the phone number for the user. On success, the cached user profile data is updated.
     ///
     /// Invoked asynchronously on the global work queue in the future.
-    /// - Parameter phoneAuthCredential: The new phone number credential corresponding to the phone
+    /// - Parameter credential: The new phone number credential corresponding to the phone
     /// number to be added to the Firebase account. If a phone number is already linked to the
     /// account, this new phone number will replace it.
     /// - Parameter isLinkOperation: Boolean value indicating whether or not this is a link

diff --git a/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj b/FirebaseAuth/Tests/SampleSwift/AuthenticationExample.xcodeproj/project.pbxproj
@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 51;
+	objectVersion = 54;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -23,6 +23,7 @@
 		DE8FD48F2A7D997A00B6831A /* FIRAuthApiTestsBase.m in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD48D2A7D997A00B6831A /* FIRAuthApiTestsBase.m */; };
 		DE8FD4902A7D997A00B6831A /* GoogleAuthTests.m in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD48E2A7D997A00B6831A /* GoogleAuthTests.m */; };
 		DE8FD4942A7D9E2700B6831A /* PhoneMultiFactorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = DE8FD4912A7D9D9E00B6831A /* PhoneMultiFactorTests.swift */; };
+		DEA4DF3F2B716FA00059F384 /* Dummy.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEA4DF3E2B716FA00059F384 /* Dummy.swift */; };
 		DEC2E5DD2A95331E0090260A /* SettingsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */; };
 		DEC2E5DF2A9583CA0090260A /* AppManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = DEC2E5DE2A9583CA0090260A /* AppManager.swift */; };
 		DEC2E5E42A966DE20090260A /* GoogleService-Info_multi.plist in Resources */ = {isa = PBXBuildFile; fileRef = DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */; };
@@ -100,6 +101,7 @@
 		DE8FD4912A7D9D9E00B6831A /* PhoneMultiFactorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PhoneMultiFactorTests.swift; sourceTree = "<group>"; };
 		DE8FD4962A7DAFEE00B6831A /* FIRAuthApiTestsBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = FIRAuthApiTestsBase.h; sourceTree = "<group>"; };
 		DE8FD4972A7DB00600B6831A /* AuthCredentials.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AuthCredentials.h; sourceTree = "<group>"; };
+		DEA4DF3E2B716FA00059F384 /* Dummy.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Dummy.swift; sourceTree = "<group>"; };
 		DEC2E5DC2A95331D0090260A /* SettingsViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingsViewController.swift; sourceTree = "<group>"; };
 		DEC2E5DE2A9583CA0090260A /* AppManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppManager.swift; sourceTree = "<group>"; };
 		DEC2E5E32A966DE20090260A /* GoogleService-Info_multi.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = "GoogleService-Info_multi.plist"; sourceTree = SOURCE_ROOT; };
@@ -188,6 +190,7 @@
 				DE8FD4832A7D990900B6831A /* CustomAuthTests.m */,
 				DE8FD4842A7D990900B6831A /* EmailPasswordAuthTests.m */,
 				DE8FD4852A7D990900B6831A /* FacebookAuthTests.m */,
+				DEA4DF3E2B716FA00059F384 /* Dummy.swift */,
 			);
 			path = ObjCApiTests;
 			sourceTree = "<group>";
@@ -420,6 +423,7 @@
 				TargetAttributes = {
 					DE8FD4792A7D96B900B6831A = {
 						CreatedOnToolsVersion = 14.2;
+						LastSwiftMigration = 1530;
 						TestTargetID = EAE4CBC024855E3A00245E92;
 					};
 					EAE4CBC024855E3A00245E92 = {
@@ -503,6 +507,7 @@
 				DE8FD4882A7D990900B6831A /* FacebookAuthTests.m in Sources */,
 				DE8FD48F2A7D997A00B6831A /* FIRAuthApiTestsBase.m in Sources */,
 				DE8FD4872A7D990900B6831A /* EmailPasswordAuthTests.m in Sources */,
+				DEA4DF3F2B716FA00059F384 /* Dummy.swift in Sources */,
 				DE8FD4902A7D997A00B6831A /* GoogleAuthTests.m in Sources */,
 				DE8FD48C2A7D994000B6831A /* AccountInfoTests.m in Sources */,
 			);
@@ -590,6 +595,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W24VCQN5P5;
@@ -599,6 +605,8 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.ObjCApiTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AuthenticationExample.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/AuthenticationExample";
 			};
@@ -610,6 +618,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
+				CLANG_ENABLE_MODULES = YES;
 				CODE_SIGN_STYLE = Automatic;
 				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = W24VCQN5P5;
@@ -619,6 +628,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.ObjCApiTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_EMIT_LOC_STRINGS = NO;
+				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				TEST_HOST = "$(BUILT_PRODUCTS_DIR)/AuthenticationExample.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/AuthenticationExample";
 			};

diff --git a/FirebaseAuth/Tests/SampleSwift/ObjCApiTests/Dummy.swift b/FirebaseAuth/Tests/SampleSwift/ObjCApiTests/Dummy.swift
@@ -0,0 +1,15 @@
+// Copyright 2024 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// Dummy Swift file to make build happy.