Skip to content

Commit b0178f1

Browse files
FrancoisDevemy5FrancoisDevemy5
authored
[CA-4272] Support des variants (#4)
1 parent d39c4f8 commit b0178f1

File tree

7 files changed

+63
-42
lines changed

7 files changed

+63
-42
lines changed

‎.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,5 @@ Pods
4242
.idea/
4343
*.iml
4444
.vscode
45+
46+
.build/

‎CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# Changelog
22

3+
## v7.1.0
4+
### New features
5+
- Support choosing a variant
6+
37
## v7.0.0
48
### Breaking changes
59
- New name for the Pod: `Reach5Google`

‎Package.resolved

Lines changed: 8 additions & 8 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Podfile.lock

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
PODS:
2-
- Alamofire (5.9.1)
2+
- Alamofire (5.10.1)
33
- AppAuth (1.7.5):
44
- AppAuth/Core (= 1.7.5)
55
- AppAuth/ExternalUserAgent (= 1.7.5)
66
- AppAuth/Core (1.7.5)
77
- AppAuth/ExternalUserAgent (1.7.5):
88
- AppAuth/Core
99
- BrightFutures (8.2.0)
10-
- CryptoSwift (1.8.2)
11-
- DeviceKit (5.4.0)
10+
- CryptoSwift (1.8.3)
11+
- DeviceKit (5.5.0)
1212
- GoogleSignIn (7.1.0):
1313
- AppAuth (< 2.0, >= 1.7.3)
1414
- GTMAppAuth (< 5.0, >= 4.1.1)
@@ -17,12 +17,12 @@ PODS:
1717
- AppAuth/Core (~> 1.7)
1818
- GTMSessionFetcher/Core (< 4.0, >= 3.3)
1919
- GTMSessionFetcher/Core (3.5.0)
20-
- Reach5 (7.0.0):
20+
- Reach5 (7.1.3):
2121
- Alamofire (~> 5.8)
2222
- BrightFutures (~> 8.2.0)
2323
- CryptoSwift (~> 1.8)
2424
- DeviceKit (~> 5.1)
25-
- Reach5Google (7.0.0):
25+
- Reach5Google (7.1.0):
2626
- GoogleSignIn (~> 7)
2727
- Reach5
2828

@@ -47,17 +47,17 @@ EXTERNAL SOURCES:
4747
:path: Reach5Google.podspec
4848

4949
SPEC CHECKSUMS:
50-
Alamofire: f36a35757af4587d8e4f4bfa223ad10be2422b8c
50+
Alamofire: 840d2a1ad82355b536ec6ba5f97e5bfa54600ca3
5151
AppAuth: 501c04eda8a8d11f179dbe8637b7a91bb7e5d2fa
5252
BrightFutures: 67e0e8cd974ab9f6c04650cc64153f7adf1ec489
53-
CryptoSwift: c63a805d8bb5e5538e88af4e44bb537776af11ea
54-
DeviceKit: bd34bb1766d926c3cc5a5f6e3e9a6dd10148b805
53+
CryptoSwift: 967f37cea5a3294d9cce358f78861652155be483
54+
DeviceKit: d83e38ca196a4ebf0cc5f37d6f0316a24b794d5b
5555
GoogleSignIn: d4281ab6cf21542b1cfaff85c191f230b399d2db
5656
GTMAppAuth: f69bd07d68cd3b766125f7e072c45d7340dea0de
5757
GTMSessionFetcher: 5aea5ba6bd522a239e236100971f10cb71b96ab6
58-
Reach5: d5f162142895fe7120e1c0dd5a3ae0f7494fd58b
59-
Reach5Google: 1eb1a19a04d9586b85d34fe197856842bd4a4f3a
58+
Reach5: 0de298501e3f13d919bdf2c5729c99b689c52b52
59+
Reach5Google: 2b31205563e60be247c87b0d64b82e693f496e30
6060

6161
PODFILE CHECKSUM: 9e45465699723470728359495775b9d174424711
6262

63-
COCOAPODS: 1.15.2
63+
COCOAPODS: 1.16.2

‎RELEASE.md

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,43 @@
11
# Guide for publication
22

3-
1. Create a branch with the name of the version `x.x.x`
3+
1. Run `pod update` to update the dependencies
4+
```shell
5+
pod update
6+
```
47

5-
2. Change the version in `version.rb` file
6-
```ruby
7-
$VERSION = 'x.x.x'
8-
```
8+
2. Create a branch with the name of the version `x.x.x`
99

10-
3. Run `pod update` to update the dependencies
11-
```shell
12-
pod update
13-
```
10+
3. Change the version in [version.rb](version.rb) file
11+
```ruby
12+
$VERSION = 'x.x.x'
13+
```
1414

15-
4. Update the `CHANGELOG.md` file
15+
4. Run `pod install` to install the new version of this library
16+
```shell
17+
pod install
18+
```
19+
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.
1620

17-
5. Submit and merge the pull request
21+
5. If Reach5 has been upgraded to a new major version, update the version in [Package.swift](Package.swift) <br>
22+
Update to latest package versions of dependencies for SPM in XCode or with this command
23+
```shell
24+
swift package update
25+
```
1826

19-
6. Add git tag `x.x.x` to the merge commit
20-
```sh
21-
git tag x.x.x
22-
```
27+
6. Update the [CHANGELOG.md](CHANGELOG.md) file
2328

24-
6. Push the tag
25-
```sh
26-
git push origin x.x.x
27-
```
29+
7. Submit and merge the pull request
2830

29-
7. The CI will automatically publish this new version
31+
8. Add git tag `x.x.x` to the merge commit
32+
```sh
33+
git tag x.x.x
34+
```
3035

31-
8. Finally, draft a new release in the [Github releases tab](https://github.com/ReachFive/reachfive-ios-google/releases) (copy & paste the changelog in the release's description).
36+
9. Push the tag
37+
```sh
38+
git push origin x.x.x
39+
```
40+
41+
10. The CI will automatically publish this new version
42+
43+
11. Finally, draft a new release in the [Github releases tab](https://github.com/ReachFive/reachfive-ios-google/releases) (copy & paste the changelog in the release's description).

‎Sources/Classes/GoogleProvider.swift

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@ public class GoogleProvider: ProviderCreator {
88
public static var NAME: String = "google"
99

1010
public var name: String = NAME
11+
public var variant: String?
1112

12-
public init() {}
13+
public init(variant: String? = nil) {
14+
self.variant = variant
15+
}
1316

1417
public func create(
1518
sdkConfig: SdkConfig,

‎version.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
$VERSION = '7.0.0'
1+
$VERSION = '7.1.0'
22
$IOS_DEPLOYMENT_TARGET = '13.0'

0 commit comments

Comments
 (0)