Skip to content

Commit 1dc1310

Browse files
kzaherkzaher
committed
Updates for Xcode 8 beta.4
1 parent c5f3f9f commit 1dc1310

File tree

9 files changed

+65
-15
lines changed

9 files changed

+65
-15
lines changed

‎Cartfile.resolved

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

‎Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ EXTERNAL SOURCES:
1717

1818
CHECKOUT OPTIONS:
1919
RxCocoa:
20-
:commit: b47ce13eaea5929bd18758eef8828d6c8ce2a02b
20+
:commit: 091b12242abc774dfea565f1cb518d749a34b40a
2121
:git: [email protected]:ReactiveX/RxSwift.git
2222
RxSwift:
23-
:commit: b47ce13eaea5929bd18758eef8828d6c8ce2a02b
23+
:commit: 091b12242abc774dfea565f1cb518d749a34b40a
2424
:git: [email protected]:ReactiveX/RxSwift.git
2525

2626
SPEC CHECKSUMS:

‎RxDataSources.xcodeproj/project.pbxproj

Lines changed: 53 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
114F5F4F1C65480100873440 /* AnimationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 114F5F4E1C65480100873440 /* AnimationConfiguration.swift */; };
1111
114F5F501C654D4000873440 /* AnimationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 114F5F4E1C65480100873440 /* AnimationConfiguration.swift */; };
1212
114F5F511C654D4100873440 /* AnimationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = 114F5F4E1C65480100873440 /* AnimationConfiguration.swift */; };
13+
35FEDA7A1FFDEF5CF956F5DB /* Pods_Example.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 2F74935B588353100399C29D /* Pods_Example.framework */; };
1314
845F61F41CCFD96800A8BE32 /* Example4_DifferentSectionAndItemTypes.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845F61F31CCFD96800A8BE32 /* Example4_DifferentSectionAndItemTypes.swift */; };
1415
845F61F71CCFDE6A00A8BE32 /* ImageTitleTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845F61F61CCFDE6A00A8BE32 /* ImageTitleTableViewCell.swift */; };
1516
845F61F91CCFDEA800A8BE32 /* TitleSwitchTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845F61F81CCFDEA800A8BE32 /* TitleSwitchTableViewCell.swift */; };
@@ -126,6 +127,7 @@
126127
C8EBA5EC1CD3DE0A00E745F3 /* UIKitExtensions.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845F61FC1CCFF63600A8BE32 /* UIKitExtensions.swift */; };
127128
C8EC65C61C4C441B00FC9207 /* RxDataSources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C8BB76811C4C3E53002B21C8 /* RxDataSources.framework */; };
128129
C8EC65C71C4C441B00FC9207 /* RxDataSources.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C8BB76811C4C3E53002B21C8 /* RxDataSources.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
130+
CAE5E444B61ABBFA2519D271 /* Pods_RxDataSources.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E39CF67E2A16306B47BCE935 /* Pods_RxDataSources.framework */; };
129131
/* End PBXBuildFile section */
130132

