Merge pull request #36 from gobetti/carthage-support

Carthage support
RxSwiftCommunity · Nov 9, 2018 · 3dc5048 · 3dc5048
2 parents 5b89bfd + 9e25241
commit 3dc5048
Show file tree

Hide file tree

Showing 28 changed files with 1,149 additions and 874 deletions.
diff --git a/.gitignore b/.gitignore
@@ -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
diff --git a/.travis.yml b/.travis.yml
@@ -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
+
+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
diff --git a/Changelog.md → CHANGELOG.md b/Changelog.md → CHANGELOG.md
@@ -2,7 +2,7 @@
 
 ## Current Master
 
-- Nothing yet!
+- Carthage support
 
 ## 4.4.0
 

diff --git a/Cartfile b/Cartfile
@@ -0,0 +1,3 @@
+github "ReactiveX/RxSwift" ~> 4.2
+github "Quick/Quick"
+github "Quick/Nimble"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,3 @@
+github "Quick/Nimble" "v7.3.1"
+github "Quick/Quick" "v1.3.2"
+github "ReactiveX/RxSwift" "4.4.0"
diff --git a/Demo/.swift-version b/Demo/.swift-version
diff --git a/Demo/Demo.xcodeproj/project.pbxproj b/Demo/Demo.xcodeproj/project.pbxproj
diff --git a/Demo/Demo.xcworkspace/contents.xcworkspacedata b/Demo/Demo.xcworkspace/contents.xcworkspacedata
diff --git a/Demo/Demo/AppDelegate.swift b/Demo/Demo/AppDelegate.swift
diff --git a/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json b/Demo/Demo/Assets.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Demo/Demo/Base.lproj/LaunchScreen.storyboard b/Demo/Demo/Base.lproj/LaunchScreen.storyboard
diff --git a/Demo/Demo/Base.lproj/Main.storyboard b/Demo/Demo/Base.lproj/Main.storyboard
diff --git a/Demo/Demo/Info.plist b/Demo/Demo/Info.plist
diff --git a/Demo/Demo/ViewController.swift b/Demo/Demo/ViewController.swift
diff --git a/Demo/Podfile b/Demo/Podfile
diff --git a/Demo/Podfile.lock b/Demo/Podfile.lock