From dd52d4a5c5cb9fb4817f0541802398c260d84269 Mon Sep 17 00:00:00 2001 From: Yana Sang Date: Fri, 15 Mar 2024 14:18:26 -0700 Subject: [PATCH 1/6] Add Privacy Manifest --- PrivacyInfo.xcprivacy | 122 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 122 insertions(+) create mode 100644 PrivacyInfo.xcprivacy diff --git a/PrivacyInfo.xcprivacy b/PrivacyInfo.xcprivacy new file mode 100644 index 00000000..010fc335 --- /dev/null +++ b/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 + + + + From 42cb8aa1f6d1ce36a84a5d8708560e994aa08246 Mon Sep 17 00:00:00 2001 From: Yana Sang Date: Fri, 15 Mar 2024 14:27:38 -0700 Subject: [PATCH 2/6] Update dependency versions --- GoogleSignIn.podspec | 6 +++--- Package.swift | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/GoogleSignIn.podspec b/GoogleSignIn.podspec index d8407e90..49b7c300 100644 --- a/GoogleSignIn.podspec +++ b/GoogleSignIn.podspec @@ -33,9 +33,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 'AppAuth', '~> 1.6' - s.dependency 'GTMAppAuth', '~> 4.0' - s.dependency 'GTMSessionFetcher/Core', '>= 1.1', '< 4.0' + s.dependency 'AppAuth', '~> 1.7.3' + s.dependency 'GTMAppAuth', '~> 4.1.1' + s.dependency 'GTMSessionFetcher/Core', '>= 3.1.1', '< 4.0' s.resource_bundle = { 'GoogleSignIn' => ['GoogleSignIn/Sources/{Resources,Strings}/*'] } diff --git a/Package.swift b/Package.swift index 8b498cc2..16dbe22d 100644 --- a/Package.swift +++ b/Package.swift @@ -44,15 +44,15 @@ let package = Package( .package( name: "AppAuth", url: "https://github.com/openid/AppAuth-iOS.git", - "1.6.0" ..< "2.0.0"), + "1.7.3" ..< "2.0.0"), .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"), + "3.3.1" ..< "4.0.0"), .package( name: "OCMock", url: "https://github.com/firebase/ocmock.git", @@ -60,7 +60,7 @@ let package = Package( .package( name: "GoogleUtilities", url: "https://github.com/google/GoogleUtilities.git", - "7.3.0" ..< "8.0.0"), + "7.13.1" ..< "8.0.0"), ], targets: [ .target( From 792593e15dc76ce06f38ea7794a4631e659e70f7 Mon Sep 17 00:00:00 2001 From: Yana Sang Date: Mon, 18 Mar 2024 16:08:54 -0700 Subject: [PATCH 3/6] Move Privacy Manifest to Resources/ --- .../Sources/Resources/PrivacyInfo.xcprivacy | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename PrivacyInfo.xcprivacy => GoogleSignIn/Sources/Resources/PrivacyInfo.xcprivacy (100%) diff --git a/PrivacyInfo.xcprivacy b/GoogleSignIn/Sources/Resources/PrivacyInfo.xcprivacy similarity index 100% rename from PrivacyInfo.xcprivacy rename to GoogleSignIn/Sources/Resources/PrivacyInfo.xcprivacy From 788eb4e55a30056ca13afe935d409e2c87f77713 Mon Sep 17 00:00:00 2001 From: Yana Sang Date: Tue, 19 Mar 2024 16:50:09 -0700 Subject: [PATCH 4/6] Add separate Privacy Manifest for GoogleSignInSwift --- .../Sources/Resources/PrivacyInfo.xcprivacy | 14 ++++++++++++++ GoogleSignInSwiftSupport.podspec | 3 +++ Package.swift | 5 ++++- 3 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 GoogleSignInSwift/Sources/Resources/PrivacyInfo.xcprivacy 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..9d4a5315 100644 --- a/GoogleSignInSwiftSupport.podspec +++ b/GoogleSignInSwiftSupport.podspec @@ -25,6 +25,9 @@ Pod::Spec.new do |s| 'SwiftUI', ] s.dependency 'GoogleSignIn', '~> 7.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 16dbe22d..477ab93d 100644 --- a/Package.swift +++ b/Package.swift @@ -95,7 +95,10 @@ let package = Package( dependencies: [ "GoogleSignIn", ], - path: "GoogleSignInSwift/Sources" + path: "GoogleSignInSwift/Sources", + resources: [ + .copy("Resources/PrivacyInfo.xcprivacy") + ] ), .testTarget( name: "GoogleSignIn-UnitTests", From 89b04c8688530e594fce8a7414b3252294cdf8f8 Mon Sep 17 00:00:00 2001 From: Yana Sang Date: Thu, 21 Mar 2024 13:19:39 -0700 Subject: [PATCH 5/6] Update dependencies version requirements in .podspec and Package.swift --- GoogleSignIn.podspec | 10 +++++----- Package.swift | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/GoogleSignIn.podspec b/GoogleSignIn.podspec index 49b7c300..3dde9401 100644 --- a/GoogleSignIn.podspec +++ b/GoogleSignIn.podspec @@ -33,9 +33,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 'AppAuth', '~> 1.7.3' - s.dependency 'GTMAppAuth', '~> 4.1.1' - s.dependency 'GTMSessionFetcher/Core', '>= 3.1.1', '< 4.0' + s.dependency 'AppAuth', '~> 1.7' + s.dependency 'GTMAppAuth', '~> 4.1' + s.dependency 'GTMSessionFetcher/Core', '~> 3.3' s.resource_bundle = { 'GoogleSignIn' => ['GoogleSignIn/Sources/{Resources,Strings}/*'] } @@ -55,7 +55,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/Package.swift b/Package.swift index 477ab93d..e197bbca 100644 --- a/Package.swift +++ b/Package.swift @@ -44,15 +44,15 @@ let package = Package( .package( name: "AppAuth", url: "https://github.com/openid/AppAuth-iOS.git", - "1.7.3" ..< "2.0.0"), + from: "1.7.0"), .package( name: "GTMAppAuth", url: "https://github.com/google/GTMAppAuth.git", - from: "4.1.1"), + from: "4.1.0"), .package( name: "GTMSessionFetcher", url: "https://github.com/google/gtm-session-fetcher.git", - "3.3.1" ..< "4.0.0"), + from: "3.3.0"), .package( name: "OCMock", url: "https://github.com/firebase/ocmock.git", @@ -60,7 +60,7 @@ let package = Package( .package( name: "GoogleUtilities", url: "https://github.com/google/GoogleUtilities.git", - "7.13.1" ..< "8.0.0"), + from: "7.13.0"), ], targets: [ .target( From 9ab7a00c6c56640717d2673799b25987d6bed2dd Mon Sep 17 00:00:00 2001 From: Yana Sang Date: Thu, 21 Mar 2024 15:43:12 -0700 Subject: [PATCH 6/6] Set specific patch version minimums for AppAuth and GTMAppAuth --- GoogleSignIn.podspec | 4 ++-- Package.swift | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/GoogleSignIn.podspec b/GoogleSignIn.podspec index 3dde9401..1bae2140 100644 --- a/GoogleSignIn.podspec +++ b/GoogleSignIn.podspec @@ -33,8 +33,8 @@ 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 'AppAuth', '~> 1.7' - s.dependency 'GTMAppAuth', '~> 4.1' + 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}/*'] diff --git a/Package.swift b/Package.swift index e197bbca..9c450811 100644 --- a/Package.swift +++ b/Package.swift @@ -44,11 +44,11 @@ let package = Package( .package( name: "AppAuth", url: "https://github.com/openid/AppAuth-iOS.git", - from: "1.7.0"), + from: "1.7.3"), .package( name: "GTMAppAuth", url: "https://github.com/google/GTMAppAuth.git", - from: "4.1.0"), + from: "4.1.1"), .package( name: "GTMSessionFetcher", url: "https://github.com/google/gtm-session-fetcher.git",