Merge pull request #10 from AckeeCZ/carthage_support

Carthage support
AckeeCZ · Dec 28, 2017 · 5752aef · 5752aef
2 parents c809f5f + 3df3836
commit 5752aef
Show file tree

Hide file tree

Showing 30 changed files with 1,204 additions and 849 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +1,12 @@
-# references:
-# * http://www.objc.io/issue-6/travis-ci.html
-# * https://github.com/supermarin/xcpretty#usage
-
-osx_image: xcode9.1
+osx_image: xcode9.2
 language: objective-c
-cache: cocoapods
-podfile: Example/Podfile
+cache:
+  directories:
+  - Carthage
 before_install:
-- gem install cocoapods # Since Travis is not always on latest version
-- pod install --project-directory=Example --repo-update
+- brew update
+- brew outdated carthage || brew upgrade carthage
+- carthage bootstrap --platform iOS --cache-builds
 script:
-- set -o pipefail && xcodebuild test -workspace Example/ReactiveLocation.xcworkspace -scheme ReactiveLocation-Example -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.1' ONLY_ACTIVE_ARCH=NO | xcpretty
-- pod lib lint --allow-warnings
+- set -o pipefail && xcodebuild test -scheme ReactiveLocation -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.2' ONLY_ACTIVE_ARCH=NO | xcpretty
+- pod lib lint
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "ReactiveCocoa/ReactiveSwift" ~> 3.0
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1,2 @@
+github "ReactiveCocoa/ReactiveSwift" "3.0.0"
+github "antitypical/Result" "3.2.4"
diff --git a/Example/Podfile b/Example/Podfile
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
diff --git a/Example/ReactiveLocation.xcodeproj/project.pbxproj b/Example/ReactiveLocation.xcodeproj/project.pbxproj
diff --git a/Example/ReactiveLocation.xcworkspace/contents.xcworkspacedata b/Example/ReactiveLocation.xcworkspace/contents.xcworkspacedata
diff --git a/Example/ReactiveLocation/Base.lproj/LaunchScreen.xib b/Example/ReactiveLocation/Base.lproj/LaunchScreen.xib
diff --git a/Example/ReactiveLocation/Base.lproj/Main.storyboard b/Example/ReactiveLocation/Base.lproj/Main.storyboard
diff --git a/Example/ReactiveLocation/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/ReactiveLocation/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/ReactiveLocation.podspec b/ReactiveLocation.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ReactiveLocation'
-  s.version          = '3.0.0'
+  s.version          = '3.0.1'
   s.summary          = 'Simple yet powerful wrapper of CLLocationManager for ReactiveCocoa'
 
 # This description is used to generate tags and improve search results.
@@ -30,7 +30,7 @@ DESC
 
   s.ios.deployment_target = '8.0'
 
-  s.source_files = 'ReactiveLocation/Classes/**/*'
+  s.source_files = 'ReactiveLocation/*.swift'
 
   # s.resource_bundles = {
   #   'ReactiveLocation' => ['ReactiveLocation/Assets/*.png']
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		github "ReactiveCocoa/ReactiveSwift" "3.0.0"
		github "antitypical/Result" "3.2.4"