diff --git a/CHANGELOG.md b/CHANGELOG.md index a4a5347f..01d2349c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,9 @@ -# Unreleased -- Migrated the iOS example app to the UIScene lifecycle (adds SceneDelegate, UIApplicationSceneManifest); the iOS example now requires iOS 15+ -- BREAKING: Raised minimum deployment targets to iOS 15.0, macOS 12.0, tvOS 15.0 and watchOS 9.0, and `swift-tools-version` to 5.7, to adopt AppAuth 3.0.0. -- BREAKING: Updated the AppAuth dependency to 3.0.0. -- Widened the GTMSessionFetcher dependency to allow 4.x and 5.x ([#273](https://github.com/google/GTMAppAuth/issues/273)). -- Updated the CocoaPods development dependency to 1.17.0. +# 6.0.0 +- BREAKING: Updated the AppAuth dependency to 3.0.0 and raised the minimum deployment targets to iOS 15.0, macOS 12.0, tvOS 15.0 and watchOS 9.0, along with `swift-tools-version` 5.7 ([#280](https://github.com/google/GTMAppAuth/pull/280)) +- Widened the GTMSessionFetcher dependency to allow 4.x and 5.x, and updated the CocoaPods development dependency to 1.17.0 ([#284](https://github.com/google/GTMAppAuth/pull/284)) +- Migrated the iOS example app to the UIScene lifecycle; the iOS example now requires iOS 15+ ([#278](https://github.com/google/GTMAppAuth/pull/278)) +- Updated the iOS example to use xcconfig-based client configuration ([#279](https://github.com/google/GTMAppAuth/pull/279)) +- Fixed compile errors when building in Swift 6 language mode ([#267](https://github.com/google/GTMAppAuth/pull/267)) # 5.0.0 - Update keychain default on Mac to be data protected ([#259](https://github.com/google/GTMAppAuth/pull/259)) diff --git a/Examples/Example-iOS/Example-iOSForPod.xcodeproj/project.pbxproj b/Examples/Example-iOS/Example-iOSForPod.xcodeproj/project.pbxproj index 74f2746e..bfe1e6c1 100644 --- a/Examples/Example-iOS/Example-iOSForPod.xcodeproj/project.pbxproj +++ b/Examples/Example-iOS/Example-iOSForPod.xcodeproj/project.pbxproj @@ -57,6 +57,7 @@ 73E4FD2928B056AF003D602E /* AppAuth.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; path = AppAuth.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8536F19A676D520C21C03D35 /* Pods-Example-iOSForPod.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Example-iOSForPod.debug.xcconfig"; path = "Target Support Files/Pods-Example-iOSForPod/Pods-Example-iOSForPod.debug.xcconfig"; sourceTree = ""; }; C1AF3AE928187F71003BAEFF /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = ""; }; + C1C0F1D02E2F000000000002 /* Config/Example.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Config/Example.xcconfig; sourceTree = ""; }; D863799628187F71003BAEFF /* SceneDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = SceneDelegate.h; sourceTree = ""; }; D863799728187F71003BAEFF /* SceneDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = SceneDelegate.m; sourceTree = ""; }; /* End PBXFileReference section */ @@ -94,6 +95,7 @@ isa = PBXGroup; children = ( C1AF3AE928187F71003BAEFF /* README.md */, + C1C0F1D02E2F000000000002 /* Config/Example.xcconfig */, 346E916B1C29D42800D3620B /* Source */, 341564001C487ABA00ECA3D9 /* Frameworks */, 346E916A1C29D42800D3620B /* Products */, @@ -281,6 +283,7 @@ /* Begin XCBuildConfiguration section */ 346E917E1C29D42800D3620B /* Debug */ = { isa = XCBuildConfiguration; + baseConfigurationReference = C1C0F1D02E2F000000000002 /* Config/Example.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -330,6 +333,7 @@ }; 346E917F1C29D42800D3620B /* Release */ = { isa = XCBuildConfiguration; + baseConfigurationReference = C1C0F1D02E2F000000000002 /* Config/Example.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; @@ -380,10 +384,6 @@ INFOPLIST_FILE = Source/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - OIDC_CLIENT_ID = "YOUR_CLIENT.apps.googleusercontent.com"; - OIDC_ISSUER = "https://accounts.google.com"; - OIDC_REDIRECT_URI = "com.googleusercontent.apps.YOUR_CLIENT:/oauthredirect"; - OIDC_REDIRECT_URI_SCHEME = "com.googleusercontent.apps.YOUR_CLIENT"; OTHER_LDFLAGS = ( "-ObjC", "$(inherited)", @@ -402,10 +402,6 @@ INFOPLIST_FILE = Source/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - OIDC_CLIENT_ID = "YOUR_CLIENT.apps.googleusercontent.com"; - OIDC_ISSUER = "https://accounts.google.com"; - OIDC_REDIRECT_URI = "com.googleusercontent.apps.YOUR_CLIENT:/oauthredirect"; - OIDC_REDIRECT_URI_SCHEME = "com.googleusercontent.apps.YOUR_CLIENT"; OTHER_LDFLAGS = ( "-ObjC", "$(inherited)", diff --git a/Examples/Example-macOS/Example-macOSForPod.xcodeproj/project.pbxproj b/Examples/Example-macOS/Example-macOSForPod.xcodeproj/project.pbxproj index 1031813e..4c700790 100644 --- a/Examples/Example-macOS/Example-macOSForPod.xcodeproj/project.pbxproj +++ b/Examples/Example-macOS/Example-macOSForPod.xcodeproj/project.pbxproj @@ -294,7 +294,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; + MACOSX_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = macosx; @@ -332,7 +332,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - MACOSX_DEPLOYMENT_TARGET = 10.12; + MACOSX_DEPLOYMENT_TARGET = 12.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = macosx; }; diff --git a/Gemfile.lock b/Gemfile.lock index 285980bc..d187d6d7 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,45 +1,47 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.3) - activesupport (7.1.3.4) + CFPropertyList (3.0.8) + activesupport (7.2.3.2) base64 + benchmark (>= 0.3) bigdecimal - concurrent-ruby (~> 1.0, >= 1.0.2) + concurrent-ruby (~> 1.0, >= 1.3.1) connection_pool (>= 2.2.5) drb i18n (>= 1.6, < 2) - minitest (>= 5.1) - mutex_m - tzinfo (~> 2.0) - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) + logger (>= 1.4.2) + minitest (>= 5.1, < 6) + securerandom (>= 0.3) + tzinfo (~> 2.0, >= 2.0.5) + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) algoliasearch (1.27.5) httpclient (~> 2.8, >= 2.8.3) json (>= 1.5.1) atomos (0.1.3) - base64 (0.2.0) - bigdecimal (3.1.8) - claide (1.0.3) - cocoapods (1.15.2) - addressable (~> 2.6) + base64 (0.3.0) + benchmark (0.5.0) + bigdecimal (4.1.2) + claide (1.1.0) + cocoapods (1.17.0) + addressable (~> 2.8) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.15.2) + cocoapods-core (= 1.17.0) cocoapods-deintegrate (>= 1.0.3, < 2.0) - cocoapods-downloader (>= 1.4.0, < 2.0) + cocoapods-downloader (>= 2.1, < 3.0) cocoapods-plugins (>= 1.0.0, < 2.0) cocoapods-search (>= 1.0.0, < 2.0) - cocoapods-trunk (>= 1.4.0, < 2.0) + cocoapods-trunk (>= 1.6.0, < 2.0) cocoapods-try (>= 1.1.0, < 2.0) colored2 (~> 3.1) - escape (~> 0.0.4) fourflusher (>= 2.3.0, < 3.0) gh_inspector (~> 1.0) - molinillo (~> 0.6.6) + molinillo (~> 0.8.0) nap (~> 1.0) - ruby-macho (~> 1.4) - xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.15.2) + ruby-macho (~> 4.1.0) + xcodeproj (>= 1.28.1, < 2.0) + cocoapods-core (1.17.0) activesupport (>= 5.0, < 8) addressable (~> 2.8) algoliasearch (~> 1.0) @@ -49,54 +51,62 @@ GEM netrc (~> 0.11) public_suffix (~> 4.0) typhoeus (~> 1.0) - cocoapods-deintegrate (1.0.4) - cocoapods-downloader (1.6.3) + cocoapods-deintegrate (1.0.5) + cocoapods-downloader (2.1) cocoapods-plugins (1.0.0) nap - cocoapods-search (1.0.0) - cocoapods-trunk (1.5.0) + cocoapods-search (1.0.1) + cocoapods-trunk (1.6.0) nap (>= 0.8, < 2.0) netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.3.3) - connection_pool (2.4.1) - drb (2.2.1) - escape (0.0.4) - ethon (0.16.0) + concurrent-ruby (1.3.8) + connection_pool (3.0.2) + drb (2.2.3) + ethon (0.18.0) ffi (>= 1.15.0) - ffi (1.17.0) + logger + ffi (1.17.4) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) - httpclient (2.8.3) - i18n (1.14.5) + httpclient (2.9.0) + mutex_m + i18n (1.15.2) concurrent-ruby (~> 1.0) - json (2.7.2) - minitest (5.24.1) - molinillo (0.6.6) - mutex_m (0.2.0) - nanaimo (0.3.0) + json (2.21.2) + logger (1.7.0) + minitest (5.27.0) + molinillo (0.8.0) + mutex_m (0.3.0) + nanaimo (0.4.0) nap (1.1.0) netrc (0.11.0) + nkf (0.3.0) public_suffix (4.0.7) - ruby-macho (1.4.0) - typhoeus (1.4.1) - ethon (>= 0.9.0) + rexml (3.4.4) + ruby-macho (4.1.0) + securerandom (0.4.1) + typhoeus (1.6.0) + ethon (>= 0.18.0) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - xcodeproj (1.19.0) + xcodeproj (1.28.1) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) + base64 claide (>= 1.0.2, < 2.0) colored2 (~> 3.1) - nanaimo (~> 0.3.0) + nanaimo (~> 0.4.0) + nkf + rexml (>= 3.3.6, < 4.0) PLATFORMS ruby DEPENDENCIES - cocoapods (= 1.15.2) + cocoapods (= 1.17.0) BUNDLED WITH 2.5.4