Skip to content

Commit 74deb7b

Browse files
kzaherkzaher
committed
Merge branch 'muukii/separate-differentiator-2'
2 parents 3c2e6de + 1ed2668 commit 74deb7b

Some content is hidden

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

45 files changed

+1140
-914
lines changed

‎Differentiator.podspec

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Pod::Spec.new do |s|
2+
s.name = "Differentiator"
3+
s.version = "2.0.0"
4+
s.summary = "Diff algorithm for UITableView and UICollectionView."
5+
s.description = <<-DESC
6+
Diff algorithm for UITableView and UICollectionView.
7+
RxDataSources is powered by Differentiator.
8+
DESC
9+
10+
s.homepage = "https://github.com/ReactiveX/RxSwift"
11+
s.license = 'MIT'
12+
s.author = { "Krunoslav Zaher" => "[email protected]" }
13+
s.source = { :git => "https://github.com/RxSwiftCommunity/RxDataSources.git", :tag => s.version.to_s }
14+
15+
s.requires_arc = true
16+
17+
s.source_files = 'Sources/Differentiator/**/*.swift'
18+
19+
s.ios.deployment_target = '8.0'
20+
s.tvos.deployment_target = '9.0'
21+
22+
end

‎ExampleUITests/ExampleUITests.swift

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,29 +5,28 @@
55
// Created by Krunoslav Zaher on 1/1/16.
66
// Copyright © 2016 kzaher. All rights reserved.
77
//
8-
98
import XCTest
109
import CoreLocation
1110

1211
class ExampleUITests: XCTestCase {
13-
14-
override func setUp() {
15-
super.setUp()
16-
17-
continueAfterFailure = false
18-
XCUIApplication().launch()
19-
}
20-
21-
override func tearDown() {
22-
super.tearDown()
23-
}
24-
25-
func testExample() {
26-
XCUIApplication().tables.element(boundBy: 0).cells.staticTexts["Randomize Example"].tap()
27-
28-
let time: TimeInterval = 120.0
29-
30-
RunLoop.current.run(until: Date().addingTimeInterval(time))
31-
}
32-
12+
13+
override func setUp() {
14+
super.setUp()
15+
16+
continueAfterFailure = false
17+
XCUIApplication().launch()
18+
}
19+
20+
override func tearDown() {
21+
super.tearDown()
22+
}
23+
24+
func testExample() {
25+
XCUIApplication().tables.element(boundBy: 0).cells.staticTexts["Randomize Example"].tap()
26+
27+
let time: TimeInterval = 120.0
28+
29+
RunLoop.current.run(until: Date().addingTimeInterval(time))
30+
}
31+
3332
}

‎ExampleUITests/Info.plist

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
<string>BNDL</string>
1717
<key>CFBundleShortVersionString</key>
1818
<string>1.0</string>
19-
<key>CFBundleSignature</key>
20-
<string>????</string>
2119
<key>CFBundleVersion</key>
2220
<string>1</string>
2321
</dict>

‎Podfile.lock

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

‎RxDataSources.podspec

Lines changed: 7 additions & 5 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,20 @@ data
2828
.disposed(by: disposeBag)
2929
```
3030
DESC
31+
3132
s.homepage = "https://github.com/ReactiveX/RxSwift"
3233
s.license = 'MIT'
3334
s.author = { "Krunoslav Zaher" => "[email protected]" }
3435
s.source = { :git => "https://github.com/RxSwiftCommunity/RxDataSources.git", :tag => s.version.to_s }
3536

3637
s.requires_arc = true
38+
39+
s.source_files = 'Sources/RxDataSources/**/*.swift'
40+
s.dependency 'Differentiator', '~> 2.0'
41+
s.dependency 'RxSwift', '~> 3.0'
42+
s.dependency 'RxCocoa', '~> 3.0'
3743

3844
s.ios.deployment_target = '8.0'
3945
s.tvos.deployment_target = '9.0'
4046

41-
s.source_files = 'Sources/**/*.swift'
42-
43-
s.dependency 'RxSwift', '~> 3.0'
44-
s.dependency 'RxCocoa', '~> 3.0'
4547
end

‎RxDataSources.xcodeproj/xcshareddata/xcschemes/Differentiator-iOS.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 = "4B2515771F2F019B003B277F"
18+
BuildableName = "Differentiator.framework"
19+
BlueprintName = "Differentiator-iOS"
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 = "4B2515771F2F019B003B277F"
49+
BuildableName = "Differentiator.framework"
50+
BlueprintName = "Differentiator-iOS"
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 = "4B2515771F2F019B003B277F"
67+
BuildableName = "Differentiator.framework"
68+
BlueprintName = "Differentiator-iOS"
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>

‎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>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
skipped = "NO">
1717
<BuildableReference
1818
BuildableIdentifier = "primary"
19-
BlueprintIdentifier = "C8984CB01C36B723001E4272"
19+
BlueprintIdentifier = "4BC1C9E81F35D45D000A91DD"
2020
BuildableName = "ExampleUITests.xctest"
2121
BlueprintName = "ExampleUITests"
2222
ReferencedContainer = "container:RxDataSources.xcodeproj">

0 commit comments

Comments
 (0)