Skip to content

Commit

Permalink
Support Swift 4 (#60)
Browse files Browse the repository at this point in the history
* Bumped ruby version => 2.4.0

* ⬆ Bumped to support Swift 4

* Mark active property @objc

* Changes Xcode to 9

* Fixes tvOS tests to latest SDK
  • Loading branch information
esttorhe authored Oct 27, 2017
1 parent 7232426 commit 935879c
Show file tree
Hide file tree
Showing 11 changed files with 23 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .ruby-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruby-2.3.1
ruby-2.4.1
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode8.3
osx_image: xcode9
rvm:
- "2.4.1"

Expand Down
2 changes: 1 addition & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" ~> 3.4
github "ReactiveX/RxSwift" ~> 4.0
2 changes: 1 addition & 1 deletion Cartfile.resolved
Original file line number Diff line number Diff line change
@@ -1 +1 @@
github "ReactiveX/RxSwift" "3.5.0"
github "ReactiveX/RxSwift" "4.0.0"
2 changes: 1 addition & 1 deletion Carthage/Checkouts/RxSwift
Submodule RxSwift updated 412 files
2 changes: 1 addition & 1 deletion Demo/.swift-version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0
4.0
6 changes: 3 additions & 3 deletions Demo/Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@ def library
end

target 'Demo' do
platform :ios, '8.0'
platform :ios, '9.0'
library

target 'RxViewModelTests-iOS' do
platform :ios, '8.0'
platform :ios, '9.0'
inherit! :search_paths

test_pods
Expand All @@ -37,4 +37,4 @@ target 'RxViewModelTests-macOS' do
library

test_pods
end
end
20 changes: 10 additions & 10 deletions Demo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
PODS:
- Nimble (7.0.1)
- Quick (1.1.0)
- RxSwift (3.5.0)
- RxViewModel (4.0.0):
- RxSwift (~> 3.5.0)
- Nimble (7.0.2)
- Quick (1.2.0)
- RxSwift (4.0.0)
- RxViewModel (5.1.0):
- RxSwift (~> 4.0)

DEPENDENCIES:
- Nimble
Expand All @@ -15,11 +15,11 @@ EXTERNAL SOURCES:
:path: "../"

SPEC CHECKSUMS:
Nimble: 657d000e11df8aebe27cdaf9d244de7f30ed87f7
Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d
RxSwift: 18ee9d78b45edb3b0b7e79916b47a116e6dbc842
RxViewModel: f9dbd276b3bdc9858cf8ef7cf032fe199ddb27f6
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
RxViewModel: 4fda1b24076c00dee8993015e12bce17091b8fb7

PODFILE CHECKSUM: 5b740ff0f8e82b1a56bee6decd0acad5bd6013b9
PODFILE CHECKSUM: f3dc2ef276e60482f87b2abfca65a634f6640961

COCOAPODS: 1.2.1
2 changes: 1 addition & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def sdks
return {
ios: 'iphonesimulator',
macos: 'macosx',
tvos: 'appletvsimulator10.2'
tvos: 'appletvsimulator11.0'
}
end

Expand Down
4 changes: 2 additions & 2 deletions RxViewModel.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Pod::Spec.new do |s|
s.name = "RxViewModel"
s.version = "5.0.1"
s.version = "5.1.0"
s.summary = "`RxViewModel` is the marriage between `MVVM` and `Rx` extensions. A blatant «imitation» of `ReactiveViewModel` using `RxCocoa`."
s.description = <<-DESC
`RxViewModel` is the marriage between `MVVM` and `Rx` extensions
Expand All @@ -25,6 +25,6 @@ Long story short: a blatant «imitation» of `ReactiveViewModel `using `RxCocoa`
s.requires_arc = true

s.source_files = 'Source/*.swift', 'Source/Categories/*.swift'
s.dependency 'RxSwift', '~> 3.5'
s.dependency 'RxSwift', '~> 4.0'
s.frameworks = 'Foundation'
end
2 changes: 1 addition & 1 deletion Source/RxViewModel.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ open class RxViewModel: NSObject {
private dynamic var _active: Bool = false

/// Public «active» variable
public dynamic var active: Bool {
@objc public dynamic var active: Bool {
get { return _active }
set {
// Skip KVO notifications when the property hasn't actually changed. This is
Expand Down

0 comments on commit 935879c

Please sign in to comment.