Skip to content

Commit 32cdef4

Browse files
icanzilbicanzilb
authored
Merge pull request #93 from RxSwiftCommunity/mt/swift4.0
swift4.0
2 parents 5aadf22 + bef0561 commit 32cdef4

16 files changed

+94
-96
lines changed

‎.swift-version

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
3.0
1+
4.0
22

‎Example/Podfile

+11-9
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,21 @@ source 'https://github.com/CocoaPods/Specs.git'
22

33
use_frameworks!
44

5+
def common
6+
pod 'RxSwift', '~> 4.0'
7+
pod 'RxCocoa', '~> 4.0'
8+
pod 'RealmSwift', '~> 3.0'
9+
end
10+
511
target 'RxRealm_Example' do
6-
platform :ios, '8.0'
12+
platform :ios, '9.0'
13+
common
714
pod 'RxRealm', :path => '../'
8-
pod 'RxSwift', '~> 3'
9-
pod 'RxCocoa', '~> 3'
10-
pod 'RealmSwift', '~> 2'
1115
end
1216

1317
target 'RxRealm_Tests' do
14-
platform :ios, '8.0'
15-
pod 'RxSwift', '~> 3'
16-
pod 'RxCocoa', '~> 3'
17-
pod 'RxTest', '~> 3'
18-
pod 'RealmSwift', '~> 2'
18+
platform :ios, '9.0'
19+
common
20+
pod 'RxTest', '~> 4.0'
1921
pod 'RxRealm', :path => '../'
2022
end

‎Example/RxRealm.xcodeproj/project.pbxproj

