Skip to content

Commit 48dd794

Browse files
author
Malcolm Jarvis
committed
Fix carthage bootstrap of Tests project
Fixes #50 Ignores Carthage checkouts, these are not necessary to be in the repo. Switches to direct access to carthage frameworks instead of including sub-projects * Verified all targets (iOS, macOS, tvOS, watchOS) compile correctly * Verified all test targets (iOS, macOS, tvOS) compile, run, and pass all tests * Verified usage of project via carthage builds all targets successfully Anyone who wishes to run the tests / build the targets must now run `carthage bootstrap`. One can also include `--platform X` to reduce carthage to building only one platform to save time.
1 parent 1055ca8 commit 48dd794

544 files changed

Lines changed: 254 additions & 49609 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.DS_Store

-6 KB
Binary file not shown.

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,7 @@ xcuserdata
4444
# Carthage
4545
#
4646
# Add this line if you want to avoid checking in source code from Carthage dependencies.
47-
# Carthage/Checkouts
48-
Carthage/Build
47+
Carthage
4948

5049
# fastlane
5150
#

.travis.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@ matrix:
1818
- env: SCHEME="iOS" SDK="iphonesimulator10.2" DESTINATION="OS=10.1,name=iPhone 6S Plus"
1919
- env: SCHEME="tvOS" SDK="appletvsimulator10.1" DESTINATION="OS=10.1,name=Apple TV 1080p"
2020

21+
before_install:
22+
- carthage bootstrap
23+
2124
script:
2225
- set -o pipefail
2326
- xcodebuild -version

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
github "Quick/Nimble" "v5.1.1"
2-
github "Quick/Quick" "v0.10.0"
2+
github "Quick/Quick" "v1.0.0"
33
github "ReSwift/ReSwift" "3.0.0"

Carthage/Checkouts/Nimble/.gitignore

Lines changed: 0 additions & 21 deletions
This file was deleted.

Carthage/Checkouts/Nimble/.swift-version

Lines changed: 0 additions & 1 deletion
This file was deleted.

Carthage/Checkouts/Nimble/.travis.yml

Lines changed: 0 additions & 25 deletions
This file was deleted.

Carthage/Checkouts/Nimble/CONTRIBUTING.md

Lines changed: 0 additions & 120 deletions
This file was deleted.

Carthage/Checkouts/Nimble/Gemfile

Lines changed: 0 additions & 4 deletions
This file was deleted.

Carthage/Checkouts/Nimble/Gemfile.lock

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)