diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc6f785b..218a9222 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,15 @@
+# 7.1.0
+- Update to Swift 5.0 in `GoogleSignInSwiftSupport` pod ([#317](https://github.com/google/GoogleSignIn-iOS/pull/317))
+- Documentation updates ([#351](https://github.com/google/GoogleSignIn-iOS/pull/351), [#372](https://github.com/google/GoogleSignIn-iOS/pull/372))
+- Add Privacy Manifest ([#382](https://github.com/google/GoogleSignIn-iOS/pull/382))
+- Internal
+ - Fix typo in `SFSafariViewController` ([#291](https://github.com/google/GoogleSignIn-iOS/pull/291))
+ - Fix `OCMock` usage in unit test ([#298](https://github.com/google/GoogleSignIn-iOS/pull/298))
+ - Use new [delegate protocol](https://github.com/google/GTMAppAuth/pull/224) from GTMAppAuth 4.0.0 ([#299](https://github.com/google/GoogleSignIn-iOS/pull/299))
+ - Ensure that `completion` is not nil before calling `-[GIDSignIn restorePreviousSignIn:]` ([#301](https://github.com/google/GoogleSignIn-iOS/pull/301))
+ - Removes `macos-11` runner in GitHub workflows ([#302](https://github.com/google/GoogleSignIn-iOS/pull/302))
+ - Updates button name reference so UI automation tests pass ([#308](https://github.com/google/GoogleSignIn-iOS/pull/308))
+
# 7.1.0-fac-beta-1.0.0
- Beta release supporting Firebase App Check tokens used
to establish your application's integrity while signing in with Google
diff --git a/GoogleSignIn.podspec b/GoogleSignIn.podspec
index 8ea9fe03..245819d8 100644
--- a/GoogleSignIn.podspec
+++ b/GoogleSignIn.podspec
@@ -34,9 +34,9 @@ The Google Sign-In SDK allows users to sign in with their Google account from th
s.ios.framework = 'UIKit'
s.osx.framework = 'AppKit'
s.dependency 'AppCheckCore', '~> 10.18'
- s.dependency 'AppAuth', '~> 1.6'
- s.dependency 'GTMAppAuth', '~> 4.0'
- s.dependency 'GTMSessionFetcher/Core', '>= 1.1', '< 4.0'
+ s.dependency 'AppAuth', '>= 1.7.3', '< 2.0'
+ s.dependency 'GTMAppAuth', '>= 4.1.1', '< 5.0'
+ s.dependency 'GTMSessionFetcher/Core', '~> 3.3'
s.resource_bundle = {
'GoogleSignIn' => ['GoogleSignIn/Sources/{Resources,Strings}/*']
}
@@ -56,7 +56,7 @@ The Google Sign-In SDK allows users to sign in with their Google account from th
]
unit_tests.requires_app_host = true
unit_tests.dependency 'OCMock'
- unit_tests.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.2'
- unit_tests.dependency 'GoogleUtilities/SwizzlerTestHelpers', '~> 7.2'
+ unit_tests.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.13'
+ unit_tests.dependency 'GoogleUtilities/SwizzlerTestHelpers', '~> 7.13'
end
end
diff --git a/GoogleSignIn/Sources/Public/GoogleSignIn/GIDSignIn.h b/GoogleSignIn/Sources/Public/GoogleSignIn/GIDSignIn.h
index 82655ca8..2cdcbe24 100644
--- a/GoogleSignIn/Sources/Public/GoogleSignIn/GIDSignIn.h
+++ b/GoogleSignIn/Sources/Public/GoogleSignIn/GIDSignIn.h
@@ -115,7 +115,9 @@ NS_SWIFT_NAME(configureDebugProvider(withAPIKey:completion:));
/// @return `YES` if there is a previous user sign-in saved in keychain.
- (BOOL)hasPreviousSignIn;
-/// Attempts to restore a previous user sign-in without interaction.
+/// Attempts to restore a previous user sign-in without interaction.
+///
+/// Restores user from the local cache and refreshes tokens if they have expired (>1 hour).
///
/// @param completion The block that is called on completion. This block will be called asynchronously
/// on the main queue.
diff --git a/GoogleSignIn/Sources/Resources/PrivacyInfo.xcprivacy b/GoogleSignIn/Sources/Resources/PrivacyInfo.xcprivacy
new file mode 100644
index 00000000..010fc335
--- /dev/null
+++ b/GoogleSignIn/Sources/Resources/PrivacyInfo.xcprivacy
@@ -0,0 +1,122 @@
+
+
+
+
+ NSPrivacyTracking
+
+ NSPrivacyTrackingDomains
+
+ NSPrivacyCollectedDataTypes
+
+
+ NSPrivacyCollectedDataType
+ NSPrivacyCollectedDataTypeName
+ NSPrivacyCollectedDataTypeLinked
+
+ NSPrivacyCollectedDataTypeTracking
+
+ NSPrivacyCollectedDataTypePurposes
+
+ NSPrivacyCollectedDataTypePurposeAppFunctionality
+
+
+
+ NSPrivacyCollectedDataType
+ NSPrivacyCollectedDataTypeEmailAddress
+ NSPrivacyCollectedDataTypeLinked
+
+ NSPrivacyCollectedDataTypeTracking
+
+ NSPrivacyCollectedDataTypePurposes
+
+ NSPrivacyCollectedDataTypePurposeAppFunctionality
+
+
+
+ NSPrivacyCollectedDataType
+ NSPrivacyCollectedDataTypePhoneNumber
+ NSPrivacyCollectedDataTypeLinked
+
+ NSPrivacyCollectedDataTypeTracking
+
+ NSPrivacyCollectedDataTypePurposes
+
+ NSPrivacyCollectedDataTypePurposeAppFunctionality
+
+
+
+ NSPrivacyCollectedDataType
+ NSPrivacyCollectedDataTypeOtherDataTypes
+ NSPrivacyCollectedDataTypeLinked
+
+ NSPrivacyCollectedDataTypeTracking
+
+ NSPrivacyCollectedDataTypePurposes
+
+ NSPrivacyCollectedDataTypePurposeAppFunctionality
+ NSPrivacyCollectedDataTypePurposeAnalytics
+
+
+
+ NSPrivacyCollectedDataType
+ NSPrivacyCollectedDataTypeCoarseLocation
+ NSPrivacyCollectedDataTypeLinked
+
+ NSPrivacyCollectedDataTypeTracking
+
+ NSPrivacyCollectedDataTypePurposes
+
+ NSPrivacyCollectedDataTypePurposeAppFunctionality
+
+
+
+ NSPrivacyCollectedDataType
+ NSPrivacyCollectedDataTypeUserID
+ NSPrivacyCollectedDataTypeLinked
+
+ NSPrivacyCollectedDataTypeTracking
+
+ NSPrivacyCollectedDataTypePurposes
+
+ NSPrivacyCollectedDataTypePurposeAppFunctionality
+ NSPrivacyCollectedDataTypePurposeAnalytics
+
+
+
+ NSPrivacyCollectedDataType
+ NSPrivacyCollectedDataTypeDeviceID
+ NSPrivacyCollectedDataTypeLinked
+
+ NSPrivacyCollectedDataTypeTracking
+
+ NSPrivacyCollectedDataTypePurposes
+
+ NSPrivacyCollectedDataTypePurposeAnalytics
+
+
+
+ NSPrivacyCollectedDataType
+ NSPrivacyCollectedDataTypeOtherUsageData
+ NSPrivacyCollectedDataTypeLinked
+
+ NSPrivacyCollectedDataTypeTracking
+
+ NSPrivacyCollectedDataTypePurposes
+
+ NSPrivacyCollectedDataTypePurposeAnalytics
+
+
+
+ NSPrivacyAccessedAPITypes
+
+
+ NSPrivacyAccessedAPITypeReasons
+
+ CA92.1
+
+ NSPrivacyAccessedAPIType
+ NSPrivacyAccessedAPICategoryUserDefaults
+
+
+
+
diff --git a/GoogleSignInSwift/Sources/Resources/PrivacyInfo.xcprivacy b/GoogleSignInSwift/Sources/Resources/PrivacyInfo.xcprivacy
new file mode 100644
index 00000000..d37d6275
--- /dev/null
+++ b/GoogleSignInSwift/Sources/Resources/PrivacyInfo.xcprivacy
@@ -0,0 +1,14 @@
+
+
+
+
+ NSPrivacyCollectedDataTypes
+
+ NSPrivacyAccessedAPITypes
+
+ NSPrivacyTrackingDomains
+
+ NSPrivacyTracking
+
+
+
diff --git a/GoogleSignInSwiftSupport.podspec b/GoogleSignInSwiftSupport.podspec
index dbe1d7bf..d712e09c 100644
--- a/GoogleSignInSwiftSupport.podspec
+++ b/GoogleSignInSwiftSupport.podspec
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'GoogleSignInSwiftSupport'
- s.version = '7.0.1'
+ s.version = '7.1.0'
s.swift_version = '5.0'
s.summary = 'Adds Swift-focused support for Google Sign-In.'
s.description = 'Additional Swift support for the Google Sign-In SDK.'
@@ -24,7 +24,10 @@ Pod::Spec.new do |s|
'CoreGraphics',
'SwiftUI',
]
- s.dependency 'GoogleSignIn', '~> 7.0'
+ s.dependency 'GoogleSignIn', '~> 7.1.0-fac-beta-1.0.0'
+ s.resource_bundles = {
+ 'GoogleSignInSwiftSupport_Privacy' => 'GoogleSignInSwift/Sources/Resources/PrivacyInfo.xcprivacy'
+ }
s.test_spec 'unit' do |unit_tests|
unit_tests.platforms = {
:ios => ios_deployment_target,
diff --git a/Package.swift b/Package.swift
index 02f76571..ae459135 100644
--- a/Package.swift
+++ b/Package.swift
@@ -44,7 +44,7 @@ let package = Package(
.package(
name: "AppAuth",
url: "https://github.com/openid/AppAuth-iOS.git",
- "1.6.0" ..< "2.0.0"),
+ from: "1.7.3"),
.package(
name: "AppCheck",
url: "https://github.com/google/app-check.git",
@@ -52,11 +52,11 @@ let package = Package(
.package(
name: "GTMAppAuth",
url: "https://github.com/google/GTMAppAuth.git",
- from: "4.0.0"),
+ from: "4.1.1"),
.package(
name: "GTMSessionFetcher",
url: "https://github.com/google/gtm-session-fetcher.git",
- "1.5.0" ..< "4.0.0"),
+ from: "3.3.0"),
.package(
name: "OCMock",
url: "https://github.com/firebase/ocmock.git",
@@ -64,7 +64,7 @@ let package = Package(
.package(
name: "GoogleUtilities",
url: "https://github.com/google/GoogleUtilities.git",
- "7.3.0" ..< "8.0.0"),
+ from: "7.13.0"),
],
targets: [
.target(
@@ -100,7 +100,10 @@ let package = Package(
dependencies: [
"GoogleSignIn",
],
- path: "GoogleSignInSwift/Sources"
+ path: "GoogleSignInSwift/Sources",
+ resources: [
+ .copy("Resources/PrivacyInfo.xcprivacy")
+ ]
),
.testTarget(
name: "GoogleSignIn-UnitTests",
diff --git a/README.md b/README.md
index e3eb8d53..55fb6d94 100644
--- a/README.md
+++ b/README.md
@@ -16,17 +16,9 @@ service.
## Getting Started
Try either the [Objective-C](Samples/ObjC) or [Swift](Samples/Swift) sample app.
-For example, to demo the Objective-C sample project, you have three options:
+For example, to demo the Objective-C sample project, you have two options:
-1. Using [CocoaPods](https://cocoapods.org/)'s `try` method:
-
-```
-pod try GoogleSignIn
-```
-
-Note, this will default to providing you with the Objective-C sample app.
-
-2. Using CocoaPod's `install` method:
+1. Using CocoaPod's `install` method:
```
git clone https://github.com/google/GoogleSignIn-iOS
@@ -35,7 +27,7 @@ pod install
open SignInSampleForPod.xcworkspace
```
-3. Using [Swift Package Manager](https://swift.org/package-manager/):
+2. Using [Swift Package Manager](https://swift.org/package-manager/):
```
git clone https://github.com/google/GoogleSignIn-iOS