Merge pull request #9 from AckeeCZ/carthage_support

Carthage support
AckeeCZ · Dec 28, 2017 · 89ab9ec · 89ab9ec
2 parents 40d46a2 + 87fb83b
commit 89ab9ec
Show file tree

Hide file tree

Showing 34 changed files with 1,226 additions and 824 deletions.
diff --git a/.swift-version b/.swift-version
@@ -1 +1 @@
-3.0
+4.0
diff --git a/.travis.yml b/.travis.yml
@@ -2,13 +2,15 @@
 # * http://www.objc.io/issue-6/travis-ci.html
 # * https://github.com/supermarin/xcpretty#usage
 
-osx_image: xcode9
+osx_image: xcode9.2
 language: objective-c
-# cache: cocoapods
-# podfile: Example/Podfile
+cache:
+  directories:
+  - Carthage
 before_install:
-- gem install cocoapods --pre # Since Travis is not always on latest version
-- pod install --project-directory=Example
+- brew update
+- brew outdated carthage || brew upgrade carthage
+- carthage bootstrap --platform iOS --cache-builds
 script:
-- set -o pipefail && xcodebuild test -workspace Example/Reqres.xcworkspace -scheme Reqres-Example -destination 'platform=iOS Simulator,name=iPhone 6,OS=10.0' ONLY_ACTIVE_ARCH=NO | xcpretty
+- set -o pipefail && xcodebuild test -scheme Reqres -destination 'platform=iOS Simulator,name=iPhone 8,OS=11.2' ONLY_ACTIVE_ARCH=NO | xcpretty
 - pod lib lint
diff --git a/Cartfile.private b/Cartfile.private
@@ -0,0 +1 @@
+github "Alamofire/Alamofire"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+github "Alamofire/Alamofire" "4.6.0"
diff --git a/Example/Podfile b/Example/Podfile
diff --git a/Example/Podfile.lock b/Example/Podfile.lock
diff --git a/Example/Reqres.xcodeproj/project.pbxproj b/Example/Reqres.xcodeproj/project.pbxproj
diff --git a/Example/Reqres.xcworkspace/contents.xcworkspacedata b/Example/Reqres.xcworkspace/contents.xcworkspacedata
diff --git a/Example/Reqres.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/Example/Reqres.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings
diff --git a/Example/Reqres/Base.lproj/LaunchScreen.xib b/Example/Reqres/Base.lproj/LaunchScreen.xib
diff --git a/Example/Reqres/Base.lproj/Main.storyboard b/Example/Reqres/Base.lproj/Main.storyboard
diff --git a/Example/Reqres/Images.xcassets/AppIcon.appiconset/Contents.json b/Example/Reqres/Images.xcassets/AppIcon.appiconset/Contents.json
diff --git a/Example/Tests/ReqresTests.swift b/Example/Tests/ReqresTests.swift
diff --git a/Reqres.podspec b/Reqres.podspec
@@ -8,7 +8,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'Reqres'
-  s.version          = '2.1.0'
+  s.version          = '2.1.1'
   s.summary          = 'Simple network activity logger'
 
   s.description      = <<-DESC
@@ -23,5 +23,5 @@ Logs every request app makes, works great with Alamofire.
 
   s.ios.deployment_target = '8.0'
 
-  s.source_files = 'Reqres/Classes/**/*'
+  s.source_files = 'Reqres/*.swift'
 end