diff --git a/CHANGELOG.md b/CHANGELOG.md index 0769cb0..146d59a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## v7.1.1 +### New features +- Fix variant communication with backend + ## v7.1.0 ### New features - Support choosing a variant diff --git a/Package.resolved b/Package.resolved index 14e9a4f..b632e34 100644 --- a/Package.resolved +++ b/Package.resolved @@ -78,8 +78,8 @@ "kind" : "remoteSourceControl", "location" : "https://github.com/ReachFive/reachfive-ios.git", "state" : { - "revision" : "b3ba43acad8b7f8ee9c4c019ed70162a67afefed", - "version" : "7.1.3" + "revision" : "2abb566dd5b3f89af8f26f3d8fbd889124c66131", + "version" : "7.1.4" } } ], diff --git a/Package.swift b/Package.swift index 112a457..5f8653c 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( .library(name: "Reach5Google", targets: ["Reach5Google"]), ], dependencies: [ - .package(url: "https://github.com/ReachFive/reachfive-ios.git", .upToNextMajor(from: "7.0.0")), + .package(url: "https://github.com/ReachFive/reachfive-ios.git", .upToNextMajor(from: "7.1.4")), .package(url: "https://github.com/google/GoogleSignIn-iOS.git", .upToNextMajor(from: "7.1.0")), ], targets: [ diff --git a/Podfile b/Podfile index a99b314..c828b8b 100644 --- a/Podfile +++ b/Podfile @@ -3,6 +3,6 @@ use_frameworks! platform :ios, '13.0' target 'Reach5Google' do - pod 'Reach5' + pod 'Reach5', '~> 7.1.4' pod 'Reach5Google', :path => 'Reach5Google.podspec' end diff --git a/Podfile.lock b/Podfile.lock index 985807f..7f61377 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -17,17 +17,17 @@ PODS: - AppAuth/Core (~> 1.7) - GTMSessionFetcher/Core (< 4.0, >= 3.3) - GTMSessionFetcher/Core (3.5.0) - - Reach5 (7.1.3): + - Reach5 (7.1.4): - Alamofire (~> 5.8) - BrightFutures (~> 8.2.0) - CryptoSwift (~> 1.8) - DeviceKit (~> 5.1) - - Reach5Google (7.1.0): + - Reach5Google (7.1.1): - GoogleSignIn (~> 7) - - Reach5 + - Reach5 (~> 7.1.4) DEPENDENCIES: - - Reach5 + - Reach5 (~> 7.1.4) - Reach5Google (from `Reach5Google.podspec`) SPEC REPOS: @@ -55,9 +55,9 @@ SPEC CHECKSUMS: GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6 - Reach5: 0de298501e3f13d919bdf2c5729c99b689c52b52 - Reach5Google: 2b31205563e60be247c87b0d64b82e693f496e30 + Reach5: 007fa51c364e6d2cc4381192284fa9f01fa86dfe + Reach5Google: 0c0501c23c2745938d4b675b1568c16ba371b810 -PODFILE CHECKSUM: 9e45465699723470728359495775b9d174424711 +PODFILE CHECKSUM: acdd6c1d9ef0a0acd0a7f5957fb79ad9dfdbf60c COCOAPODS: 1.16.2 diff --git a/RELEASE.md b/RELEASE.md index a2ceb75..80039dd 100644 --- a/RELEASE.md +++ b/RELEASE.md @@ -1,30 +1,25 @@ # Guide for publication -1. Run `pod update` to update the dependencies - ```shell - pod update - ``` - -2. Create a branch with the name of the version `x.x.x` +1. Create a branch with the name of the version `x.x.x` -3. Change the version in [version.rb](version.rb) file +2. Change the version in [version.rb](version.rb) file ```ruby $VERSION = 'x.x.x' ``` -4. Run `pod install` to install the new version of this library +3. Run `pod update` to install the new version of this library ```shell - pod install + pod update ``` - NB: CocoaPods seems to not be able to run `pod update` when in a branch named `x.x.x`. This is why `pod update` is run before creating the branch. - -5. If Reach5 has been upgraded to a new major version, update the version in [Package.swift](Package.swift) <br> +4. If Reach5 has been upgraded to a new major version, update the version in [Package.swift](Package.swift) <br> Update to latest package versions of dependencies for SPM in XCode or with this command ```shell swift package update ``` -6. Update the [CHANGELOG.md](CHANGELOG.md) file +5. Update the [CHANGELOG.md](CHANGELOG.md) file + +6. Test the modifications on the SPM project DemoSharedCredentials. SPM tends to be stricter than Cocoapods when validating dependencies and code visibility. 7. Submit and merge the pull request diff --git a/Reach5Google.podspec b/Reach5Google.podspec index 6f24786..92d87d9 100644 --- a/Reach5Google.podspec +++ b/Reach5Google.podspec @@ -22,6 +22,6 @@ Pod::Spec.new do |spec| spec.static_framework = true - spec.dependency 'Reach5' + spec.dependency 'Reach5', '~> 7.1.4' spec.dependency 'GoogleSignIn', '~> 7' end diff --git a/Sources/Classes/GoogleProvider.swift b/Sources/Classes/GoogleProvider.swift index 855f10a..5eccc5d 100644 --- a/Sources/Classes/GoogleProvider.swift +++ b/Sources/Classes/GoogleProvider.swift @@ -62,7 +62,7 @@ public class ConfiguredGoogleProvider: NSObject, Provider { } let loginProviderRequest = LoginProviderRequest( - provider: self.providerConfig.provider, + provider: self.providerConfig.providerWithVariant, providerToken: result.user.accessToken.tokenString, code: nil, origin: origin, diff --git a/version.rb b/version.rb index c6f39c9..89309fb 100644 --- a/version.rb +++ b/version.rb @@ -1,2 +1,2 @@ -$VERSION = '7.1.0' +$VERSION = '7.1.1' $IOS_DEPLOYMENT_TARGET = '13.0'