Skip to content

Commit 847b3ce

Browse files
kzaherkzaher
committed
Fixes compilation errors.
1 parent 4345166 commit 847b3ce

File tree

12 files changed

+66
-46
lines changed

12 files changed

+66
-46
lines changed

‎Cartfile.resolved

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

‎Example/Base.lproj/Main.storyboard

Lines changed: 24 additions & 24 deletions
Large diffs are not rendered by default.

‎Example/Example5_UIPickerView.swift

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,27 +20,27 @@ final class ReactivePickerViewControllerExample: UIViewController {
2020
let disposeBag = DisposeBag()
2121

2222
private let stringPickerAdapter = RxPickerViewStringAdapter<[String]>(components: [],
23-
numberOfComponents: { _ in 1 },
23+
numberOfComponents: { _,_,_ in 1 },
2424
numberOfRowsInComponent: { (_, _, items, _) -> Int in
2525
return items.count
2626
},
2727
titleForRow: { (_, _, items, row, _) -> String? in
2828
return items[row]
2929
})
3030
private let attributedStringPickerAdapter = RxPickerViewAttributedStringAdapter<[String]>(components: [],
31-
numberOfComponents: { _ in 1 },
31+
numberOfComponents: { _,_,_ in 1 },
3232
numberOfRowsInComponent: { (_, _, items, _) -> Int in
3333
return items.count
3434
}) { (_, _, items, row, _) -> NSAttributedString? in
3535
return NSAttributedString(string: items[row],
3636
attributes: [
37-
NSForegroundColorAttributeName: UIColor.purple,
38-
NSUnderlineStyleAttributeName: NSUnderlineStyle.styleDouble.rawValue,
39-
NSTextEffectAttributeName: NSTextEffectLetterpressStyle
37+
NSAttributedStringKey.foregroundColor: UIColor.purple,
38+
NSAttributedStringKey.underlineStyle: NSUnderlineStyle.styleDouble.rawValue,
39+
NSAttributedStringKey.textEffect: NSAttributedString.TextEffectStyle.letterpressStyle
4040
])
4141
}
4242
private let viewPickerAdapter = RxPickerViewViewAdapter<[String]>(components: [],
43-
numberOfComponents: { _ in 1 },
43+
numberOfComponents: { _,_,_ in 1 },
4444
numberOfRowsInComponent: { (_, _, items, _) -> Int in
4545
return items.count
4646
}) { (_, _, _, row, _, view) -> UIView in

‎RxDataSources.xcodeproj/project.pbxproj

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -812,7 +812,7 @@
812812
isa = PBXProject;
813813
attributes = {
814814
LastSwiftUpdateCheck = 0810;
815-
LastUpgradeCheck = 0810;
815+
LastUpgradeCheck = 0900;
816816
ORGANIZATIONNAME = kzaher;
817817
TargetAttributes = {
818818
C81905AD1DEA019100AE679C = {
@@ -1299,7 +1299,6 @@
12991299
SKIP_INSTALL = YES;
13001300
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
13011301
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
1302-
SWIFT_VERSION = 3.0;
13031302
};
13041303
name = Debug;
13051304
};
@@ -1322,7 +1321,6 @@
13221321
SKIP_INSTALL = YES;
13231322
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator appletvos appletvsimulator watchos watchsimulator";
13241323
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1325-
SWIFT_VERSION = 3.0;
13261324
};
13271325
name = Release;
13281326
};
@@ -1365,14 +1363,20 @@
13651363
CLANG_CXX_LIBRARY = "libc++";
13661364
CLANG_ENABLE_MODULES = YES;
13671365
CLANG_ENABLE_OBJC_ARC = YES;
1366+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
13681367
CLANG_WARN_BOOL_CONVERSION = YES;
1368+
CLANG_WARN_COMMA = YES;
13691369
CLANG_WARN_CONSTANT_CONVERSION = YES;
13701370
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
13711371
CLANG_WARN_EMPTY_BODY = YES;
13721372
CLANG_WARN_ENUM_CONVERSION = YES;
13731373
CLANG_WARN_INFINITE_RECURSION = YES;
13741374
CLANG_WARN_INT_CONVERSION = YES;
1375+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1376+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
13751377
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1378+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1379+
CLANG_WARN_STRICT_PROTOTYPES = YES;
13761380
CLANG_WARN_SUSPICIOUS_MOVE = YES;
13771381
CLANG_WARN_UNREACHABLE_CODE = YES;
13781382
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1403,7 +1407,7 @@
14031407
OTHER_SWIFT_FLAGS = "-D DEBUG";
14041408
SDKROOT = iphoneos;
14051409
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1406-
SWIFT_VERSION = 3.0;
1410+
SWIFT_VERSION = 4.0;
14071411
TARGETED_DEVICE_FAMILY = "1,2,3,4";
14081412
TVOS_DEPLOYMENT_TARGET = 9.0;
14091413
VERSIONING_SYSTEM = "apple-generic";
@@ -1420,14 +1424,20 @@
14201424
CLANG_CXX_LIBRARY = "libc++";
14211425
CLANG_ENABLE_MODULES = YES;
14221426
CLANG_ENABLE_OBJC_ARC = YES;
1427+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
14231428
CLANG_WARN_BOOL_CONVERSION = YES;
1429+
CLANG_WARN_COMMA = YES;
14241430
CLANG_WARN_CONSTANT_CONVERSION = YES;
14251431
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
14261432
CLANG_WARN_EMPTY_BODY = YES;
14271433
CLANG_WARN_ENUM_CONVERSION = YES;
14281434
CLANG_WARN_INFINITE_RECURSION = YES;
14291435
CLANG_WARN_INT_CONVERSION = YES;
1436+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1437+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
14301438
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1439+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1440+
CLANG_WARN_STRICT_PROTOTYPES = YES;
14311441
CLANG_WARN_SUSPICIOUS_MOVE = YES;
14321442
CLANG_WARN_UNREACHABLE_CODE = YES;
14331443
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -1450,7 +1460,8 @@
14501460
MTL_ENABLE_DEBUG_INFO = NO;
14511461
OTHER_SWIFT_FLAGS = "";
14521462
SDKROOT = iphoneos;
1453-
SWIFT_VERSION = 3.0;
1463+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
1464+
SWIFT_VERSION = 4.0;
14541465
TARGETED_DEVICE_FAMILY = "1,2,3,4";
14551466
TVOS_DEPLOYMENT_TARGET = 9.0;
14561467
VALIDATE_PRODUCT = YES;

‎RxDataSources.xcodeproj/xcshareddata/xcschemes/Differentiator.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 = "0830"
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"

‎RxDataSources.xcodeproj/xcshareddata/xcschemes/Example.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 = "0810"
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
<TestableReference
@@ -65,6 +66,7 @@
6566
buildConfiguration = "Debug"
6667
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6768
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
69+
language = ""
6870
launchStyle = "0"
6971
useCustomWorkingDirectory = "NO"
7072
ignoresPersistentStateOnLaunch = "NO"

‎RxDataSources.xcodeproj/xcshareddata/xcschemes/ExampleUITests.xcscheme

Lines changed: 4 additions & 2 deletions
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"
@@ -10,13 +10,14 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13+
language = ""
1314
shouldUseLaunchSchemeArgsEnv = "YES">
1415
<Testables>
1516
<TestableReference
1617
skipped = "NO">
1718
<BuildableReference
1819
BuildableIdentifier = "primary"
19-
BlueprintIdentifier = "4BC1C9E81F35D45D000A91DD"
20+
BlueprintIdentifier = "C8984CB01C36B723001E4272"
2021
BuildableName = "ExampleUITests.xctest"
2122
BlueprintName = "ExampleUITests"
2223
ReferencedContainer = "container:RxDataSources.xcodeproj">
@@ -30,6 +31,7 @@
3031
buildConfiguration = "Debug"
3132
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3233
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
34+
language = ""
3335
launchStyle = "0"
3436
useCustomWorkingDirectory = "NO"
3537
ignoresPersistentStateOnLaunch = "NO"

‎RxDataSources.xcodeproj/xcshareddata/xcschemes/RxDataSources.xcscheme

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
4-
version = "1.8">
3+
LastUpgradeVersion = "0900"
4+
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -37,6 +37,7 @@
3737
buildConfiguration = "Debug"
3838
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3939
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40+
language = ""
4041
launchStyle = "0"
4142
useCustomWorkingDirectory = "NO"
4243
ignoresPersistentStateOnLaunch = "NO"

‎RxDataSources.xcodeproj/xcshareddata/xcschemes/Tests.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 = "0810"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -26,6 +26,7 @@
2626
buildConfiguration = "Release"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES">
3031
<Testables>
3132
<TestableReference
@@ -46,6 +47,7 @@
4647
buildConfiguration = "Release"
4748
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4849
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
50+
language = ""
4951
launchStyle = "0"
5052
useCustomWorkingDirectory = "NO"
5153
ignoresPersistentStateOnLaunch = "NO"

‎RxSwift

Submodule RxSwift updated 284 files

0 commit comments

Comments
 (0)