+27-9
Original file line numberDiff line numberDiff line change
@@ -224,18 +224,18 @@
224224
isa = PBXProject;
225225
attributes = {
226226
LastSwiftUpdateCheck = 0730;
227-
LastUpgradeCheck = 0810;
227+
LastUpgradeCheck = 0900;
228228
ORGANIZATIONNAME = CocoaPods;
229229
TargetAttributes = {
230230
607FACCF1AFB9204008FA782 = {
231231
CreatedOnToolsVersion = 6.3.1;
232232
DevelopmentTeam = 9MF8G8D9Y5;
233-
LastSwiftMigration = 0800;
233+
LastSwiftMigration = 0900;
234234
};
235235
9CEB7A461CC834340077C44D = {
236236
CreatedOnToolsVersion = 7.3;
237237
DevelopmentTeam = 9MF8G8D9Y5;
238-
LastSwiftMigration = 0800;
238+
LastSwiftMigration = 0900;
239239
};
240240
};
241241
};
@@ -464,14 +464,20 @@
464464
CLANG_CXX_LIBRARY = "libc++";
465465
CLANG_ENABLE_MODULES = YES;
466466
CLANG_ENABLE_OBJC_ARC = YES;
467+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
467468
CLANG_WARN_BOOL_CONVERSION = YES;
469+
CLANG_WARN_COMMA = YES;
468470
CLANG_WARN_CONSTANT_CONVERSION = YES;
469471
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
470472
CLANG_WARN_EMPTY_BODY = YES;
471473
CLANG_WARN_ENUM_CONVERSION = YES;
472474
CLANG_WARN_INFINITE_RECURSION = YES;
473475
CLANG_WARN_INT_CONVERSION = YES;
476+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
477+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
474478
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
479+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
480+
CLANG_WARN_STRICT_PROTOTYPES = YES;
475481
CLANG_WARN_SUSPICIOUS_MOVE = YES;
476482
CLANG_WARN_UNREACHABLE_CODE = YES;
477483
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -495,7 +501,7 @@
495501
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
496502
GCC_WARN_UNUSED_FUNCTION = YES;
497503
GCC_WARN_UNUSED_VARIABLE = YES;
498-
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
504+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
499505
MTL_ENABLE_DEBUG_INFO = YES;
500506
ONLY_ACTIVE_ARCH = YES;
501507
SDKROOT = iphoneos;
@@ -511,14 +517,20 @@
511517
CLANG_CXX_LIBRARY = "libc++";
512518
CLANG_ENABLE_MODULES = YES;
513519
CLANG_ENABLE_OBJC_ARC = YES;
520+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
514521
CLANG_WARN_BOOL_CONVERSION = YES;
522+
CLANG_WARN_COMMA = YES;
515523
CLANG_WARN_CONSTANT_CONVERSION = YES;
516524
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
517525
CLANG_WARN_EMPTY_BODY = YES;
518526
CLANG_WARN_ENUM_CONVERSION = YES;
519527
CLANG_WARN_INFINITE_RECURSION = YES;
520528
CLANG_WARN_INT_CONVERSION = YES;
529+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
530+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
521531
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
532+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
533+
CLANG_WARN_STRICT_PROTOTYPES = YES;
522534
CLANG_WARN_SUSPICIOUS_MOVE = YES;
523535
CLANG_WARN_UNREACHABLE_CODE = YES;
524536
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -535,7 +547,7 @@
535547
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
536548
GCC_WARN_UNUSED_FUNCTION = YES;
537549
GCC_WARN_UNUSED_VARIABLE = YES;
538-
IPHONEOS_DEPLOYMENT_TARGET = 8.3;
550+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
539551
MTL_ENABLE_DEBUG_INFO = NO;
540552
SDKROOT = iphoneos;
541553
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
@@ -560,11 +572,13 @@
560572
"$PODS_CONFIGURATION_BUILD_DIR",
561573
);
562574
INFOPLIST_FILE = RxRealm/Info.plist;
575+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
563576
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
564577
MODULE_NAME = ExampleApp;
565578
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
566579
PRODUCT_NAME = "$(TARGET_NAME)";
567-
SWIFT_VERSION = 3.0;
580+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
581+
SWIFT_VERSION = 4.0;
568582
};
569583
name = Debug;
570584
};
@@ -585,11 +599,13 @@
585599
"$PODS_CONFIGURATION_BUILD_DIR",
586600
);
587601
INFOPLIST_FILE = RxRealm/Info.plist;
602+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
588603
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
589604
MODULE_NAME = ExampleApp;
590605
PRODUCT_BUNDLE_IDENTIFIER = "org.cocoapods.demo.$(PRODUCT_NAME:rfc1034identifier)";
591606
PRODUCT_NAME = "$(TARGET_NAME)";
592-
SWIFT_VERSION = 3.0;
607+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
608+
SWIFT_VERSION = 4.0;
593609
};
594610
name = Release;
595611
};
@@ -606,7 +622,8 @@
606622
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
607623
PRODUCT_BUNDLE_IDENTIFIER = "com.rxswiftcommunity.RxRealm-Tests";
608624
PRODUCT_NAME = "$(TARGET_NAME)";
609-
SWIFT_VERSION = 3.0;
625+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
626+
SWIFT_VERSION = 4.0;
610627
};
611628
name = Debug;
612629
};
@@ -622,7 +639,8 @@
622639
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
623640
PRODUCT_BUNDLE_IDENTIFIER = "com.rxswiftcommunity.RxRealm-Tests";
624641
PRODUCT_NAME = "$(TARGET_NAME)";
625-
SWIFT_VERSION = 3.0;
642+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
643+
SWIFT_VERSION = 4.0;
626644
};
627645
name = Release;
628646
};

‎Example/RxRealm.xcodeproj/xcshareddata/xcschemes/RxRealm-Example.xcscheme

+3-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -40,6 +40,7 @@
4040
buildConfiguration = "Debug"
4141
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4242
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
43+
language = ""
4344
shouldUseLaunchSchemeArgsEnv = "YES"
4445
codeCoverageEnabled = "YES">
4546
<Testables>
@@ -70,6 +71,7 @@
7071
buildConfiguration = "Debug"
7172
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
7273
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
74+
language = ""
7375
launchStyle = "0"
7476
useCustomWorkingDirectory = "NO"
7577
ignoresPersistentStateOnLaunch = "NO"

‎Example/RxRealm/ViewController.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ import RxRealm
77

88
//realm model
99
class Lap: Object {
10-
dynamic var time: TimeInterval = Date().timeIntervalSinceReferenceDate
10+
@objc dynamic var time: TimeInterval = Date().timeIntervalSinceReferenceDate
1111
}
1212

1313
class TickCounter: Object {
14-
dynamic var id = UUID().uuidString
15-
dynamic var ticks: Int = 0
14+
@objc dynamic var id = UUID().uuidString
15+
@objc dynamic var ticks: Int = 0
1616
override static func primaryKey() -> String? { return "id" }
1717
}
1818

