Skip to content

Commit

Permalink
Merge pull request #3 from murselturk/master
Browse files Browse the repository at this point in the history
Swift 4.2
  • Loading branch information
devxoul committed Sep 27, 2018
2 parents 3e4c053 + 412a583 commit 8db06f5
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion .swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
4.0
4.2
16 changes: 8 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
osx_image: xcode9
osx_image: xcode10
language: objective-c
sudo: required
env:
global:
- PROJECT="RxCodable.xcodeproj"
- SCHEME="RxCodable-Package"
- IOS_SDK="iphonesimulator11.0"
- MACOS_SDK="macosx10.13"
- TVOS_SDK="appletvsimulator11.0"
- WATCHOS_SDK="watchsimulator4.0"
- IOS_SDK="iphonesimulator12.0"
- MACOS_SDK="macosx10.14"
- TVOS_SDK="appletvsimulator12.0"
- WATCHOS_SDK="watchsimulator5.0"
- FRAMEWORK="RxCodable"
matrix:
- SDK="$IOS_SDK" TEST=1 DESTINATION="platform=iOS Simulator,name=iPhone 8,OS=11.0"
- SDK="$IOS_SDK" TEST=1 DESTINATION="platform=iOS Simulator,name=iPhone XS,OS=12.0"
- SDK="$MACOS_SDK" TEST=1 DESTINATION="arch=x86_64"
- SDK="$TVOS_SDK" TEST=1 DESTINATION="OS=11.0,name=Apple TV 1080p"
- SDK="$WATCHOS_SDK" TEST=0 DESTINATION="OS=4.0,name=Apple Watch - 38mm"
- SDK="$TVOS_SDK" TEST=1 DESTINATION="OS=12.0,name=Apple TV 4K"
- SDK="$WATCHOS_SDK" TEST=0 DESTINATION="OS=5.0,name=Apple Watch Series 3 - 42mm"

install:
- eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
Expand Down
4 changes: 2 additions & 2 deletions Package.resolved
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
"state": {
"branch": null,
"revision": "61261f2ee97ace3e08713921dd9406669b9debee",
"version": "4.0.0-rc.0"
"revision": "0df62b4d562f8620d4b795b18e4adf0b631527a1",
"version": "4.3.1"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// swift-tools-version:4.0
// swift-tools-version:4.2

import PackageDescription

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# RxCodable

![Swift](https://img.shields.io/badge/Swift-4.0-orange.svg)
![Swift](https://img.shields.io/badge/Swift-4.2-orange.svg)
[![CocoaPods](http://img.shields.io/cocoapods/v/RxCodable.svg)](https://cocoapods.org/pods/RxCodable)
[![Build Status](https://travis-ci.org/devxoul/RxCodable.svg?branch=master)](https://travis-ci.org/devxoul/RxCodable)
[![codecov](https://img.shields.io/codecov/c/github/devxoul/RxCodable.svg)](https://codecov.io/gh/devxoul/RxCodable)
Expand All @@ -27,7 +27,7 @@ Maybe<String>.just(jsonString).map(User.self)

## Dependencies

* [RxSwift](https://github.com/ReactiveX/RxSwift) >= 4.0.0-beta.0
* [RxSwift](https://github.com/ReactiveX/RxSwift) >= 4.0

## Installation

Expand Down
2 changes: 1 addition & 1 deletion RxCodable.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ Pod::Spec.new do |s|
s.subspec "Core" do |ss|
ss.source_files = "Sources/RxCodable/**/*.swift"
ss.frameworks = "Foundation"
ss.dependency "RxSwift", ">= 4.0.0-beta.0"
ss.dependency "RxSwift", ">= 4.0"
end
end

0 comments on commit 8db06f5

Please sign in to comment.