Merge branch 'release/5.0.0'

MrAsterisco · Apr 12, 2024 · 330b5e7 · 330b5e7
2 parents 24cbe01 + 2dfcdc3
commit 330b5e7
Show file tree

Hide file tree

Showing 165 changed files with 406 additions and 347 deletions.
diff --git a/Example-SwiftPM/RxFireAuth.xcodeproj/project.pbxproj b/Example-SwiftPM/RxFireAuth.xcodeproj/project.pbxproj
@@ -18,6 +18,7 @@
 		FA112ECD253B2D1E0085A27D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FA112EC5253B2D1E0085A27D /* Main.storyboard */; };
 		FA112ECE253B2D1E0085A27D /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = FA112EC7253B2D1E0085A27D /* ViewController.swift */; };
 		FA112EE5253B2D9D0085A27D /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = FA112EE3253B2D9D0085A27D /* GoogleService-Info.plist */; };
+		FA7968FC2BC91506005B7606 /* GoogleSignIn in Frameworks */ = {isa = PBXBuildFile; productRef = FA7968FB2BC91506005B7606 /* GoogleSignIn */; };
 		FADC2B452B27991E00E64660 /* RxFireAuth in Frameworks */ = {isa = PBXBuildFile; productRef = FADC2B442B27991E00E64660 /* RxFireAuth */; };
 		FADC2B482B27996100E64660 /* RxFireAuth in Frameworks */ = {isa = PBXBuildFile; productRef = FADC2B472B27996100E64660 /* RxFireAuth */; };
 /* End PBXBuildFile section */
@@ -53,6 +54,7 @@
 			buildActionMask = 2147483647;
 			files = (
 				FADC2B452B27991E00E64660 /* RxFireAuth in Frameworks */,
+				FA7968FC2BC91506005B7606 /* GoogleSignIn in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -163,6 +165,7 @@
 			name = "RxFireAuth-Example";
 			packageProductDependencies = (
 				FADC2B442B27991E00E64660 /* RxFireAuth */,
+				FA7968FB2BC91506005B7606 /* GoogleSignIn */,
 			);
 			productName = "RxFireAuth-Example";
 			productReference = FA112DFC253B26300085A27D /* RxFireAuth-Example.app */;
@@ -219,6 +222,7 @@
 			mainGroup = FA112DF1253B25DC0085A27D;
 			packageReferences = (
 				FADC2B432B27991E00E64660 /* XCLocalSwiftPackageReference ".." */,
+				FA7968F62BC91366005B7606 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */,
 			);
 			productRefGroup = FA112DFD253B26300085A27D /* Products */;
 			projectDirPath = "";
@@ -336,8 +340,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 				ONLY_ACTIVE_ARCH = YES;
 			};
 			name = Debug;
@@ -374,8 +378,8 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12;
-				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				MACOSX_DEPLOYMENT_TARGET = 10.15;
 			};
 			name = Release;
 		};
@@ -603,7 +607,6 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
 				MTL_FAST_MATH = YES;
 				ONLY_ACTIVE_ARCH = YES;
@@ -674,7 +677,6 @@
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
-				MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
 				MTL_ENABLE_DEBUG_INFO = NO;
 				MTL_FAST_MATH = YES;
 				PRODUCT_BUNDLE_IDENTIFIER = "io.mrasterisco.github.RxFireAuth-Example-macOS";
@@ -725,7 +727,23 @@
 		};
 /* End XCLocalSwiftPackageReference section */
 
+/* Begin XCRemoteSwiftPackageReference section */
+		FA7968F62BC91366005B7606 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */ = {
+			isa = XCRemoteSwiftPackageReference;
+			repositoryURL = "https://github.com/google/GoogleSignIn-iOS";
+			requirement = {
+				kind = upToNextMajorVersion;
+				minimumVersion = 7.1.0;
+			};
+		};
+/* End XCRemoteSwiftPackageReference section */
+
 /* Begin XCSwiftPackageProductDependency section */
+		FA7968FB2BC91506005B7606 /* GoogleSignIn */ = {
+			isa = XCSwiftPackageProductDependency;
+			package = FA7968F62BC91366005B7606 /* XCRemoteSwiftPackageReference "GoogleSignIn-iOS" */;
+			productName = GoogleSignIn;
+		};
 		FADC2B442B27991E00E64660 /* RxFireAuth */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = RxFireAuth;

diff --git a/...le-SwiftPM/RxFireAuth.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/...le-SwiftPM/RxFireAuth.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -55,6 +55,15 @@
         "version" : "9.4.0"
       }
     },
+    {
+      "identity" : "googlesignin-ios",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GoogleSignIn-iOS",
+      "state" : {
+        "revision" : "a7965d134c5d3567026c523e0a8a583f73b62b0d",
+        "version" : "7.1.0"
+      }
+    },
     {
       "identity" : "googleutilities",
       "kind" : "remoteSourceControl",
@@ -82,6 +91,15 @@
         "version" : "3.3.2"
       }
     },
+    {
+      "identity" : "gtmappauth",
+      "kind" : "remoteSourceControl",
+      "location" : "https://github.com/google/GTMAppAuth.git",
+      "state" : {
+        "revision" : "5d7d66f647400952b1758b230e019b07c0b4b22a",
+        "version" : "4.1.1"
+      }
+    },
     {
       "identity" : "interop-ios-for-google-sdks",
       "kind" : "remoteSourceControl",