Skip to content

Commit

Permalink
Switch to Swift Package Manager (#527)
Browse files Browse the repository at this point in the history
* Initial removal of some fatalError calls

* Update for Nimble SPM limitations

Nimble doesn't support raiseException() when built with SPM
- paves way for SPM support and M1 support

* Update UInt8+ExtensionsTests.swift

Specify specific BitShiftError cases in test

* Let's just remove carthage while we're at it.

* Remove integration-tests-carthage from config.yml

* Update fastlane Fastfile for removing carthage

* Linter errors

* Updates for comments

* Fix config.yml

* Update ObjCThrowExceptionMatcher.swift

* private instead of fileprivate, I always forget which is more restrictive
  • Loading branch information
taquitos authored Jun 11, 2021
1 parent a33840a commit 79008f5
Show file tree
Hide file tree
Showing 31 changed files with 572 additions and 311 deletions.
38 changes: 6 additions & 32 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,13 @@ commands:
# Bundler
- restore_cache:
keys:
- gem-cache-{{ checksum "Gemfile.lock" }}
- v1-gem-cache-{{ checksum "Gemfile.lock" }}
- run:
name: Bundle install
working_directory: << parameters.directory >>
command: bundle install --clean --path vendor/bundle
- save_cache:
key: gem-cache-{{ checksum "Gemfile.lock" }}
key: v1-gem-cache-{{ checksum "Gemfile.lock" }}
paths:
- vendor/bundle
scan-and-archive:
Expand Down Expand Up @@ -112,19 +112,6 @@ jobs:
steps:
- checkout

# Carthage
- restore_cache:
keys:
- carthage-cache-{{ checksum "Cartfile.resolved" }}
- run:
name: Carthage Bootstrap
command: |
./carthage.sh bootstrap --cache-builds
- save_cache:
key: carthage-cache-{{ checksum "Cartfile.resolved" }}
paths:
- Carthage

- install-gems

- run:
Expand All @@ -148,19 +135,6 @@ jobs:
- run:
name: Open simulator
command: xcrun instruments -w "iPhone 11 Pro (14.2) [" || true

# Carthage
- restore_cache:
keys:
- carthage-cache-{{ checksum "Cartfile.resolved" }}
- run:
name: Carthage Bootstrap
command: |
./carthage.sh bootstrap --cache-builds
- save_cache:
key: carthage-cache-{{ checksum "Cartfile.resolved" }}
paths:
- Carthage

- install-gems

Expand Down Expand Up @@ -188,10 +162,10 @@ jobs:
# Bundler
- restore_cache:
keys:
- gem-cache-{{ checksum "Gemfile.lock" }}
- v1-gem-cache-{{ checksum "Gemfile.lock" }}
- run: bundle install --clean --path vendor/bundle
- save_cache:
key: gem-cache-{{ checksum "Gemfile.lock" }}
key: v1-gem-cache-{{ checksum "Gemfile.lock" }}
paths:
- vendor/bundle

Expand Down Expand Up @@ -287,7 +261,7 @@ jobs:
- update-spm-integration-commit
- install-gems-scan-and-archive:
directory: IntegrationTests/SPMIntegration/

integration-tests-carthage:
macos:
xcode: "12.5.0"
Expand All @@ -314,7 +288,7 @@ jobs:
key: carthage-cache-{{ checksum "Cartfile.resolved" }}
paths:
- Carthage

- install-gems-scan-and-archive:
directory: IntegrationTests/CarthageIntegration/

Expand Down
2 changes: 1 addition & 1 deletion .swiftlint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ excluded:
- StoreKitTests
disabled_rules:
- trailing_comma
variable_name:
identifier_name:
max_length:
warning: 60
error: 80
2 changes: 0 additions & 2 deletions Cartfile.private

This file was deleted.

2 changes: 0 additions & 2 deletions Cartfile.resolved

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/RevenueCat/purchases-ios.git",
"state": {
"branch": null,
"revision": "5952f970bb29b8bfd517ff15a96aede53a943828",
"version": "3.10.1"
"revision": "9e31fb34880e77c598c2f1058b71b3b321f8ff4c",
"version": "3.12.0-beta.1"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{
"object": {
"pins": [
{
"package": "Purchases",
"repositoryURL": "https://github.com/RevenueCat/purchases-ios.git",
"state": {
"branch": "main",
"revision": "a33840a0815dc63067ffea5ea9b8aa3c1c49a5ff",
"version": null
}
}
]
},
"version": 1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
{
"object": {
"pins": [
{
"package": "CwlCatchException",
"repositoryURL": "https://github.com/mattgallagher/CwlCatchException.git",
"state": {
"branch": null,
"revision": "682841464136f8c66e04afe5dbd01ab51a3a56f2",
"version": "2.1.0"
}
},
{
"package": "CwlPreconditionTesting",
"repositoryURL": "https://github.com/mattgallagher/CwlPreconditionTesting.git",
"state": {
"branch": null,
"revision": "02b7a39a99c4da27abe03cab2053a9034379639f",
"version": "2.0.0"
}
},
{
"package": "Nimble",
"repositoryURL": "https://github.com/Quick/Nimble.git",
"state": {
"branch": null,
"revision": "af1730dde4e6c0d45bf01b99f8a41713ce536790",
"version": "9.2.0"
}
},
{
"package": "OHHTTPStubs",
"repositoryURL": "https://github.com/AliSoftware/OHHTTPStubs.git",
"state": {
"branch": null,
"revision": "12f19662426d0434d6c330c6974d53e2eb10ecd9",
"version": "9.1.0"
}
}
]
},
"version": 1
}
Loading

0 comments on commit 79008f5

Please sign in to comment.