‎Example/RxRealm_Tests/RxRealmLinkingObjectsTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class RxRealmLinkingObjectsTests: XCTestCase {
4242
realm.add(message)
4343
}
4444

45-
let users$ = Observable.collection(from: message.mentions).shareReplay(1)
45+
let users$ = Observable.collection(from: message.mentions).share(replay: 1)
4646
users$.scan(0, accumulator: {acc, _ in return acc+1})
4747
.filter { $0 == 3 }.map {_ in ()}.subscribe(onNext: expectation1.fulfill).disposed(by: bag)
4848
users$
@@ -89,7 +89,7 @@ class RxRealmLinkingObjectsTests: XCTestCase {
8989
realm.add(message)
9090
}
9191

92-
let users$ = Observable.changeset(from: message.mentions).shareReplay(1)
92+
let users$ = Observable.changeset(from: message.mentions).share(replay: 1)
9393
users$.scan(0, accumulator: {acc, _ in return acc+1})
9494
.filter { $0 == 3 }.map {_ in ()}.subscribe(onNext: expectation1.fulfill).disposed(by: bag)
9595
users$

‎Example/RxRealm_Tests/RxRealmListTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class RxRealmListTests: XCTestCase {
4242
realm.add(message)
4343
}
4444

45-
let users$ = Observable.collection(from: message.recipients).shareReplay(1)
45+
let users$ = Observable.collection(from: message.recipients).share(replay: 1)
4646
users$.scan(0, accumulator: {acc, _ in return acc+1})
4747
.filter { $0 == 3 }.map {_ in ()}.subscribe(onNext: expectation1.fulfill).disposed(by: bag)
4848
users$
@@ -86,7 +86,7 @@ class RxRealmListTests: XCTestCase {
8686
realm.add(message)
8787
}
8888

89-
let users$ = Observable.changeset(from: message.recipients).shareReplay(1)
89+
let users$ = Observable.changeset(from: message.recipients).share(replay: 1)
9090
users$.scan(0, accumulator: {acc, _ in return acc+1})
9191
.filter { $0 == 3 }.map {_ in ()}.subscribe(onNext: expectation1.fulfill).disposed(by: bag)
9292
users$

‎Example/RxRealm_Tests/RxRealmObjectTests.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class RxRealmObjectTests: XCTestCase {
3737
realm.add(obj)
3838
}
3939

40-
let object$ = Observable<UniqueObject>.from(object: obj).shareReplay(1)
40+
let object$ = Observable<UniqueObject>.from(object: obj).share(replay: 1)
4141
object$.scan(0, accumulator: {acc, _ in return acc+1})
4242
.filter { $0 == 4 }.map {_ in ()}
4343
.subscribe(onNext: expectation1.fulfill, onError: {error in expectation1.fulfill()})
@@ -167,7 +167,7 @@ class RxRealmObjectTests: XCTestCase {
167167
realm.add(obj)
168168
}
169169

170-
let object$ = Observable<UniqueObject>.propertyChanges(object: obj).shareReplay(1)
170+
let object$ = Observable<UniqueObject>.propertyChanges(object: obj).share(replay: 1)
171171
object$.scan(0, accumulator: {acc, _ in return acc+1})
172172
.filter { $0 == 3 }.map {_ in ()}
173173
.subscribe(onNext: expectation1.fulfill, onError: {error in expectation1.fulfill()})
@@ -231,7 +231,7 @@ class RxRealmObjectTests: XCTestCase {
231231
}
232232

233233
let object$ = Observable<User>.from(object: obj, properties: ["name"])
234-
.shareReplay(1)
234+
.share(replay: 1)
235235

236236
object$.scan(0, accumulator: {acc, _ in return acc+1})
237237
.filter { $0 == 3 }.map {_ in ()}

