diff --git a/.gitignore b/.gitignore index b74aa819..c375b60f 100644 --- a/.gitignore +++ b/.gitignore @@ -23,3 +23,4 @@ Podfile.lock # Swift Build .build/ Package.resolved +.swiftpm/ diff --git a/CHANGELOG.md b/CHANGELOG.md index 8d68c4fe..19861a8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,8 @@ # Unreleased +- **BREAKING**: Updated the AppAuth dependency to 3.0.0 and the GTMAppAuth dependency to 6.0.0. +- **BREAKING**: Raised the minimum deployment targets to iOS 15.0 and macOS 12.0, matching the new floor set by AppAuth 3.0.0. Projects that must keep supporting earlier OS versions should stay on GoogleSignIn 9.2.0. +- Renamed the version-specific Swift Package Manager manifest from `Package@swift-5.5.swift` to `Package@swift-5.7.swift`, since AppAuth 3.0.0 requires `swift-tools-version` 5.7 or later. +- Widened the GTMSessionFetcher dependency to allow 4.x and 5.x, matching GTMAppAuth 6.0.0. - Add `GIDSignIn.wrapperIdentifier` so SDKs that embed Google Sign-In can self-identify in Google's diagnostic logs via a new `gidwrapper` parameter. It is opt-in and default behavior is unchanged. - Pinned the Swift names of the `GIDClaim` factory methods with explicit `NS_SWIFT_NAME` annotations. The imported Swift names are unchanged (`authTime()`, `essentialAuthTime()`, `amr()` and `essentialAMR()`); they no longer depend on the Objective-C importer's implicit renaming heuristics. diff --git a/GoogleSignIn.podspec b/GoogleSignIn.podspec index 0056a24c..3ba778ad 100644 --- a/GoogleSignIn.podspec +++ b/GoogleSignIn.podspec @@ -13,8 +13,8 @@ The Google Sign-In SDK allows users to sign in with their Google account from th :tag => s.version.to_s } s.swift_version = '4.0' - ios_deployment_target = '12.0' - osx_deployment_target = '10.15' + ios_deployment_target = '15.0' + osx_deployment_target = '12.0' s.ios.deployment_target = ios_deployment_target s.osx.deployment_target = osx_deployment_target s.prefix_header_file = false @@ -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', '~> 11.0' - s.dependency 'AppAuth', '~> 2.1' - s.dependency 'GTMAppAuth', '~> 5.0' - s.dependency 'GTMSessionFetcher/Core', '~> 3.3' + s.dependency 'AppAuth', '~> 3.0' + s.dependency 'GTMAppAuth', '~> 6.0' + s.dependency 'GTMSessionFetcher/Core', '>= 3.3', '< 6.0' s.resource_bundle = { 'GoogleSignIn' => ['GoogleSignIn/Sources/{Resources,Strings}/*'] } diff --git a/GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.m b/GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.m index b3f34db5..87ac1047 100644 --- a/GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.m +++ b/GoogleSignIn/Sources/GIDAppCheck/UI/GIDActivityIndicatorViewController.m @@ -27,13 +27,8 @@ - (void)viewDidLoad { // Medium gray with transparency self.view.backgroundColor = [UIColor colorWithRed:0.1 green:0.1 blue:0.1 alpha:0.25]; - UIActivityIndicatorViewStyle style; - if (@available(iOS 13.0, *)) { - style = UIActivityIndicatorViewStyleLarge; - } else { - style = UIActivityIndicatorViewStyleGray; - } - _activityIndicator = [[UIActivityIndicatorView alloc] initWithActivityIndicatorStyle:style]; + _activityIndicator = [[UIActivityIndicatorView alloc] + initWithActivityIndicatorStyle:UIActivityIndicatorViewStyleLarge]; _activityIndicator.color = UIColor.whiteColor; self.activityIndicator.translatesAutoresizingMaskIntoConstraints = NO; [self.activityIndicator startAnimating]; diff --git a/GoogleSignInSwiftSupport.podspec b/GoogleSignInSwiftSupport.podspec index d6fb9839..71c3ce80 100644 --- a/GoogleSignInSwiftSupport.podspec +++ b/GoogleSignInSwiftSupport.podspec @@ -11,8 +11,8 @@ Pod::Spec.new do |s| :git => 'https://github.com/google/GoogleSignIn-iOS.git', :tag => s.version.to_s } - ios_deployment_target = '13.0' - macos_deployment_target = '10.15' + ios_deployment_target = '15.0' + macos_deployment_target = '12.0' s.ios.deployment_target = ios_deployment_target s.osx.deployment_target = macos_deployment_target s.module_name = 'GoogleSignInSwift' diff --git a/Package.swift b/Package.swift index 219d64a0..a394166a 100644 --- a/Package.swift +++ b/Package.swift @@ -23,8 +23,8 @@ let package = Package( name: "GoogleSignIn", defaultLocalization: "en", platforms: [ - .macOS(.v10_15), - .iOS(.v12) + .macOS(.v12), + .iOS(.v15) ], products: [ .library( @@ -43,16 +43,16 @@ let package = Package( dependencies: [ .package( url: "https://github.com/openid/AppAuth-iOS.git", - from: "2.1.0"), + from: "3.0.0"), .package( url: "https://github.com/google/app-check.git", from: "11.0.0"), .package( url: "https://github.com/google/GTMAppAuth.git", - from: "5.0.0"), + from: "6.0.0"), .package( url: "https://github.com/google/gtm-session-fetcher.git", - from: "3.3.0"), + "3.3.0" ..< "6.0.0"), .package( url: "https://github.com/firebase/ocmock.git", revision: "7291762d3551c5c7e31c49cce40a0e391a52e889"), diff --git a/Package@swift-5.5.swift b/Package@swift-5.7.swift similarity index 96% rename from Package@swift-5.5.swift rename to Package@swift-5.7.swift index 007e9e90..3feb46d6 100644 --- a/Package@swift-5.5.swift +++ b/Package@swift-5.7.swift @@ -1,4 +1,4 @@ -// swift-tools-version:5.5 +// swift-tools-version:5.7 // The swift-tools-version declares the minimum version of Swift required to build this package. // Copyright 2021 Google LLC @@ -23,8 +23,8 @@ let package = Package( name: "GoogleSignIn", defaultLocalization: "en", platforms: [ - .macOS(.v10_15), - .iOS(.v12) + .macOS(.v12), + .iOS(.v15) ], products: [ .library( @@ -44,7 +44,7 @@ let package = Package( .package( name: "AppAuth", url: "https://github.com/openid/AppAuth-iOS.git", - from: "2.1.0"), + from: "3.0.0"), .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: "5.0.0"), + from: "6.0.0"), .package( name: "GTMSessionFetcher", url: "https://github.com/google/gtm-session-fetcher.git", - from: "3.3.0"), + "3.3.0" ..< "6.0.0"), .package( name: "OCMock", url: "https://github.com/firebase/ocmock.git", diff --git a/Samples/ObjC/SignInSample/Podfile b/Samples/ObjC/SignInSample/Podfile index ba07c279..52e6c140 100644 --- a/Samples/ObjC/SignInSample/Podfile +++ b/Samples/ObjC/SignInSample/Podfile @@ -1,4 +1,4 @@ -platform :ios, '12.0' +platform :ios, '15.0' use_frameworks! target 'SampleForPod' do diff --git a/Samples/ObjC/SignInSample/SignInSample.xcodeproj/project.pbxproj b/Samples/ObjC/SignInSample/SignInSample.xcodeproj/project.pbxproj index 0ffd550e..ce702bff 100644 --- a/Samples/ObjC/SignInSample/SignInSample.xcodeproj/project.pbxproj +++ b/Samples/ObjC/SignInSample/SignInSample.xcodeproj/project.pbxproj @@ -391,7 +391,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; OTHER_LDFLAGS = "-ObjC"; @@ -441,7 +441,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; OTHER_LDFLAGS = "-ObjC"; SDKROOT = iphoneos; @@ -459,7 +459,7 @@ .., ); INFOPLIST_FILE = "$(SRCROOT)/SignInSample-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -478,7 +478,7 @@ .., ); INFOPLIST_FILE = "$(SRCROOT)/SignInSample-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/Samples/ObjC/SignInSample/SignInSampleForPod.xcodeproj/project.pbxproj b/Samples/ObjC/SignInSample/SignInSampleForPod.xcodeproj/project.pbxproj index f53071cc..124127ef 100644 --- a/Samples/ObjC/SignInSample/SignInSampleForPod.xcodeproj/project.pbxproj +++ b/Samples/ObjC/SignInSample/SignInSampleForPod.xcodeproj/project.pbxproj @@ -444,7 +444,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -494,7 +494,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 10.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -510,7 +510,7 @@ CLANG_ENABLE_MODULES = YES; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/SignInSample-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.google.SignInSample; PRODUCT_NAME = SignInSample; @@ -527,7 +527,7 @@ CLANG_ENABLE_MODULES = YES; DEVELOPMENT_TEAM = ""; INFOPLIST_FILE = "$(SRCROOT)/SignInSample-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.google.SignInSample; PRODUCT_NAME = SignInSample; diff --git a/Samples/Swift/AppAttestExample/Podfile b/Samples/Swift/AppAttestExample/Podfile index ebd1d406..9e344324 100644 --- a/Samples/Swift/AppAttestExample/Podfile +++ b/Samples/Swift/AppAttestExample/Podfile @@ -8,5 +8,5 @@ use_frameworks! :linkage => :static target 'AppAttestExampleForPod' do pod 'AppCheckCore' - platform :ios, '14.0' + platform :ios, '15.0' end diff --git a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthday.xcodeproj/project.pbxproj b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthday.xcodeproj/project.pbxproj index 7d947429..eab76316 100644 --- a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthday.xcodeproj/project.pbxproj +++ b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthday.xcodeproj/project.pbxproj @@ -489,7 +489,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -546,7 +546,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -567,7 +567,7 @@ DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = iOS/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -591,7 +591,7 @@ DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = iOS/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", diff --git a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayForPod.xcodeproj/project.pbxproj b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayForPod.xcodeproj/project.pbxproj index 935cf5b7..8b3b3ff8 100644 --- a/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayForPod.xcodeproj/project.pbxproj +++ b/Samples/Swift/DaysUntilBirthday/DaysUntilBirthdayForPod.xcodeproj/project.pbxproj @@ -508,7 +508,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; MTL_FAST_MATH = YES; ONLY_ACTIVE_ARCH = YES; @@ -565,7 +565,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 14.5; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; MTL_ENABLE_DEBUG_INFO = NO; MTL_FAST_MATH = YES; SDKROOT = iphoneos; @@ -585,7 +585,7 @@ DEVELOPMENT_ASSET_PATHS = "\"iOS/Preview Content\""; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = iOS/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -607,7 +607,7 @@ DEVELOPMENT_ASSET_PATHS = "\"iOS/Preview Content\""; ENABLE_PREVIEWS = YES; INFOPLIST_FILE = iOS/Info.plist; - IPHONEOS_DEPLOYMENT_TARGET = 14.0; + IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/Frameworks", @@ -639,7 +639,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 12.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = Google.DaysUntilBirthdayOnMac; PRODUCT_NAME = "$(TARGET_NAME)"; @@ -669,7 +669,7 @@ "$(inherited)", "@executable_path/../Frameworks", ); - MACOSX_DEPLOYMENT_TARGET = 11.0; + MACOSX_DEPLOYMENT_TARGET = 12.0; MARKETING_VERSION = 1.0; PRODUCT_BUNDLE_IDENTIFIER = Google.DaysUntilBirthdayOnMac; PRODUCT_NAME = "$(TARGET_NAME)"; diff --git a/Samples/Swift/DaysUntilBirthday/Podfile b/Samples/Swift/DaysUntilBirthday/Podfile index f746be79..b661e932 100644 --- a/Samples/Swift/DaysUntilBirthday/Podfile +++ b/Samples/Swift/DaysUntilBirthday/Podfile @@ -5,9 +5,9 @@ project 'DaysUntilBirthdayForPod.xcodeproj' use_frameworks! :linkage => :static target 'DaysUntilBirthdayForPod (iOS)' do - platform :ios, '14.0' + platform :ios, '15.0' end target 'DaysUntilBirthdayForPod (macOS)' do - platform :osx, '11.0' + platform :osx, '12.0' end