Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Carthage support #36

Merged
merged 4 commits into from
Nov 9, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 1 addition & 4 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,4 @@ Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build
Carthage
35 changes: 30 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,33 @@
osx_image: xcode10
language: objective-c
podfile: Demo/Podfile
cache: cocoapods
xcode_project: RxNimble.xcodeproj
xcode_scheme:
- RxNimbleRxBlocking
- RxNimbleRxTest

cache:
directories:
- $HOME/Library/Caches/org.carthage.CarthageKit/dependencies
- Carthage

before_install:
- gem install cocoapods -v '1.3.1'
- pod repo update
script: cd Demo ; set -o pipefail && xcodebuild -workspace 'Demo.xcworkspace' -scheme 'Demo' -configuration 'Debug' -sdk iphonesimulator -destination platform='iOS Simulator',OS='12.0',name='iPhone 8' build test | xcpretty -c --test
- carthageversion=$(carthage version)
- if [ $carthageversion != "0.31.2" ]; then brew uninstall carthage; HOMEBREW_NO_AUTO_UPDATE=1 brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/a85feeb75bc9e9beb7f2e9dc6e2ccc996a6aeaf5/Formula/carthage.rb; fi
Copy link
Contributor Author

@gobetti gobetti Nov 3, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

to the best of my knowledge, a carthage version can't be specified in a Gemfile, so this is currently the fastest way I know to install a specific version. And actually I didn't mean to use 0.31.2 specifically, I'd like to always use the most up-to-date one but brew update is expensive

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah this is a bit backwards but I don't have a nicer idea to go around this for now :)


jobs:
include:
- stage: prepare carthage cache
script:
- carthage bootstrap --no-use-binaries --cache-builds
- stage: carthage builds
script:
- carthage build --cache-builds --no-skip-current --platform macOS
- script:
- carthage build --cache-builds --no-skip-current --platform iOS
- script:
- carthage build --cache-builds --no-skip-current --platform tvOS

stages:
- prepare carthage cache
- test
- carthage builds
2 changes: 1 addition & 1 deletion Changelog.md → CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

## Current Master

- Nothing yet!
- Carthage support

## 4.4.0

Expand Down
3 changes: 3 additions & 0 deletions Cartfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
github "ReactiveX/RxSwift" ~> 4.2
github "Quick/Quick"
github "Quick/Nimble"
3 changes: 3 additions & 0 deletions Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
github "Quick/Nimble" "v7.3.1"
github "Quick/Quick" "v1.3.2"
github "ReactiveX/RxSwift" "4.4.0"
1 change: 0 additions & 1 deletion Demo/.swift-version

This file was deleted.

537 changes: 0 additions & 537 deletions Demo/Demo.xcodeproj/project.pbxproj

This file was deleted.

10 changes: 0 additions & 10 deletions Demo/Demo.xcworkspace/contents.xcworkspacedata

This file was deleted.

46 changes: 0 additions & 46 deletions Demo/Demo/AppDelegate.swift

This file was deleted.

53 changes: 0 additions & 53 deletions Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json

This file was deleted.

27 changes: 0 additions & 27 deletions Demo/Demo/Base.lproj/LaunchScreen.storyboard

This file was deleted.

25 changes: 0 additions & 25 deletions Demo/Demo/Base.lproj/Main.storyboard

This file was deleted.

40 changes: 0 additions & 40 deletions Demo/Demo/Info.plist

This file was deleted.

25 changes: 0 additions & 25 deletions Demo/Demo/ViewController.swift

This file was deleted.

18 changes: 0 additions & 18 deletions Demo/Podfile

This file was deleted.

47 changes: 0 additions & 47 deletions Demo/Podfile.lock

This file was deleted.