Skip to content

Commit 935879c

Browse files
authored
Support Swift 4 (#60)
* 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
1 parent 7232426 commit 935879c

File tree

11 files changed

+23
-23
lines changed

11 files changed

+23
-23
lines changed

.ruby-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruby-2.3.1
1+
ruby-2.4.1

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode8.3
2+
osx_image: xcode9
33
rvm:
44
- "2.4.1"
55

Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" ~> 3.4
1+
github "ReactiveX/RxSwift" ~> 4.0

Cartfile.resolved

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
github "ReactiveX/RxSwift" "3.5.0"
1+
github "ReactiveX/RxSwift" "4.0.0"

Carthage/Checkouts/RxSwift

Submodule RxSwift updated 412 files

Demo/.swift-version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
3.0
1+
4.0

Demo/Podfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ def library
1414
end
1515

1616
target 'Demo' do
17-
platform :ios, '8.0'
17+
platform :ios, '9.0'
1818
library
1919

2020
target 'RxViewModelTests-iOS' do
21-
platform :ios, '8.0'
21+
platform :ios, '9.0'
2222
inherit! :search_paths
2323

2424
test_pods
@@ -37,4 +37,4 @@ target 'RxViewModelTests-macOS' do
3737
library
3838

3939
test_pods
40-
end
40+
end

Demo/Podfile.lock

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PODS:
2-
- Nimble (7.0.1)
3-
- Quick (1.1.0)
4-
- RxSwift (3.5.0)
5-
- RxViewModel (4.0.0):
6-
- RxSwift (~> 3.5.0)
2+
- Nimble (7.0.2)
3+
- Quick (1.2.0)
4+
- RxSwift (4.0.0)
5+
- RxViewModel (5.1.0):
6+
- RxSwift (~> 4.0)
77

88
DEPENDENCIES:
99
- Nimble
@@ -15,11 +15,11 @@ EXTERNAL SOURCES:
1515
:path: "../"
1616

1717
SPEC CHECKSUMS:
18-
Nimble: 657d000e11df8aebe27cdaf9d244de7f30ed87f7
19-
Quick: dafc587e21eed9f4cab3249b9f9015b0b7a7f71d
20-
RxSwift: 18ee9d78b45edb3b0b7e79916b47a116e6dbc842
21-
RxViewModel: f9dbd276b3bdc9858cf8ef7cf032fe199ddb27f6
18+
Nimble: bfe1f814edabba69ff145cb1283e04ed636a67f2
19+
Quick: 58d203b1c5e27fff7229c4c1ae445ad7069a7a08
20+
RxSwift: fd680d75283beb5e2559486f3c0ff852f0d35334
21+
RxViewModel: 4fda1b24076c00dee8993015e12bce17091b8fb7
2222

23-
PODFILE CHECKSUM: 5b740ff0f8e82b1a56bee6decd0acad5bd6013b9
23+
PODFILE CHECKSUM: f3dc2ef276e60482f87b2abfca65a634f6640961
2424

2525
COCOAPODS: 1.2.1

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ def sdks
2626
return {
2727
ios: 'iphonesimulator',
2828
macos: 'macosx',
29-
tvos: 'appletvsimulator10.2'
29+
tvos: 'appletvsimulator11.0'
3030
}
3131
end
3232

RxViewModel.podspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

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

2727
s.source_files = 'Source/*.swift', 'Source/Categories/*.swift'
28-
s.dependency 'RxSwift', '~> 3.5'
28+
s.dependency 'RxSwift', '~> 4.0'
2929
s.frameworks = 'Foundation'
3030
end

Source/RxViewModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ open class RxViewModel: NSObject {
2828
private dynamic var _active: Bool = false
2929

3030
/// Public «active» variable
31-
public dynamic var active: Bool {
31+
@objc public dynamic var active: Bool {
3232
get { return _active }
3333
set {
3434
// Skip KVO notifications when the property hasn't actually changed. This is

0 commit comments

Comments
 (0)