Skip to content

Commit 889376f

Browse files
Econa77Econa77
authored
Support swift4 (#2)
* Update swift4 * Modify RxSwift4.0 delegate proxy style
1 parent 65e468c commit 889376f

File tree

14 files changed

+137
-66
lines changed

14 files changed

+137
-66
lines changed

‎.swift-version

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

‎Cartfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
github "Clipy/Screeen"
2-
github "ReactiveX/RxSwift"
2+
github "ReactiveX/RxSwift"

‎Cartfile.resolved

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
github "ReactiveX/RxSwift" "3.0.1"
2-
github "Clipy/Screeen" "v1.0.0"
1+
github "Clipy/Screeen" "v1.1.0"
2+
github "ReactiveX/RxSwift" "4.0.0"

‎Carthage/Checkouts/RxSwift

Submodule RxSwift updated 942 files

‎Carthage/Checkouts/Screeen

‎Example/Example.xcodeproj/project.pbxproj

Lines changed: 45 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,13 @@
1919
/* End PBXBuildFile section */
2020

2121
/* Begin PBXContainerItemProxy section */
22+
C5AAF4871F6CEE5300D3E009 /* PBXContainerItemProxy */ = {
23+
isa = PBXContainerItemProxy;
24+
containerPortal = FA6167431D3A27D40049FA14 /* Rx.xcodeproj */;
25+
proxyType = 2;
26+
remoteGlobalIDString = C8E8BA551E2C181A00A4AC2C;
27+
remoteInfo = Benchmarks;
28+
};
2229
FA6166D41D3A0BF70049FA14 /* PBXContainerItemProxy */ = {
2330
isa = PBXContainerItemProxy;
2431
containerPortal = FA6166CF1D3A0BF70049FA14 /* RxScreeen.xcodeproj */;
@@ -289,14 +296,15 @@
289296
FA61676D1D3A27D40049FA14 /* RxBlocking.framework */,
290297
FA61676F1D3A27D40049FA14 /* RxBlocking.framework */,
291298
FA6167711D3A27D40049FA14 /* RxBlocking.framework */,
292-
FA6167731D3A27D40049FA14 /* RxTests.framework */,
293-
FA6167751D3A27D40049FA14 /* RxTests.framework */,
294-
FA6167771D3A27D40049FA14 /* RxTests.framework */,
295-
FA6167791D3A27D40049FA14 /* RxTests.framework */,
299+
FA6167731D3A27D40049FA14 /* RxTest.framework */,
300+
FA6167751D3A27D40049FA14 /* RxTest.framework */,
301+
FA6167771D3A27D40049FA14 /* RxTest.framework */,
302+
FA6167791D3A27D40049FA14 /* RxTest.framework */,
296303
FA61677B1D3A27D40049FA14 /* AllTests-iOS.xctest */,
297304
FA61677D1D3A27D40049FA14 /* AllTests-tvOS.xctest */,
298-
FA61677F1D3A27D40049FA14 /* AllTests-OSX.xctest */,
305+
FA61677F1D3A27D40049FA14 /* AllTests-macOS.xctest */,
299306
FA6167811D3A27D40049FA14 /* PerformanceTests.app */,
307+
C5AAF4881F6CEE5300D3E009 /* Benchmarks.xctest */,
300308
);
301309
name = Products;
302310
sourceTree = "<group>";
@@ -332,7 +340,7 @@
332340
isa = PBXProject;
333341
attributes = {
334342
LastSwiftUpdateCheck = 0730;
335-
LastUpgradeCheck = 0800;
343+
LastUpgradeCheck = 0900;
336344
ORGANIZATIONNAME = "Shunsuke Furubayashi";
337345
TargetAttributes = {
338346
FA6166BE1D3A08680049FA14 = {
@@ -370,6 +378,13 @@
370378
/* End PBXProject section */
371379

372380
/* Begin PBXReferenceProxy section */
381+
C5AAF4881F6CEE5300D3E009 /* Benchmarks.xctest */ = {
382+
isa = PBXReferenceProxy;
383+
fileType = wrapper.cfbundle;
384+
path = Benchmarks.xctest;
385+
remoteRef = C5AAF4871F6CEE5300D3E009 /* PBXContainerItemProxy */;
386+
sourceTree = BUILT_PRODUCTS_DIR;
387+
};
373388
FA6166D51D3A0BF70049FA14 /* RxScreeen.framework */ = {
374389
isa = PBXReferenceProxy;
375390
fileType = wrapper.framework;
@@ -468,31 +483,31 @@
468483
remoteRef = FA6167701D3A27D40049FA14 /* PBXContainerItemProxy */;
469484
sourceTree = BUILT_PRODUCTS_DIR;
470485
};
471-
FA6167731D3A27D40049FA14 /* RxTests.framework */ = {
486+
FA6167731D3A27D40049FA14 /* RxTest.framework */ = {
472487
isa = PBXReferenceProxy;
473488
fileType = wrapper.framework;
474-
path = RxTests.framework;
489+
path = RxTest.framework;
475490
remoteRef = FA6167721D3A27D40049FA14 /* PBXContainerItemProxy */;
476491
sourceTree = BUILT_PRODUCTS_DIR;
477492
};
478-
FA6167751D3A27D40049FA14 /* RxTests.framework */ = {
493+
FA6167751D3A27D40049FA14 /* RxTest.framework */ = {
479494
isa = PBXReferenceProxy;
480495
fileType = wrapper.framework;
481-
path = RxTests.framework;
496+
path = RxTest.framework;
482497
remoteRef = FA6167741D3A27D40049FA14 /* PBXContainerItemProxy */;
483498
sourceTree = BUILT_PRODUCTS_DIR;
484499
};
485-
FA6167771D3A27D40049FA14 /* RxTests.framework */ = {
500+
FA6167771D3A27D40049FA14 /* RxTest.framework */ = {
486501
isa = PBXReferenceProxy;
487502
fileType = wrapper.framework;
488-
path = RxTests.framework;
503+
path = RxTest.framework;
489504
remoteRef = FA6167761D3A27D40049FA14 /* PBXContainerItemProxy */;
490505
sourceTree = BUILT_PRODUCTS_DIR;
491506
};
492-
FA6167791D3A27D40049FA14 /* RxTests.framework */ = {
507+
FA6167791D3A27D40049FA14 /* RxTest.framework */ = {
493508
isa = PBXReferenceProxy;
494509
fileType = wrapper.framework;
495-
path = RxTests.framework;
510+
path = RxTest.framework;
496511
remoteRef = FA6167781D3A27D40049FA14 /* PBXContainerItemProxy */;
497512
sourceTree = BUILT_PRODUCTS_DIR;
498513
};
@@ -510,17 +525,18 @@
510525
remoteRef = FA61677C1D3A27D40049FA14 /* PBXContainerItemProxy */;
511526
sourceTree = BUILT_PRODUCTS_DIR;
512527
};
513-
FA61677F1D3A27D40049FA14 /* AllTests-OSX.xctest */ = {
528+
FA61677F1D3A27D40049FA14 /* AllTests-macOS.xctest */ = {
514529
isa = PBXReferenceProxy;
515530
fileType = wrapper.cfbundle;
516-
path = "AllTests-OSX.xctest";
531+
path = "AllTests-macOS.xctest";
517532
remoteRef = FA61677E1D3A27D40049FA14 /* PBXContainerItemProxy */;
518533
sourceTree = BUILT_PRODUCTS_DIR;
519534
};
520535
FA6167811D3A27D40049FA14 /* PerformanceTests.app */ = {
521536
isa = PBXReferenceProxy;
522537
fileType = wrapper.application;
523-
path = PerformanceTests.app;
538+
name = PerformanceTests.app;
539+
path = Microoptimizations.app;
524540
remoteRef = FA6167801D3A27D40049FA14 /* PBXContainerItemProxy */;
525541
sourceTree = BUILT_PRODUCTS_DIR;
526542
};
@@ -588,14 +604,20 @@
588604
CLANG_CXX_LIBRARY = "libc++";
589605
CLANG_ENABLE_MODULES = YES;
590606
CLANG_ENABLE_OBJC_ARC = YES;
607+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
591608
CLANG_WARN_BOOL_CONVERSION = YES;
609+
CLANG_WARN_COMMA = YES;
592610
CLANG_WARN_CONSTANT_CONVERSION = YES;
593611
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
594612
CLANG_WARN_EMPTY_BODY = YES;
595613
CLANG_WARN_ENUM_CONVERSION = YES;
596614
CLANG_WARN_INFINITE_RECURSION = YES;
597615
CLANG_WARN_INT_CONVERSION = YES;
616+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
617+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
598618
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
619+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
620+
CLANG_WARN_STRICT_PROTOTYPES = YES;
599621
CLANG_WARN_SUSPICIOUS_MOVE = YES;
600622
CLANG_WARN_UNREACHABLE_CODE = YES;
601623
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -635,14 +657,20 @@
635657
CLANG_CXX_LIBRARY = "libc++";
636658
CLANG_ENABLE_MODULES = YES;
637659
CLANG_ENABLE_OBJC_ARC = YES;
660+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
638661
CLANG_WARN_BOOL_CONVERSION = YES;
662+
CLANG_WARN_COMMA = YES;
639663
CLANG_WARN_CONSTANT_CONVERSION = YES;
640664
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
641665
CLANG_WARN_EMPTY_BODY = YES;
642666
CLANG_WARN_ENUM_CONVERSION = YES;
643667
CLANG_WARN_INFINITE_RECURSION = YES;
644668
CLANG_WARN_INT_CONVERSION = YES;
669+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
670+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
645671
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
672+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
673+
CLANG_WARN_STRICT_PROTOTYPES = YES;
646674
CLANG_WARN_SUSPICIOUS_MOVE = YES;
647675
CLANG_WARN_UNREACHABLE_CODE = YES;
648676
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;

‎Example/Example/AppDelegate.swift

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,20 @@ class AppDelegate: NSObject, NSApplicationDelegate {
1717

1818
@IBOutlet weak var window: NSWindow!
1919
let screeen = ScreenShotObserver()
20-
let rx_disposeBag = DisposeBag()
20+
let disposeBag = DisposeBag()
2121

2222
func applicationDidFinishLaunching(_ aNotification: Notification) {
23-
2423
screeen.rx.addedImage
2524
.subscribe(onNext: { image in
2625
Swift.print("Added image")
27-
}).addDisposableTo(rx_disposeBag)
28-
26+
})
27+
.disposed(by: disposeBag)
2928
screeen.rx.updatedImage
3029
.observeOn(MainScheduler.instance)
3130
.subscribe(onNext: { image in
3231
Swift.print("Updated image")
33-
}).addDisposableTo(rx_disposeBag)
34-
32+
})
33+
.disposed(by: disposeBag)
3534
}
3635

3736
func applicationWillTerminate(_ aNotification: Notification) {

0 commit comments

Comments
 (0)