Skip to content

Commit 8f0a401

Browse files
kzaherkzaher
committed
Merge remote-tracking branch 'origin/muukii/separate-differentiator-2'
2 parents c883beb + 12e9a3d commit 8f0a401

File tree

6 files changed

+68
-36
lines changed

6 files changed

+68
-36
lines changed

‎Differentiator/Differentiator.h

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
//
2+
// Differentiator.h
3+
// Differentiator
4+
//
5+
// Created by muukii on 8/6/17.
6+
// Copyright © 2017 kzaher. All rights reserved.
7+
//
8+
9+
#import <UIKit/UIKit.h>
10+
11+
//! Project version number for Differentiator.
12+
FOUNDATION_EXPORT double DifferentiatorVersionNumber;
13+
14+
//! Project version string for Differentiator.
15+
FOUNDATION_EXPORT const unsigned char DifferentiatorVersionString[];
16+
17+
// In this header, you should import all the public headers of your framework using statements like #import <Differentiator/PublicHeader.h>
18+
19+

‎Differentiator/Info.plist

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict>
5+
<key>CFBundleDevelopmentRegion</key>
6+
<string>$(DEVELOPMENT_LANGUAGE)</string>
7+
<key>CFBundleExecutable</key>
8+
<string>$(EXECUTABLE_NAME)</string>
9+
<key>CFBundleIdentifier</key>
10+
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
11+
<key>CFBundleInfoDictionaryVersion</key>
12+
<string>6.0</string>
13+
<key>CFBundleName</key>
14+
<string>$(PRODUCT_NAME)</string>
15+
<key>CFBundlePackageType</key>
16+
<string>FMWK</string>
17+
<key>CFBundleShortVersionString</key>
18+
<string>1.0</string>
19+
<key>CFBundleVersion</key>
20+
<string>$(CURRENT_PROJECT_VERSION)</string>
21+
<key>NSPrincipalClass</key>
22+
<string></string>
23+
</dict>
24+
</plist>

‎ExampleUITests/ExampleUITests.swift

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,23 @@ import CoreLocation
1010

1111
class ExampleUITests: XCTestCase {
1212

13-
override func setUp() {
14-
super.setUp()
13+
override func setUp() {
14+
super.setUp()
1515

16-
continueAfterFailure = false
17-
XCUIApplication().launch()
18-
}
16+
continueAfterFailure = false
17+
XCUIApplication().launch()
18+
}
1919

20-
override func tearDown() {
21-
super.tearDown()
22-
}
20+
override func tearDown() {
21+
super.tearDown()
22+
}
2323

24-
func testExample() {
25-
XCUIApplication().tables.element(boundBy: 0).cells.staticTexts["Randomize Example"].tap()
24+
func testExample() {
25+
XCUIApplication().tables.element(boundBy: 0).cells.staticTexts["Randomize Example"].tap()
2626

27-
let time: TimeInterval = 120.0
28-
29-
RunLoop.current.run(until: Date().addingTimeInterval(time))
30-
}
27+
let time: TimeInterval = 120.0
3128

29+
RunLoop.current.run(until: Date().addingTimeInterval(time))
30+
}
31+
3232
}

‎Podfile

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,12 @@
11
platform :ios, '8.0'
22
use_frameworks!
33

4-
def common
5-
pod 'RxSwift', :git => 'https://github.com/ReactiveX/RxSwift.git', :branch => 'master'
6-
pod 'RxCocoa', :git => 'https://github.com/ReactiveX/RxSwift.git', :branch => 'master'
7-
end
8-
9-
target 'RxDataSources-iOS' do
10-
common
11-
end
12-
13-
target 'RxDataSources-tvOS' do
14-
common
15-
end
16-
17-
target 'Tests' do
18-
common
4+
target 'RxDataSources' do
5+
pod 'RxSwift', '~> 2.3.1'
6+
pod 'RxCocoa', '~> 2.3.1'
197
end
208

219
target 'Example' do
22-
common
10+
pod 'RxSwift', '~> 2.3.1'
11+
pod 'RxCocoa', '~> 2.3.1'
2312
end

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "4B2515771F2F019B003B277F"
17+
BlueprintIdentifier = "4BA8ACB81F36D6A400371C26"
1818
BuildableName = "Differentiator.framework"
1919
BlueprintName = "Differentiator-iOS"
2020
ReferencedContainer = "container:RxDataSources.xcodeproj">
@@ -45,7 +45,7 @@
4545
<MacroExpansion>
4646
<BuildableReference
4747
BuildableIdentifier = "primary"
48-
BlueprintIdentifier = "4B2515771F2F019B003B277F"
48+
BlueprintIdentifier = "4BA8ACB81F36D6A400371C26"
4949
BuildableName = "Differentiator.framework"
5050
BlueprintName = "Differentiator-iOS"
5151
ReferencedContainer = "container:RxDataSources.xcodeproj">
@@ -63,7 +63,7 @@
6363
<MacroExpansion>
6464
<BuildableReference
6565
BuildableIdentifier = "primary"
66-
BlueprintIdentifier = "4B2515771F2F019B003B277F"
66+
BlueprintIdentifier = "4BA8ACB81F36D6A400371C26"
6767
BuildableName = "Differentiator.framework"
6868
BlueprintName = "Differentiator-iOS"
6969
ReferencedContainer = "container:RxDataSources.xcodeproj">

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "4B2515941F2F01A8003B277F"
17+
BlueprintIdentifier = "4BA8ACD81F36D6AB00371C26"
1818
BuildableName = "Differentiator.framework"
1919
BlueprintName = "Differentiator-tvOS"
2020
ReferencedContainer = "container:RxDataSources.xcodeproj">
@@ -45,7 +45,7 @@
4545
<MacroExpansion>
4646
<BuildableReference
4747
BuildableIdentifier = "primary"
48-
BlueprintIdentifier = "4B2515941F2F01A8003B277F"
48+
BlueprintIdentifier = "4BA8ACD81F36D6AB00371C26"
4949
BuildableName = "Differentiator.framework"
5050
BlueprintName = "Differentiator-tvOS"
5151
ReferencedContainer = "container:RxDataSources.xcodeproj">
@@ -63,7 +63,7 @@
6363
<MacroExpansion>
6464
<BuildableReference
6565
BuildableIdentifier = "primary"
66-
BlueprintIdentifier = "4B2515941F2F01A8003B277F"
66+
BlueprintIdentifier = "4BA8ACD81F36D6AB00371C26"
6767
BuildableName = "Differentiator.framework"
6868
BlueprintName = "Differentiator-tvOS"
6969
ReferencedContainer = "container:RxDataSources.xcodeproj">

0 commit comments

Comments
 (0)