Skip to content

Commit

Permalink
Swift 5 upgrade
Browse files Browse the repository at this point in the history
  • Loading branch information
Stefan Renne committed Apr 5, 2019
1 parent b6793d0 commit 087c704
Show file tree
Hide file tree
Showing 15 changed files with 259 additions and 198 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.2
5.0
63 changes: 39 additions & 24 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,31 +1,46 @@
language: objective-c
os: osx
osx_image: xcode10.1
osx_image: xcode10.2
cache: cocoapods
env:
global:
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- WORKSPACE=RxSonosLib.xcworkspace
- SCHEME=RxSonosLib
- CC_TEST_REPORTER_ID=5332094259e2b828a20d61a227b30295e535380c07b6ab5f097b59e80b9c9c73
- LC_CTYPE=en_US.UTF-8
- LANG=en_US.UTF-8
- WORKSPACE=RxSonosLib.xcworkspace
- SCHEME=RxSonosLib
- CC_TEST_REPORTER_ID=5332094259e2b828a20d61a227b30295e535380c07b6ab5f097b59e80b9c9c73
- EXPANDED_CODE_SIGN_IDENTITY=""
- EXPANDED_CODE_SIGN_IDENTITY_NAME=""
- EXPANDED_PROVISIONING_PROFILE=""
matrix:
- DESTINATION="platform=iOS Simulator,name=iPhone XS"
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-darwin-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
before_install:
- gem install activesupport -N
- gem install slather --no-rdoc
- pod repo update > /dev/null
script:
- ./Pods/SwiftLint/swiftlint
- set -o pipefail
- xcodebuild -version
- xcodebuild -showsdks
- xcodebuild clean -workspace "$WORKSPACE" -scheme "$SCHEME" | xcpretty
- xcodebuild test -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" | xcpretty
after_script:
- slather
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT

install:
- git config --add diff.renamelimit 0
- pod install --repo-update

jobs:
include:
- stage: test
before_script:
- curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-darwin-amd64 > ./cc-test-reporter
- chmod +x ./cc-test-reporter
- ./cc-test-reporter before-build
before_install:
- gem install activesupport -N
- gem install slather --no-rdoc
- pod repo update > /dev/null
script:
- ./Pods/SwiftLint/swiftlint
- set -o pipefail
- xcodebuild -version
- xcodebuild -showsdks
- xcodebuild clean -workspace "$WORKSPACE" -scheme "$SCHEME" | xcpretty
- xcodebuild test -workspace "$WORKSPACE" -scheme "$SCHEME" -destination "$DESTINATION" | xcpretty
after_script:
- slather
- ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT
- stage: deploy
if: tag IS present
script:
- pod trunk push --allow-warnings
12 changes: 12 additions & 0 deletions Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -29,3 +29,15 @@ target 'iOS Demo App' do
pod 'RxSwift', '~> 4.5'
pod 'RxCocoa', '~> 4.5'
end

# Disable Code Coverage for Pods projects
# Disable Dsym Generation in Mock Config for faster test build
post_install do |installer_representation|
installer_representation.pods_project.targets.each do |target|
if ["Mockingjay", "URITemplate"].include? target.name
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = "4.2"
end
end
end
end
6 changes: 3 additions & 3 deletions Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ PODS:
- AEXML (~> 4.4)
- RxSSDP (~> 5.0)
- RxSwift (~> 4.5)
- RxSSDP (5.0.1):
- RxSSDP (5.0.2):
- RxSwift (~> 4.5)
- RxSwift (4.5.0)
- SwiftLint (0.31.0)
Expand Down Expand Up @@ -52,11 +52,11 @@ SPEC CHECKSUMS:
RxBlocking: 79413e4d916f44bb3e113c5b2cc059e36fe58910
RxCocoa: cbf70265dc65a981d4ac982e513c10cf23df24a0
RxSonosLib: 1288458844f30a1bd06f4f055a51612ceff9bfc6
RxSSDP: f4b5cdfd3a169cb38066557e25aed0f64f6e0325
RxSSDP: 662ce91a7ca8b340faf40f04590d608ac62b40df
RxSwift: f172070dfd1a93d70a9ab97a5a01166206e1c575
SwiftLint: 7a0227733d786395817373b2d0ca799fd0093ff3
URITemplate: ace0c4c46dcf8afe6e89b4060621852886b15c3b

PODFILE CHECKSUM: 953e36f0e7ce4b314389b1ec36425ae2362c4327
PODFILE CHECKSUM: 263e89d852a9bcf86ac51c47f5194375e66d32a9

COCOAPODS: 1.5.3
6 changes: 3 additions & 3 deletions Pods/Manifest.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 087c704

Please sign in to comment.