‎Example/RxRealm_Tests/RxRealmRealmTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class RxRealmRealmTests: XCTestCase {
3030
typealias loggedNotification = (Realm, Realm.Notification)
3131
let observer = scheduler.createObserver(loggedNotification.self)
3232

33-
let realm$ = Observable<(Realm, Realm.Notification)>.from(realm: realm).shareReplay(1)
33+
let realm$ = Observable<(Realm, Realm.Notification)>.from(realm: realm).share(replay: 1)
3434
realm$.scan(0, accumulator: {acc, _ in return acc+1})
3535
.filter { $0 == 2 }.map {_ in ()}.subscribe(onNext: expectation1.fulfill).disposed(by: bag)
3636
realm$
@@ -71,7 +71,7 @@ class RxRealmRealmTests: XCTestCase {
7171
typealias loggedNotification = (Realm, Realm.Notification)
7272
let observer = scheduler.createObserver(loggedNotification.self)
7373

74-
let realm$ = Observable<(Realm, Realm.Notification)>.from(realm: realm).shareReplay(1)
74+
let realm$ = Observable<(Realm, Realm.Notification)>.from(realm: realm).share(replay: 1)
7575
realm$.scan(0, accumulator: {acc, _ in return acc+1})
7676
.filter { $0 == 1 }.map {_ in ()}.subscribe(onNext: expectation1.fulfill).disposed(by: bag)
7777
realm$

‎Example/RxRealm_Tests/RxRealmResultsTests.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class RxRealmResultsTests: XCTestCase {
3737
let scheduler = TestScheduler(initialClock: 0)
3838
let observer = scheduler.createObserver(Results<Message>.self)
3939

40-
let messages$ = Observable.collection(from: realm.objects(Message.self)).shareReplay(1)
40+
let messages$ = Observable.collection(from: realm.objects(Message.self)).share(replay: 1)
4141
messages$.scan(0, accumulator: {acc, _ in return acc+1})
4242
.filter { $0 == 4 }.map {_ in ()}.subscribe(onNext: expectation1.fulfill).disposed(by: bag)
4343
messages$
@@ -83,7 +83,7 @@ class RxRealmResultsTests: XCTestCase {
8383
let scheduler = TestScheduler(initialClock: 0)
8484
let observer = scheduler.createObserver(String.self)
8585

86-
let messages$ = Observable.changeset(from: realm.objects(Message.self)).shareReplay(1)
86+
let messages$ = Observable.changeset(from: realm.objects(Message.self)).share(replay: 1)
8787
messages$.scan(0, accumulator: {acc, _ in return acc+1})
8888
.filter { $0 == 3 }.map {_ in ()}.subscribe(onNext: expectation1.fulfill).disposed(by: bag)
8989
messages$

‎Example/RxRealm_Tests/RxRealmTests.swift

+4-4
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ class RxRealm_Tests: XCTestCase {
5050
let scheduler = TestScheduler(initialClock: 0)
5151
let observer = scheduler.createObserver(Results<Message>.self)
5252

53-
let messages$ = Observable.collection(from: realm.objects(Message.self)).shareReplay(1)
53+
let messages$ = Observable.collection(from: realm.objects(Message.self)).share(replay: 1)
5454
messages$.subscribe(onNext: {
5555
if $0.count == 2 {
5656
expectation1.fulfill()
@@ -86,7 +86,7 @@ class RxRealm_Tests: XCTestCase {
8686
let scheduler = TestScheduler(initialClock: 0)
8787
let observer = scheduler.createObserver(Array<Message>.self)
8888

89-
let messages$ = Observable.array(from: realm.objects(Message.self)).shareReplay(1)
89+
let messages$ = Observable.array(from: realm.objects(Message.self)).share(replay: 1)
9090
messages$.subscribe(onNext: {
9191
if $0.count == 2 {
9292
expectation1.fulfill()
@@ -124,7 +124,7 @@ class RxRealm_Tests: XCTestCase {
124124
//initial data
125125
addMessage(realm, text: "first(Changeset)")
126126

127-
let messages$ = Observable.changeset(from: realm.objects(Message.self)).shareReplay(1)
127+
let messages$ = Observable.changeset(from: realm.objects(Message.self)).share(replay: 1)
128128
messages$.scan(0) { count, _ in
129129
return count+1
130130
}
@@ -185,7 +185,7 @@ class RxRealm_Tests: XCTestCase {
185185
//initial data
186186
addMessage(realm, text: "first(ArrayChangeset)")
187187

188-
let messages$ = Observable.changeset(from: realm.objects(Message.self)).shareReplay(1)
188+
let messages$ = Observable.changeset(from: realm.objects(Message.self)).share(replay: 1)
189189
messages$.scan(0) { count, _ in
190190
return count+1
191191
}

0 commit comments

Comments
 (0)