Skip to content

Commit

Permalink
Swift 4.2 and Xcode 10 support (#38)
Browse files Browse the repository at this point in the history
* Update Pods

* Update Carthage

* Update to Swift 4.2

* Update podspec

* Update podspec on example

* Update circleci config

* Disable code sign for tests

* Run and cache CocoaPods on CI

* Remove unnecessary “sdk”

* Save Xcode logs and test results

* Clean before build

* Remove unnecessary Pods file cache

* Move pipefail to shell definition

* Remove pod install from CI

* Temporary disable cache

* Update artefacts path

* Ignore just Carthage in root

* Reenable cache

* Update readme
  • Loading branch information
diogot authored and freak4pc committed Oct 17, 2018
1 parent f0b6868 commit 04ac5c1
Show file tree
Hide file tree
Showing 222 changed files with 4,203 additions and 3,299 deletions.
15 changes: 9 additions & 6 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,21 @@ jobs:
build:
working_directory: ~/RxSwiftCommunity/RxMKMapView
parallelism: 1
shell: /bin/bash --login
shell: /bin/bash --login -o pipefail
environment:
LANG: en_US.UTF-8
macos:
xcode: '9.4.0'
xcode: '10.0.0'
steps:
- checkout
- restore_cache:
keys:
- v1-dep-{{ .Branch }}-
- v1-dep-master-
- v1-dep-
- run:
name: Create artifacts paths
command: mkdir -p /tmp/test-results /tmp/xcode-test-artifacts
- run:
name: Bootstrap Carthage
command: scripts/bootstrap-if-needed.sh
Expand All @@ -24,11 +27,11 @@ jobs:
- Carthage
- run:
name: Run Tests
command: set -o pipefail && xcodebuild -workspace 'Example/RxMKMapView.xcworkspace' -scheme 'RxMKMapView-Example' -configuration 'Debug' -destination 'platform=iOS Simulator,name=iPhone 8' -sdk iphonesimulator build test | xcpretty -c --test
command: xcodebuild -workspace 'Example/RxMKMapView.xcworkspace' -scheme 'RxMKMapView-Example' -configuration 'Debug' CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= PROVISIONING_PROFILE= -destination 'platform=iOS Simulator,name=iPhone 8' clean build test | tee '/tmp/xcode-test-artifacts/tests.log' | xcpretty --color --no-utf -r junit -o '/tmp/test-results/test.xml'
- run:
name: Build Framework Workspace
command: set -o pipefail && xcodebuild -workspace 'RxMKMapView.xcworkspace' -scheme 'RxMKMapView' -configuration 'Debug' -destination 'platform=iOS Simulator,name=iPhone 8' -sdk iphonesimulator build | xcpretty -c
command: xcodebuild -workspace 'RxMKMapView.xcworkspace' -scheme 'RxMKMapView' -configuration 'Debug' CODE_SIGNING_REQUIRED=NO CODE_SIGN_IDENTITY= PROVISIONING_PROFILE= -destination 'platform=iOS Simulator,name=iPhone 8' clean build | tee '/tmp/xcode-test-artifacts/build.log' | xcpretty -c
- store_test_results:
path: test-results
path: /tmp/test-results
- store_artifacts:
path: /tmp/xcode-test-artifcats
path: /tmp/xcode-test-artifacts
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ DerivedData
# Bundler
.bundle

Carthage
Carthage/**
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 4.0
github "ReactiveX/RxSwift" ~> 4.3.1
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "4.2.0"
github "ReactiveX/RxSwift" "4.3.1"
8 changes: 8 additions & 0 deletions Example/Podfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
platform :"ios", "8.0"
source 'https://github.com/CocoaPods/Specs.git'
use_frameworks!
inhibit_all_warnings!

target 'RxMKMapView_Example' do
pod "RxMKMapView", :path => "../"
Expand All @@ -14,3 +15,10 @@ target 'RxMKMapView_Tests' do
pod 'Nimble'
end

post_install do |installer|
installer.pods_project.targets.each do |target|
target.build_configurations.each do |config|
config.build_settings['SWIFT_VERSION'] = '4.2'
end
end
end
26 changes: 13 additions & 13 deletions Example/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
PODS:
- Nimble (7.0.2)
- Quick (1.2.0)
- RxCocoa (4.0.0):
- Nimble (7.3.1)
- Quick (1.3.2)
- RxCocoa (4.3.1):
- RxSwift (~> 4.0)
- RxMKMapView (4.1.0):
- RxCocoa (~> 4.0)
- RxSwift (~> 4.0)
- RxSwift (4.0.0)
- RxMKMapView (4.3.0):
- RxCocoa (~> 4.3)
- RxSwift (~> 4.3)
- RxSwift (4.3.1)

DEPENDENCIES:
- Nimble
Expand All @@ -25,12 +25,12 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
RxCocoa: d62846ca96495d862fa4c59ea7d87e5031d7340e
RxMKMapView: 49f09ef2310493e99d1ce45b0f7e52104c66f3ec
RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
Nimble: 04f732da099ea4d153122aec8c2a88fd0c7219ae
Quick: 2623cb30d7a7f41ca62f684f679586558f483d46
RxCocoa: 78763c7b07d02455598d9fc3c1ad091a28b73635
RxMKMapView: f70f2837e201ce9598960dae8e415d3e2023305e
RxSwift: fe0fd770a43acdb7d0a53da411c9b892e69bb6e4

PODFILE CHECKSUM: dcb7c4a2c562542c61937b0ec0c905b668797963
PODFILE CHECKSUM: 71ce9fa2b867d95f8b9aca3810e348d809d86709

COCOAPODS: 1.5.3
9 changes: 4 additions & 5 deletions Example/Pods/Local Podspecs/RxMKMapView.podspec.json

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

26 changes: 13 additions & 13 deletions Example/Pods/Manifest.lock

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

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

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

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

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

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

Loading

0 comments on commit 04ac5c1

Please sign in to comment.