Skip to content

Commit f858055

Browse files
author
Ben Sarrazin
committed
Upgrading to Swift 4 and Xcode 9
1 parent c810fcd commit f858055

7 files changed

Lines changed: 48 additions & 30 deletions

File tree

‎.gitignore‎

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,25 +32,11 @@ timeline.xctimeline
3232
playground.xcworkspace
3333

3434
# Swift Package Manager
35-
#
36-
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
37-
# Packages/
3835
.build/
39-
4036
# CocoaPods
41-
#
42-
# We recommend against adding the Pods directory to your .gitignore. However
43-
# you should judge for yourself, the pros and cons are mentioned at:
44-
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
45-
#
46-
# Pods/
47-
37+
Pods/
4838
# Carthage
49-
#
50-
# Add this line if you want to avoid checking in source code from Carthage dependencies.
51-
# Carthage/Checkouts
52-
53-
Carthage/Build
39+
Carthage
5440

5541
# fastlane
5642
#

‎Pod/Classes/RxRealm.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public struct RealmChangeset {
9696
public let updated: [Int]
9797
}
9898

99-
public extension ObservableType where E: NotificationEmitter, E.ElementType: Object {
99+
public extension ObservableType where E: NotificationEmitter {
100100

101101
@available(*, deprecated, renamed: "collection(from:synchronousStart:)")
102102
public static func from(_ collection: E, scheduler: ImmediateSchedulerType = CurrentThreadScheduler.instance) -> Observable<E> {

‎RxRealm.xcodeproj/project.pbxproj‎

Lines changed: 33 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -267,14 +267,22 @@
267267
9F0BE41A1CF8DB4B00919282 /* Project object */ = {
268268
isa = PBXProject;
269269
attributes = {
270-
LastUpgradeCheck = 0820;
270+
LastUpgradeCheck = 0900;
271271
ORGANIZATIONNAME = RxSwiftCommunity;
272272
TargetAttributes = {
273273
9F0BE4221CF8DB4B00919282 = {
274274
CreatedOnToolsVersion = 7.3.1;
275+
LastSwiftMigration = 0900;
275276
};
276277
9F1E94B71CF8EA4500BC469B = {
277278
CreatedOnToolsVersion = 7.3.1;
279+
LastSwiftMigration = 0900;
280+
};
281+
DD75B4471E67C18B0011CAA9 = {
282+
LastSwiftMigration = 0900;
283+
};
284+
DD75B4561E67C29A0011CAA9 = {
285+
LastSwiftMigration = 0900;
278286
};
279287
};
280288
};
@@ -378,14 +386,20 @@
378386
CLANG_CXX_LIBRARY = "libc++";
379387
CLANG_ENABLE_MODULES = YES;
380388
CLANG_ENABLE_OBJC_ARC = YES;
389+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
381390
CLANG_WARN_BOOL_CONVERSION = YES;
391+
CLANG_WARN_COMMA = YES;
382392
CLANG_WARN_CONSTANT_CONVERSION = YES;
383393
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
384394
CLANG_WARN_EMPTY_BODY = YES;
385395
CLANG_WARN_ENUM_CONVERSION = YES;
386396
CLANG_WARN_INFINITE_RECURSION = YES;
387397
CLANG_WARN_INT_CONVERSION = YES;
398+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
399+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
388400
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
401+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
402+
CLANG_WARN_STRICT_PROTOTYPES = YES;
389403
CLANG_WARN_SUSPICIOUS_MOVE = YES;
390404
CLANG_WARN_UNREACHABLE_CODE = YES;
391405
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -429,14 +443,20 @@
429443
CLANG_CXX_LIBRARY = "libc++";
430444
CLANG_ENABLE_MODULES = YES;
431445
CLANG_ENABLE_OBJC_ARC = YES;
446+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
432447
CLANG_WARN_BOOL_CONVERSION = YES;
448+
CLANG_WARN_COMMA = YES;
433449
CLANG_WARN_CONSTANT_CONVERSION = YES;
434450
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
435451
CLANG_WARN_EMPTY_BODY = YES;
436452
CLANG_WARN_ENUM_CONVERSION = YES;
437453
CLANG_WARN_INFINITE_RECURSION = YES;
438454
CLANG_WARN_INT_CONVERSION = YES;
455+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
456+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
439457
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
458+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
459+
CLANG_WARN_STRICT_PROTOTYPES = YES;
440460
CLANG_WARN_SUSPICIOUS_MOVE = YES;
441461
CLANG_WARN_UNREACHABLE_CODE = YES;
442462
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -485,7 +505,7 @@
485505
PRODUCT_BUNDLE_IDENTIFIER = com.RxSwiftCommunity.RxRealm;
486506
PRODUCT_NAME = RxRealm;
487507
SKIP_INSTALL = YES;
488-
SWIFT_VERSION = 3.0;
508+
SWIFT_VERSION = 4.0;
489509
};
490510
name = Debug;
491511
};
@@ -509,7 +529,7 @@
509529
PRODUCT_BUNDLE_IDENTIFIER = com.RxSwiftCommunity.RxRealm;
510530
PRODUCT_NAME = RxRealm;
511531
SKIP_INSTALL = YES;
512-
SWIFT_VERSION = 3.0;
532+
SWIFT_VERSION = 4.0;
513533
};
514534
name = Release;
515535
};
@@ -535,7 +555,7 @@
535555
PRODUCT_NAME = RxRealm;
536556
SDKROOT = macosx;
537557
SKIP_INSTALL = YES;
538-
SWIFT_VERSION = 3.0;
558+
SWIFT_VERSION = 4.0;
539559
};
540560
name = Debug;
541561
};
@@ -561,14 +581,15 @@
561581
PRODUCT_NAME = RxRealm;
562582
SDKROOT = macosx;
563583
SKIP_INSTALL = YES;
564-
SWIFT_VERSION = 3.0;
584+
SWIFT_VERSION = 4.0;
565585
};
566586
name = Release;
567587
};
568588
DD75B4521E67C18B0011CAA9 /* Debug */ = {
569589
isa = XCBuildConfiguration;
570590
buildSettings = {
571591
APPLICATION_EXTENSION_API_ONLY = YES;
592+
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
572593
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
573594
DEFINES_MODULE = YES;
574595
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -586,7 +607,7 @@
586607
PRODUCT_NAME = RxRealm;
587608
SDKROOT = appletvos;
588609
SKIP_INSTALL = YES;
589-
SWIFT_VERSION = 3.0;
610+
SWIFT_VERSION = 4.0;
590611
TARGETED_DEVICE_FAMILY = 3;
591612
TVOS_DEPLOYMENT_TARGET = 9.0;
592613
};
@@ -596,6 +617,7 @@
596617
isa = XCBuildConfiguration;
597618
buildSettings = {
598619
APPLICATION_EXTENSION_API_ONLY = YES;
620+
"CODE_SIGN_IDENTITY[sdk=appletvos*]" = "";
599621
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
600622
DEFINES_MODULE = YES;
601623
DYLIB_COMPATIBILITY_VERSION = 1;
@@ -613,7 +635,7 @@
613635
PRODUCT_NAME = RxRealm;
614636
SDKROOT = appletvos;
615637
SKIP_INSTALL = YES;
616-
SWIFT_VERSION = 3.0;
638+
SWIFT_VERSION = 4.0;
617639
TARGETED_DEVICE_FAMILY = 3;
618640
TVOS_DEPLOYMENT_TARGET = 9.0;
619641
};
@@ -624,6 +646,7 @@
624646
buildSettings = {
625647
APPLICATION_EXTENSION_API_ONLY = YES;
626648
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
649+
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
627650
DEFINES_MODULE = YES;
628651
DYLIB_COMPATIBILITY_VERSION = 1;
629652
DYLIB_CURRENT_VERSION = 1;
@@ -640,7 +663,7 @@
640663
PRODUCT_NAME = RxRealm;
641664
SDKROOT = watchos;
642665
SKIP_INSTALL = YES;
643-
SWIFT_VERSION = 3.0;
666+
SWIFT_VERSION = 4.0;
644667
TARGETED_DEVICE_FAMILY = 4;
645668
WATCHOS_DEPLOYMENT_TARGET = 2.0;
646669
};
@@ -651,6 +674,7 @@
651674
buildSettings = {
652675
APPLICATION_EXTENSION_API_ONLY = YES;
653676
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
677+
"CODE_SIGN_IDENTITY[sdk=watchos*]" = "";
654678
DEFINES_MODULE = YES;
655679
DYLIB_COMPATIBILITY_VERSION = 1;
656680
DYLIB_CURRENT_VERSION = 1;
@@ -667,7 +691,7 @@
667691
PRODUCT_NAME = RxRealm;
668692
SDKROOT = watchos;
669693
SKIP_INSTALL = YES;
670-
SWIFT_VERSION = 3.0;
694+
SWIFT_VERSION = 4.0;
671695
TARGETED_DEVICE_FAMILY = 4;
672696
WATCHOS_DEPLOYMENT_TARGET = 2.0;
673697
};

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Release"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
</Testables>
@@ -36,6 +37,7 @@
3637
buildConfiguration = "Debug"
3738
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3839
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
3941
launchStyle = "0"
4042
useCustomWorkingDirectory = "NO"
4143
ignoresPersistentStateOnLaunch = "NO"

0 commit comments

Comments
 (0)