Skip to content

Commit d27ed5e

Browse files
muukiikzaher
muukii
authored and
kzaher
committed
Detach Diff from RxDataSources, and cleanup
⚡ WIP Remove binaries
1 parent e7da67f commit d27ed5e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+1039
-906
lines changed

‎ExampleUITests/ExampleUITests.swift

Lines changed: 0 additions & 33 deletions
This file was deleted.

‎Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,6 @@ SPEC CHECKSUMS:
2727
RxCocoa: 74590292782270293bec4f6be0edb72b3310030d
2828
RxSwift: 54c92b0ae783a364051f62a21d31ff972c5e41c4
2929

30-
PODFILE CHECKSUM: 29bf31f6a813ce527b77481cfb115102d889c025
30+
PODFILE CHECKSUM: fe9cbda4b3b1c4b7490c2f6b23fb119bdd8a380c
3131

3232
COCOAPODS: 1.2.1

‎RxDataSources.podspec

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Pod::Spec.new do |s|
22
s.name = "RxDataSources"
3-
s.version = "1.0.4"
3+
s.version = "2.0.0"
44
s.summary = "This is a collection of reactive data sources for UITableView and UICollectionView."
55
s.description = <<-DESC
66
This is a collection of reactive data sources for UITableView and UICollectionView.
@@ -28,18 +28,27 @@ data
2828
.disposed(by: disposeBag)
2929
```
3030
DESC
31+
32+
s.subspec 'Diffing' do |ds|
33+
ds.source_files = 'Sources/Differentiator/**/*.swift'
34+
end
35+
36+
s.subspec 'Default' do |cs|
37+
cs.dependency 'RxDataSources/Diffing'
38+
cs.source_files = 'Sources/RxDataSources/*.swift'
39+
end
40+
3141
s.homepage = "https://github.com/ReactiveX/RxSwift"
3242
s.license = 'MIT'
3343
s.author = { "Krunoslav Zaher" => "[email protected]" }
3444
s.source = { :git => "https://github.com/RxSwiftCommunity/RxDataSources.git", :tag => s.version.to_s }
3545

46+
s.default_subspec = 'Default'
3647
s.requires_arc = true
3748

3849
s.ios.deployment_target = '8.0'
3950
s.tvos.deployment_target = '9.0'
4051

41-
s.source_files = 'Sources/**/*.swift'
42-
4352
s.dependency 'RxSwift', '~> 3.0'
4453
s.dependency 'RxCocoa', '~> 3.0'
4554
end

‎RxDataSources.xcodeproj/xcshareddata/xcschemes/ExampleUITests.xcscheme renamed to ‎RxDataSources.xcodeproj/xcshareddata/xcschemes/Differentiator-iOS.xcscheme

Lines changed: 35 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,33 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0810"
3+
LastUpgradeVersion = "0830"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "4B2515771F2F019B003B277F"
18+
BuildableName = "Differentiator.framework"
19+
BlueprintName = "Differentiator-iOS"
20+
ReferencedContainer = "container:RxDataSources.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
824
</BuildAction>
925
<TestAction
1026
buildConfiguration = "Debug"
1127
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1228
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
1329
shouldUseLaunchSchemeArgsEnv = "YES">
1430
<Testables>
15-
<TestableReference
16-
skipped = "NO">
17-
<BuildableReference
18-
BuildableIdentifier = "primary"
19-
BlueprintIdentifier = "C8984CB01C36B723001E4272"
20-
BuildableName = "ExampleUITests.xctest"
21-
BlueprintName = "ExampleUITests"
22-
ReferencedContainer = "container:RxDataSources.xcodeproj">
23-
</BuildableReference>
24-
</TestableReference>
2531
</Testables>
2632
<AdditionalOptions>
2733
</AdditionalOptions>
@@ -36,6 +42,15 @@
3642
debugDocumentVersioning = "YES"
3743
debugServiceExtension = "internal"
3844
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "4B2515771F2F019B003B277F"
49+
BuildableName = "Differentiator.framework"
50+
BlueprintName = "Differentiator-iOS"
51+
ReferencedContainer = "container:RxDataSources.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
3954
<AdditionalOptions>
4055
</AdditionalOptions>
4156
</LaunchAction>
@@ -45,6 +60,15 @@
4560
savedToolIdentifier = ""
4661
useCustomWorkingDirectory = "NO"
4762
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "4B2515771F2F019B003B277F"
67+
BuildableName = "Differentiator.framework"
68+
BlueprintName = "Differentiator-iOS"
69+
ReferencedContainer = "container:RxDataSources.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
4872
</ProfileAction>
4973
<AnalyzeAction
5074
buildConfiguration = "Debug">

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

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0830"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "YES"
7+
buildImplicitDependencies = "YES">
8+
<BuildActionEntries>
9+
<BuildActionEntry
10+
buildForTesting = "YES"
11+
buildForRunning = "YES"
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
15+
<BuildableReference
16+
BuildableIdentifier = "primary"
17+
BlueprintIdentifier = "4B2515941F2F01A8003B277F"
18+
BuildableName = "Differentiator.framework"
19+
BlueprintName = "Differentiator-tvOS"
20+
ReferencedContainer = "container:RxDataSources.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
</BuildActionEntries>
24+
</BuildAction>
25+
<TestAction
26+
buildConfiguration = "Debug"
27+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
28+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
shouldUseLaunchSchemeArgsEnv = "YES">
30+
<Testables>
31+
</Testables>
32+
<AdditionalOptions>
33+
</AdditionalOptions>
34+
</TestAction>
35+
<LaunchAction
36+
buildConfiguration = "Debug"
37+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
38+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
39+
launchStyle = "0"
40+
useCustomWorkingDirectory = "NO"
41+
ignoresPersistentStateOnLaunch = "NO"
42+
debugDocumentVersioning = "YES"
43+
debugServiceExtension = "internal"
44+
allowLocationSimulation = "YES">
45+
<MacroExpansion>
46+
<BuildableReference
47+
BuildableIdentifier = "primary"
48+
BlueprintIdentifier = "4B2515941F2F01A8003B277F"
49+
BuildableName = "Differentiator.framework"
50+
BlueprintName = "Differentiator-tvOS"
51+
ReferencedContainer = "container:RxDataSources.xcodeproj">
52+
</BuildableReference>
53+
</MacroExpansion>
54+
<AdditionalOptions>
55+
</AdditionalOptions>
56+
</LaunchAction>
57+
<ProfileAction
58+
buildConfiguration = "Release"
59+
shouldUseLaunchSchemeArgsEnv = "YES"
60+
savedToolIdentifier = ""
61+
useCustomWorkingDirectory = "NO"
62+
debugDocumentVersioning = "YES">
63+
<MacroExpansion>
64+
<BuildableReference
65+
BuildableIdentifier = "primary"
66+
BlueprintIdentifier = "4B2515941F2F01A8003B277F"
67+
BuildableName = "Differentiator.framework"
68+
BlueprintName = "Differentiator-tvOS"
69+
ReferencedContainer = "container:RxDataSources.xcodeproj">
70+
</BuildableReference>
71+
</MacroExpansion>
72+
</ProfileAction>
73+
<AnalyzeAction
74+
buildConfiguration = "Debug">
75+
</AnalyzeAction>
76+
<ArchiveAction
77+
buildConfiguration = "Release"
78+
revealArchiveInOrganizer = "YES">
79+
</ArchiveAction>
80+
</Scheme>

0 commit comments

Comments
 (0)