Skip to content

Commit

Permalink
Updated RxSwift version and travis to use Xcode 11.6 (#376)
Browse files Browse the repository at this point in the history
* Updated travis to use Xcode 11.6 and iPhone simulator 13.6

* Removed `brew update` from the travis configuration

* Updated RxSwift version

* Added carthage caching
  • Loading branch information
minixT authored Aug 24, 2020
1 parent 0ded736 commit dd41d3a
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
12 changes: 7 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
language: objective-c
osx_image: xcode10.2
language: swift
osx_image: xcode11.6
xcode_project: RxBluetoothKit.xcodeproj
xcode_sdk: iphonesimulator12.2
xcode_sdk: iphonesimulator13.6
env:
matrix:
- TARGET=iOS
Expand All @@ -10,12 +10,14 @@ env:
- TARGET=watchOS
global:
secure: qLf5ZVbFqKsIL2Vcnmo18U6hPoSDFtc2ZuFJLQS6ge0tP+1JfprBlKuwVRYsPXSDsRxeUZFPkcGOaiHpxfX+kt3TBXLZrYRvSXN/R8HWkaAd3hGoT89mW3Mj/It2pwadpALVN1rLJL4tuNW0deVjeTcbrWG+g38nK4JfWq18Z6DSmW6sSWKBFnlZCfnnTWqYZU2iqKP9gsQG+N3Ee4bc0za/MhMJzXkU7U7wvuXQWRp4kc5BLLyvFtWLbs1buWWjlwCODQATUHBhgAv9PRbPJ/+ZjFUkFu4w5NSCDEaYofvMqRpVJgkAsr/s/YdRZMOHUxxSGZZDOTAnSlnTOG/HHzOq9LFiZGbCxP+hh2d/hfaETNP8qbJLFkzapGzTxNxnf+mqZqs6DSL49e8KcwiWdC62VWOE4Ea3GeCUFZ/Yqmew2YYEx53Hc/p+sEcR6znFzbhDCyERyMDoG9p/T8cffdrOdhZYT1+1ee1Dxv5CTuzEoSziX2X+nyZna2dI7SG4r5ZNAmYoA9LTT6URxEiXRz4EZEA7Sewx4G4VeYzFeXj+B8fZjrmfNPuAOVWdBRae5AKC6TlZmtsqsSBce67uTypBl9XQ2nGPvj7+WDuW52J7lYrK6m9UVK1UEEpweMK34E5uyAss7iaEAjPN9Pg9aEBtf4D34wjavpHFX0Qd0l4=
cache:
directories:
- Carthage
before_install:
- brew update
- brew outdated carthage || brew upgrade carthage
- brew list gnu-sed || brew install gnu-sed
before_script:
- travis_retry carthage bootstrap --platform "${TARGET}"
- travis_retry carthage bootstrap --no-use-binaries --platform "${TARGET}" --cache-builds
script:
- ./scripts/all-build.sh "${TARGET}"
- ./scripts/all-tests.sh "${TARGET}"
Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 5.0
github "ReactiveX/RxSwift" ~> 5.1
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "5.0.1"
github "ReactiveX/RxSwift" "5.1.1"
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let package = Package(
.library(name: "RxBluetoothKit", targets: ["RxBluetoothKit"])
],
dependencies: [
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.0.0"))
.package(url: "https://github.com/ReactiveX/RxSwift.git", .upToNextMajor(from: "5.1.1"))
],
targets: [
.target(
Expand Down
2 changes: 1 addition & 1 deletion RxBluetoothKit.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ Pod::Spec.new do |s|
s.source_files = 'Source/*.swift'
s.osx.exclude_files = 'Source/RestoredState.swift', 'Source/CentralManager+RestoredState.swift', 'Source/CentralManagerRestoredState.swift'
s.frameworks = 'CoreBluetooth'
s.dependency 'RxSwift', '~> 5.0'
s.dependency 'RxSwift', '~> 5.1'
end
2 changes: 1 addition & 1 deletion RxBluetoothKit.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi";
shellScript = "if which swiftlint >/dev/null; then\nswiftlint\nelse\necho \"warning: SwiftLint not installed, download from https://github.com/realm/SwiftLint\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */

Expand Down

0 comments on commit dd41d3a

Please sign in to comment.