131133
/* Begin PBXContainerItemProxy section */
@@ -267,6 +269,7 @@
267269
buildActionMask = 2147483647;
268270
files = (
269271
C8EC65C61C4C441B00FC9207 /* RxDataSources.framework in Frameworks */,
272+
35FEDA7A1FFDEF5CF956F5DB /* Pods_Example.framework in Frameworks */,
270273
);
271274
runOnlyForDeploymentPostprocessing = 0;
272275
};
@@ -291,6 +294,7 @@
291294
isa = PBXFrameworksBuildPhase;
292295
buildActionMask = 2147483647;
293296
files = (
297+
CAE5E444B61ABBFA2519D271 /* Pods_RxDataSources.framework in Frameworks */,
294298
);
295299
runOnlyForDeploymentPostprocessing = 0;
296300
};
@@ -605,10 +609,12 @@
605609
isa = PBXNativeTarget;
606610
buildConfigurationList = C8BB767E1C4C3E53002B21C8 /* Build configuration list for PBXNativeTarget "RxDataSources" */;
607611
buildPhases = (
612+
4804D75B8363AEEBFCB4A075 /* [CP] Check Pods Manifest.lock */,
608613
C8BB765F1C4C3E53002B21C8 /* Sources */,
609614
C8BB76761C4C3E53002B21C8 /* Frameworks */,
610615
C8BB767A1C4C3E53002B21C8 /* Headers */,
611616
C8BB767C1C4C3E53002B21C8 /* Resources */,
617+
C3C1221F32AEA09E09634A1A /* [CP] Copy Pods Resources */,
612618
);
613619
buildRules = (
614620
);
@@ -626,7 +632,7 @@
626632
isa = PBXProject;
627633
attributes = {
628634
LastSwiftUpdateCheck = 0720;
629-
LastUpgradeCheck = 0720;
635+
LastUpgradeCheck = 0800;
630636
ORGANIZATIONNAME = kzaher;
631637
TargetAttributes = {
632638
9FCDA1621C3AF49A000F5F94 = {
@@ -719,6 +725,21 @@
719725
/* End PBXResourcesBuildPhase section */
720726

721727
/* Begin PBXShellScriptBuildPhase section */
728+
4804D75B8363AEEBFCB4A075 /* [CP] Check Pods Manifest.lock */ = {
729+
isa = PBXShellScriptBuildPhase;
730+
buildActionMask = 2147483647;
731+
files = (
732+
);
733+
inputPaths = (
734+
);
735+
name = "[CP] Check Pods Manifest.lock";
736+
outputPaths = (
737+
);
738+
runOnlyForDeploymentPostprocessing = 0;
739+
shellPath = /bin/sh;
740+
shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n exit 1\nfi\n";
741+
showEnvVarsInLog = 0;
742+
};
722743
5D41B451D84BA67C35C4AC67 /* [CP] Embed Pods Frameworks */ = {
723744
isa = PBXShellScriptBuildPhase;
724745
buildActionMask = 2147483647;
@@ -734,6 +755,21 @@
734755
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-Example/Pods-Example-frameworks.sh\"\n";
735756
showEnvVarsInLog = 0;
736757
};
758+
C3C1221F32AEA09E09634A1A /* [CP] Copy Pods Resources */ = {
759+
isa = PBXShellScriptBuildPhase;
760+
buildActionMask = 2147483647;
761+
files = (
762+
);
763+
inputPaths = (
764+
);
765+
name = "[CP] Copy Pods Resources";
766+
outputPaths = (
767+
);
768+
runOnlyForDeploymentPostprocessing = 0;
769+
shellPath = /bin/sh;
770+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-RxDataSources/Pods-RxDataSources-resources.sh\"\n";
771+
showEnvVarsInLog = 0;
772+
};
737773
CE301EF235F2B45D0C3E30B9 /* [CP] Check Pods Manifest.lock */ = {
738774
isa = PBXShellScriptBuildPhase;
739775
buildActionMask = 2147483647;
@@ -988,6 +1024,7 @@
9881024
PRODUCT_NAME = RxDataSources;
9891025
SDKROOT = appletvos;
9901026
SKIP_INSTALL = YES;
1027+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
9911028
TARGETED_DEVICE_FAMILY = 3;
9921029
TVOS_DEPLOYMENT_TARGET = 9.0;
9931030
};
@@ -1006,8 +1043,10 @@
10061043
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
10071044
CLANG_WARN_EMPTY_BODY = YES;
10081045
CLANG_WARN_ENUM_CONVERSION = YES;
1046+
CLANG_WARN_INFINITE_RECURSION = YES;
10091047
CLANG_WARN_INT_CONVERSION = YES;
10101048
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1049+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
10111050
CLANG_WARN_UNREACHABLE_CODE = YES;
10121051
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10131052
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1056,8 +1095,10 @@
10561095
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
10571096
CLANG_WARN_EMPTY_BODY = YES;
10581097
CLANG_WARN_ENUM_CONVERSION = YES;
1098+
CLANG_WARN_INFINITE_RECURSION = YES;
10591099
CLANG_WARN_INT_CONVERSION = YES;
10601100
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1101+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
10611102
CLANG_WARN_UNREACHABLE_CODE = YES;
10621103
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
10631104
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
@@ -1125,13 +1166,15 @@
11251166
PRODUCT_BUNDLE_IDENTIFIER = kzaher.RxDataSources;
11261167
PRODUCT_NAME = RxDataSources;
11271168
SKIP_INSTALL = YES;
1169+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
11281170
};
11291171
name = Release;
11301172
};
11311173
C8984CAB1C36B6FA001E4272 /* Debug */ = {
11321174
isa = XCBuildConfiguration;
11331175
baseConfigurationReference = B472785F652B32605A7A6838 /* Pods-Example.debug.xcconfig */;
11341176
buildSettings = {
1177+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11351178
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
11361179
FRAMEWORK_SEARCH_PATHS = (
11371180
"$(inherited)",
@@ -1149,6 +1192,7 @@
11491192
isa = XCBuildConfiguration;
11501193
baseConfigurationReference = E4DE8D6B18C8BF4D4C37DB03 /* Pods-Example.release.xcconfig */;
11511194
buildSettings = {
1195+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11521196
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
11531197
FRAMEWORK_SEARCH_PATHS = (
11541198
"$(inherited)",
@@ -1159,6 +1203,7 @@
11591203
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
11601204
PRODUCT_BUNDLE_IDENTIFIER = kzaher.Example;
11611205
PRODUCT_NAME = "$(TARGET_NAME)";
1206+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
11621207
};
11631208
name = Release;
11641209
};
@@ -1181,6 +1226,7 @@
11811226
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
11821227
PRODUCT_BUNDLE_IDENTIFIER = kzaher.ExampleUITests;
11831228
PRODUCT_NAME = "$(TARGET_NAME)";
1229+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
11841230
TEST_TARGET_NAME = Example;
11851231
USES_XCTRUNNER = YES;
11861232
};
@@ -1189,8 +1235,8 @@
11891235
C8BB76591C4C3DD4002B21C8 /* Debug */ = {
11901236
isa = XCBuildConfiguration;
11911237
buildSettings = {
1238+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
11921239
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1193-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
11941240
FRAMEWORK_SEARCH_PATHS = (
11951241
"$(inherited)",
11961242
"$(PROJECT_DIR)/build/Debug-iphoneos",
@@ -1206,8 +1252,8 @@
12061252
C8BB765A1C4C3DD4002B21C8 /* Release */ = {
12071253
isa = XCBuildConfiguration;
12081254
buildSettings = {
1255+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12091256
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
1210-
EMBEDDED_CONTENT_CONTAINS_SWIFT = YES;
12111257
FRAMEWORK_SEARCH_PATHS = (
12121258
"$(inherited)",
12131259
"$(PROJECT_DIR)/build/Debug-iphoneos",
@@ -1217,13 +1263,15 @@
12171263
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
12181264
PRODUCT_BUNDLE_IDENTIFIER = kzaher.Example;
12191265
PRODUCT_NAME = "$(TARGET_NAME)";
1266+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
12201267
};
12211268
name = Release;
12221269
};
12231270
C8BB767F1C4C3E53002B21C8 /* Debug */ = {
12241271
isa = XCBuildConfiguration;
12251272
baseConfigurationReference = E8A1509A86ADB3FDAEE200EF /* Pods-RxDataSources.debug.xcconfig */;
12261273
buildSettings = {
1274+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12271275
DEFINES_MODULE = YES;
12281276
DYLIB_COMPATIBILITY_VERSION = 1;
12291277
DYLIB_CURRENT_VERSION = 1;
@@ -1246,6 +1294,7 @@
12461294
isa = XCBuildConfiguration;
12471295
baseConfigurationReference = 2A58DC421ECF08DEF551FDFB /* Pods-RxDataSources.release.xcconfig */;
12481296
buildSettings = {
1297+
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
12491298
DEFINES_MODULE = YES;
12501299
DYLIB_COMPATIBILITY_VERSION = 1;
12511300
DYLIB_CURRENT_VERSION = 1;
@@ -1261,6 +1310,7 @@
12611310
PRODUCT_BUNDLE_IDENTIFIER = kzaher.RxDataSources;
12621311
PRODUCT_NAME = "$(TARGET_NAME)";
12631312
SKIP_INSTALL = YES;
1313+
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
12641314
};
12651315
name = Release;
12661316
};

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

Lines changed: 1 addition & 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 = "0720"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

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

Lines changed: 1 addition & 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 = "0720"
3+
LastUpgradeVersion = "0800"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎Sources/DataSources+Rx/UISectionedViewType+RxAnimatedDataSource.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import RxCocoa
1616
extension UITableView {
1717
@available(*, deprecated:0.7, renamed:"rx_itemsWithDataSource", message:"You can just use normal `rx_itemsWithDataSource` extension.")
1818
public func rx_itemsAnimatedWithDataSource<
19-
DataSource: protocol<RxTableViewDataSourceType, UITableViewDataSource>,
19+
DataSource: RxTableViewDataSourceType & UITableViewDataSource,
2020
S: Sequence,
2121
O: ObservableType
2222
where
@@ -36,7 +36,7 @@ extension UITableView {
3636
extension UICollectionView {
3737
@available(*, deprecated:0.7, renamed:"rx_itemsWithDataSource", message:"You can just use normal `rx_itemsWithDataSource` extension.")
3838
public func rx_itemsAnimatedWithDataSource<
39-
DataSource: protocol<RxCollectionViewDataSourceType, UICollectionViewDataSource>,
39+
DataSource: RxCollectionViewDataSourceType & UICollectionViewDataSource,
4040
S: Sequence,
4141
O: ObservableType
4242
where

‎Sources/DataSources/AnimatableSectionModel.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
import Foundation
1010

11-
public struct AnimatableSectionModel<Section: IdentifiableType, ItemType: protocol<IdentifiableType, Equatable>>
11+
public struct AnimatableSectionModel<Section: IdentifiableType, ItemType: IdentifiableType & Equatable>
1212
: AnimatableSectionModelType
1313
, CustomStringConvertible {
1414
public typealias Item = ItemType

‎Sources/DataSources/DataSources.swift

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

99
import Foundation
1010

11-
enum RxDataSourceError : ErrorProtocol {
11+
enum RxDataSourceError : Error {
1212
case unwrappingOptional
1313
case preconditionFailed(message: String)
1414
}
@@ -22,7 +22,7 @@ func rxPrecondition(_ condition: Bool, _ message: @autoclosure() -> String) thro
2222
throw RxDataSourceError.preconditionFailed(message: message())
2323
}
2424

25-
func rxDebugFatalError(_ error: ErrorProtocol) {
25+
func rxDebugFatalError(_ error: Error) {
2626
rxDebugFatalError("\(error)")
2727
}
2828

‎Sources/DataSources/Differentiator.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
import Foundation
1010

1111
public enum DifferentiatorError
12-
: ErrorProtocol
12+
: Error
1313
, CustomDebugStringConvertible {
1414
case duplicateItem(item: Any)
1515
case duplicateSection(section: Any)
@@ -23,7 +23,7 @@ extension DifferentiatorError {
2323
return "Duplicate item \(item)"
2424
case let .duplicateSection(section):
2525
return "Duplicate section \(section)"
26-
case let invalidInitializerImplementation(section, expectedItems, expectedIdentifier):
26+
case let .invalidInitializerImplementation(section, expectedItems, expectedIdentifier):
2727
return "Wrong initializer implementation for: \(section)\n" +
2828
"Expected it should return items: \(expectedItems)\n" +
2929
"Expected it should have id: \(expectedIdentifier)"

0 commit comments

Comments
 (0)