Skip to content

Commit 297c3bc

Browse files
mdmathiasmdmathias
authored
Add Privacy Manifest to App Check Release Branch (#392)
1 parent ab35c8b commit 297c3bc

File tree

8 files changed

+172
-24
lines changed

8 files changed

+172
-24
lines changed

‎CHANGELOG.md‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
# 7.1.0
2+
- Update to Swift 5.0 in `GoogleSignInSwiftSupport` pod ([#317](https://github.com/google/GoogleSignIn-iOS/pull/317))
3+
- Documentation updates ([#351](https://github.com/google/GoogleSignIn-iOS/pull/351), [#372](https://github.com/google/GoogleSignIn-iOS/pull/372))
4+
- Add Privacy Manifest ([#382](https://github.com/google/GoogleSignIn-iOS/pull/382))
5+
- Internal
6+
- Fix typo in `SFSafariViewController` ([#291](https://github.com/google/GoogleSignIn-iOS/pull/291))
7+
- Fix `OCMock` usage in unit test ([#298](https://github.com/google/GoogleSignIn-iOS/pull/298))
8+
- 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))
9+
- Ensure that `completion` is not nil before calling `-[GIDSignIn restorePreviousSignIn:]` ([#301](https://github.com/google/GoogleSignIn-iOS/pull/301))
10+
- Removes `macos-11` runner in GitHub workflows ([#302](https://github.com/google/GoogleSignIn-iOS/pull/302))
11+
- Updates button name reference so UI automation tests pass ([#308](https://github.com/google/GoogleSignIn-iOS/pull/308))
12+
113
# 7.1.0-fac-beta-1.0.0
214
- Beta release supporting Firebase App Check tokens used
315
to establish your application's integrity while signing in with Google

‎GoogleSignIn.podspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@ The Google Sign-In SDK allows users to sign in with their Google account from th
3434
s.ios.framework = 'UIKit'
3535
s.osx.framework = 'AppKit'
3636
s.dependency 'AppCheckCore', '~> 10.18'
37-
s.dependency 'AppAuth', '~> 1.6'
38-
s.dependency 'GTMAppAuth', '~> 4.0'
39-
s.dependency 'GTMSessionFetcher/Core', '>= 1.1', '< 4.0'
37+
s.dependency 'AppAuth', '>= 1.7.3', '< 2.0'
38+
s.dependency 'GTMAppAuth', '>= 4.1.1', '< 5.0'
39+
s.dependency 'GTMSessionFetcher/Core', '~> 3.3'
4040
s.resource_bundle = {
4141
'GoogleSignIn' => ['GoogleSignIn/Sources/{Resources,Strings}/*']
4242
}
@@ -56,7 +56,7 @@ The Google Sign-In SDK allows users to sign in with their Google account from th
5656
]
5757
unit_tests.requires_app_host = true
5858
unit_tests.dependency 'OCMock'
59-
unit_tests.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.2'
60-
unit_tests.dependency 'GoogleUtilities/SwizzlerTestHelpers', '~> 7.2'
59+
unit_tests.dependency 'GoogleUtilities/MethodSwizzler', '~> 7.13'
60+
unit_tests.dependency 'GoogleUtilities/SwizzlerTestHelpers', '~> 7.13'
6161
end
6262
end

‎GoogleSignIn/Sources/Public/GoogleSignIn/GIDSignIn.h‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,9 @@ NS_SWIFT_NAME(configureDebugProvider(withAPIKey:completion:));
115115
/// @return `YES` if there is a previous user sign-in saved in keychain.
116116
- (BOOL)hasPreviousSignIn;
117117

118-
/// Attempts to restore a previous user sign-in without interaction.
118+
/// Attempts to restore a previous user sign-in without interaction.
119+
///
120+
/// Restores user from the local cache and refreshes tokens if they have expired (>1 hour).
119121
///
120122
/// @param completion The block that is called on completion. This block will be called asynchronously
121123
/// on the main queue.

‎GoogleSignIn/Sources/Resources/PrivacyInfo.xcprivacy‎

Lines changed: 122 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,122 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSPrivacyTracking</key>
6+
<false/>
7+
<key>NSPrivacyTrackingDomains</key>
8+
<array/>
9+
<key>NSPrivacyCollectedDataTypes</key>
10+
<array>
11+
<dict>
12+
<key>NSPrivacyCollectedDataType</key>
13+
<string>NSPrivacyCollectedDataTypeName</string>
14+
<key>NSPrivacyCollectedDataTypeLinked</key>
15+
<true/>
16+
<key>NSPrivacyCollectedDataTypeTracking</key>
17+
<false/>
18+
<key>NSPrivacyCollectedDataTypePurposes</key>
19+
<array>
20+
<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
21+
</array>
22+
</dict>
23+
<dict>
24+
<key>NSPrivacyCollectedDataType</key>
25+
<string>NSPrivacyCollectedDataTypeEmailAddress</string>
26+
<key>NSPrivacyCollectedDataTypeLinked</key>
27+
<true/>
28+
<key>NSPrivacyCollectedDataTypeTracking</key>
29+
<false/>
30+
<key>NSPrivacyCollectedDataTypePurposes</key>
31+
<array>
32+
<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
33+
</array>
34+
</dict>
35+
<dict>
36+
<key>NSPrivacyCollectedDataType</key>
37+
<string>NSPrivacyCollectedDataTypePhoneNumber</string>
38+
<key>NSPrivacyCollectedDataTypeLinked</key>
39+
<true/>
40+
<key>NSPrivacyCollectedDataTypeTracking</key>
41+
<false/>
42+
<key>NSPrivacyCollectedDataTypePurposes</key>
43+
<array>
44+
<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
45+
</array>
46+
</dict>
47+
<dict>
48+
<key>NSPrivacyCollectedDataType</key>
49+
<string>NSPrivacyCollectedDataTypeOtherDataTypes</string>
50+
<key>NSPrivacyCollectedDataTypeLinked</key>
51+
<true/>
52+
<key>NSPrivacyCollectedDataTypeTracking</key>
53+
<false/>
54+
<key>NSPrivacyCollectedDataTypePurposes</key>
55+
<array>
56+
<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
57+
<string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
58+
</array>
59+
</dict>
60+
<dict>
61+
<key>NSPrivacyCollectedDataType</key>
62+
<string>NSPrivacyCollectedDataTypeCoarseLocation</string>
63+
<key>NSPrivacyCollectedDataTypeLinked</key>
64+
<true/>
65+
<key>NSPrivacyCollectedDataTypeTracking</key>
66+
<false/>
67+
<key>NSPrivacyCollectedDataTypePurposes</key>
68+
<array>
69+
<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
70+
</array>
71+
</dict>
72+
<dict>
73+
<key>NSPrivacyCollectedDataType</key>
74+
<string>NSPrivacyCollectedDataTypeUserID</string>
75+
<key>NSPrivacyCollectedDataTypeLinked</key>
76+
<true/>
77+
<key>NSPrivacyCollectedDataTypeTracking</key>
78+
<false/>
79+
<key>NSPrivacyCollectedDataTypePurposes</key>
80+
<array>
81+
<string>NSPrivacyCollectedDataTypePurposeAppFunctionality</string>
82+
<string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
83+
</array>
84+
</dict>
85+
<dict>
86+
<key>NSPrivacyCollectedDataType</key>
87+
<string>NSPrivacyCollectedDataTypeDeviceID</string>
88+
<key>NSPrivacyCollectedDataTypeLinked</key>
89+
<true/>
90+
<key>NSPrivacyCollectedDataTypeTracking</key>
91+
<false/>
92+
<key>NSPrivacyCollectedDataTypePurposes</key>
93+
<array>
94+
<string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
95+
</array>
96+
</dict>
97+
<dict>
98+
<key>NSPrivacyCollectedDataType</key>
99+
<string>NSPrivacyCollectedDataTypeOtherUsageData</string>
100+
<key>NSPrivacyCollectedDataTypeLinked</key>
101+
<true/>
102+
<key>NSPrivacyCollectedDataTypeTracking</key>
103+
<false/>
104+
<key>NSPrivacyCollectedDataTypePurposes</key>
105+
<array>
106+
<string>NSPrivacyCollectedDataTypePurposeAnalytics</string>
107+
</array>
108+
</dict>
109+
</array>
110+
<key>NSPrivacyAccessedAPITypes</key>
111+
<array>
112+
<dict>
113+
<key>NSPrivacyAccessedAPITypeReasons</key>
114+
<array>
115+
<string>CA92.1</string>
116+
</array>
117+
<key>NSPrivacyAccessedAPIType</key>
118+
<string>NSPrivacyAccessedAPICategoryUserDefaults</string>
119+
</dict>
120+
</array>
121+
</dict>
122+
</plist>

‎GoogleSignInSwift/Sources/Resources/PrivacyInfo.xcprivacy‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>NSPrivacyCollectedDataTypes</key>
6+
<array/>
7+
<key>NSPrivacyAccessedAPITypes</key>
8+
<array/>
9+
<key>NSPrivacyTrackingDomains</key>
10+
<array/>
11+
<key>NSPrivacyTracking</key>
12+
<false/>
13+
</dict>
14+
</plist>

‎GoogleSignInSwiftSupport.podspec‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = 'GoogleSignInSwiftSupport'
3-
s.version = '7.0.1'
3+
s.version = '7.1.0'
44
s.swift_version = '5.0'
55
s.summary = 'Adds Swift-focused support for Google Sign-In.'
66
s.description = 'Additional Swift support for the Google Sign-In SDK.'
@@ -24,7 +24,10 @@ Pod::Spec.new do |s|
2424
'CoreGraphics',
2525
'SwiftUI',
2626
]
27-
s.dependency 'GoogleSignIn', '~> 7.0'
27+
s.dependency 'GoogleSignIn', '~> 7.1.0-fac-beta-1.0.0'
28+
s.resource_bundles = {
29+
'GoogleSignInSwiftSupport_Privacy' => 'GoogleSignInSwift/Sources/Resources/PrivacyInfo.xcprivacy'
30+
}
2831
s.test_spec 'unit' do |unit_tests|
2932
unit_tests.platforms = {
3033
:ios => ios_deployment_target,

‎Package.swift‎

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -44,27 +44,27 @@ let package = Package(
4444
.package(
4545
name: "AppAuth",
4646
url: "https://github.com/openid/AppAuth-iOS.git",
47-
"1.6.0" ..< "2.0.0"),
47+
from: "1.7.3"),
4848
.package(
4949
name: "AppCheck",
5050
url: "https://github.com/google/app-check.git",
5151
"10.18.0" ..< "11.0.0"),
5252
.package(
5353
name: "GTMAppAuth",
5454
url: "https://github.com/google/GTMAppAuth.git",
55-
from: "4.0.0"),
55+
from: "4.1.1"),
5656
.package(
5757
name: "GTMSessionFetcher",
5858
url: "https://github.com/google/gtm-session-fetcher.git",
59-
"1.5.0" ..< "4.0.0"),
59+
from: "3.3.0"),
6060
.package(
6161
name: "OCMock",
6262
url: "https://github.com/firebase/ocmock.git",
6363
.revision("7291762d3551c5c7e31c49cce40a0e391a52e889")),
6464
.package(
6565
name: "GoogleUtilities",
6666
url: "https://github.com/google/GoogleUtilities.git",
67-
"7.3.0" ..< "8.0.0"),
67+
from: "7.13.0"),
6868
],
6969
targets: [
7070
.target(
@@ -100,7 +100,10 @@ let package = Package(
100100
dependencies: [
101101
"GoogleSignIn",
102102
],
103-
path: "GoogleSignInSwift/Sources"
103+
path: "GoogleSignInSwift/Sources",
104+
resources: [
105+
.copy("Resources/PrivacyInfo.xcprivacy")
106+
]
104107
),
105108
.testTarget(
106109
name: "GoogleSignIn-UnitTests",

‎README.md‎

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,9 @@ service.
1616
## Getting Started
1717

1818
Try either the [Objective-C](Samples/ObjC) or [Swift](Samples/Swift) sample app.
19-
For example, to demo the Objective-C sample project, you have three options:
19+
For example, to demo the Objective-C sample project, you have two options:
2020

21-
1. Using [CocoaPods](https://cocoapods.org/)'s `try` method:
22-
23-
```
24-
pod try GoogleSignIn
25-
```
26-
27-
Note, this will default to providing you with the Objective-C sample app.
28-
29-
2. Using CocoaPod's `install` method:
21+
1. Using CocoaPod's `install` method:
3022

3123
```
3224
git clone https://github.com/google/GoogleSignIn-iOS
@@ -35,7 +27,7 @@ pod install
3527
open SignInSampleForPod.xcworkspace
3628
```
3729

38-
3. Using [Swift Package Manager](https://swift.org/package-manager/):
30+
2. Using [Swift Package Manager](https://swift.org/package-manager/):
3931

4032
```
4133
git clone https://github.com/google/GoogleSignIn-iOS

0 commit comments

Comments
 (0)