Skip to content

Commit

Permalink
Merge pull request #6 from AckeeCZ/swift4
Browse files Browse the repository at this point in the history
Update for Swift 4
  • Loading branch information
janmisar authored Aug 31, 2017
2 parents d00b333 + 14e7160 commit b599782
Show file tree
Hide file tree
Showing 168 changed files with 109 additions and 19,932 deletions.
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ Carthage
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
#
#
# Note: if you ignore the Pods directory, make sure to uncomment
# `pod install` in .travis.yml
#
# Pods/
Pods/
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
# * http://www.objc.io/issue-6/travis-ci.html
# * https://github.com/supermarin/xcpretty#usage

osx_image: xcode8
osx_image: xcode9
language: objective-c
# cache: cocoapods
# podfile: Example/Podfile
before_install:
- gem install cocoapods --pre # Since Travis is not always on latest version
# - pod install --project-directory=Example
- pod install --project-directory=Example
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
- pod lib lint
11 changes: 1 addition & 10 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,21 +1,12 @@
use_frameworks!
inhibit_all_warnings!

target 'Reqres_Example' do
pod 'Reqres', :path => '../'
pod 'Alamofire'

target 'Reqres_Tests' do
inherit! :search_paths

pod 'Quick', '~> 0.10'
pod 'Nimble', '~> 5.0'
end
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '3.0'
end
end
end
14 changes: 4 additions & 10 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,13 +1,9 @@
PODS:
- Alamofire (4.0.1)
- Nimble (5.0.0)
- Quick (0.10.0)
- Reqres (1.2.0)
- Reqres (2.1)

DEPENDENCIES:
- Alamofire
- Nimble (~> 5.0)
- Quick (~> 0.10)
- Reqres (from `../`)

EXTERNAL SOURCES:
Expand All @@ -16,10 +12,8 @@ EXTERNAL SOURCES:

SPEC CHECKSUMS:
Alamofire: 7682d43245de14874acd142ec137b144aa1dd335
Nimble: 56fc9f5020effa2206de22c3dd910f4fb011b92f
Quick: 5d290df1c69d5ee2f0729956dcf0fd9a30447eaa
Reqres: 1f2b4310bbdbb8b4bf72d8ad4e35b58aee6a2181
Reqres: d1a133f7279ac79d2d63280b61f09d2435523623

PODFILE CHECKSUM: 9d807594251db4fbaf40232aaa50dd502a0b95a2
PODFILE CHECKSUM: 18cd2941943b3c32aee6180a8306721f67439143

COCOAPODS: 1.1.0.rc.2
COCOAPODS: 1.3.1
19 changes: 0 additions & 19 deletions Example/Pods/Alamofire/LICENSE

This file was deleted.

Loading

0 comments on commit b599782

Please sign in to comment.