Skip to content

Commit 9327a83

Browse files
kzaherkzaher
committed
Xcode 10 issues.
1 parent dad8948 commit 9327a83

File tree

13 files changed

+62
-629
lines changed

13 files changed

+62
-629
lines changed

‎.gitmodules

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,3 @@
1-
[submodule "RxSwift"]
2-
path = RxSwift
3-
url = https://github.com/ReactiveX/RxSwift.git
41
[submodule "Examples/RxSwift"]
52
path = Examples/RxSwift
63
url = https://github.com/ReactiveX/RxSwift.git

‎.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,8 @@ notifications:
99
install: true
1010

1111
env:
12-
- BUILD="pod repo update && pod update && set -o pipefail && (xcodebuild -workspace RxDataSources.xcworkspace -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -workspace RxDataSources.xcworkspace -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -workspace RxDataSources.xcworkspace -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
13-
- BUILD="./dependencies.sh && set -o pipefail && (xcodebuild -project RxDataSources.xcodeproj -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project RxDataSources.xcodeproj -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project RxDataSources.xcodeproj -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
14-
- BUILD="carthage update --platform ios && set -o pipefail && (xcodebuild -project RxDataSources.xcodeproj -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project RxDataSources.xcodeproj -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project RxDataSources.xcodeproj -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
12+
- BUILD="pushd Examples && ./dependencies.sh && set -o pipefail && (xcodebuild -project Example.xcodeproj -scheme ExampleUITests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test && xcodebuild -project Example.xcodeproj -scheme Example -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' build) | xcpretty"
13+
- BUILD="carthage update --platform ios && set -o pipefail && (xcodebuild -project RxDataSources.xcodeproj -scheme Tests -configuration Release -destination 'platform=iOS Simulator,name=iPhone 7' test) | xcpretty"
1514
- BUILD="pod repo update && pod lib lint RxDataSources.podspec --verbose && pod lib lint Differentiator.podspec --verbose "
1615
- BUILD="carthage update --platform iOS && carthage build --no-skip-current --platform iOS"
1716
- BUILD="carthage update --platform tvOS && carthage build --no-skip-current --platform tvOS"

‎Cartfile.resolved

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
git "/Users/kzaher/Projects/RxSwift" "4.3.0"

‎Examples/Example.xcodeproj/project.pbxproj

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
C81FBF631F3B9DC00094061E /* IntegerType+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF611F3B9DC00094061E /* IntegerType+IdentifiableType.swift */; };
2121
C81FBF641F3B9DC00094061E /* String+IdentifiableType.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF621F3B9DC00094061E /* String+IdentifiableType.swift */; };
2222
C81FBF661F3B9DF60094061E /* AnimationConfiguration.swift in Sources */ = {isa = PBXBuildFile; fileRef = C81FBF651F3B9DF60094061E /* AnimationConfiguration.swift */; };
23+
C8241D7D214E75C6008C463E /* RxSwift.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C88AC715214D9BA800C1A3E5 /* RxSwift.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
24+
C8241D7E214E75CB008C463E /* RxCocoa.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C88AC71D214D9BA800C1A3E5 /* RxCocoa.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2325
C82C3C5B1F3B937500309AE8 /* Differentiator.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C82C3C541F3B937500309AE8 /* Differentiator.framework */; };
2426
C82C3C5C1F3B937500309AE8 /* Differentiator.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = C82C3C541F3B937500309AE8 /* Differentiator.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
2527
C82C3C871F3B939100309AE8 /* AnimatableSectionModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = C82C3C611F3B938C00309AE8 /* AnimatableSectionModel.swift */; };
@@ -294,8 +296,10 @@
294296
dstPath = "";
295297
dstSubfolderSpec = 10;
296298
files = (
299+
C8241D7E214E75CB008C463E /* RxCocoa.framework in Embed Frameworks */,
297300
C87C34A31F363B3000DB85FE /* RxDataSources.framework in Embed Frameworks */,
298301
C82C3C5C1F3B937500309AE8 /* Differentiator.framework in Embed Frameworks */,
302+
C8241D7D214E75C6008C463E /* RxSwift.framework in Embed Frameworks */,
299303
);
300304
name = "Embed Frameworks";
301305
runOnlyForDeploymentPostprocessing = 0;

‎Examples/Example.xcodeproj/xcshareddata/xcschemes/Differentiator.xcscheme

Lines changed: 4 additions & 6 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 = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -17,7 +17,7 @@
1717
BlueprintIdentifier = "C82C3C531F3B937500309AE8"
1818
BuildableName = "Differentiator.framework"
1919
BlueprintName = "Differentiator"
20-
ReferencedContainer = "container:RxDataSources.xcodeproj">
20+
ReferencedContainer = "container:Example.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -37,7 +36,6 @@
3736
buildConfiguration = "Debug"
3837
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3938
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4139
launchStyle = "0"
4240
useCustomWorkingDirectory = "NO"
4341
ignoresPersistentStateOnLaunch = "NO"
@@ -50,7 +48,7 @@
5048
BlueprintIdentifier = "C82C3C531F3B937500309AE8"
5149
BuildableName = "Differentiator.framework"
5250
BlueprintName = "Differentiator"
53-
ReferencedContainer = "container:RxDataSources.xcodeproj">
51+
ReferencedContainer = "container:Example.xcodeproj">
5452
</BuildableReference>
5553
</MacroExpansion>
5654
<AdditionalOptions>
@@ -68,7 +66,7 @@
6866
BlueprintIdentifier = "C82C3C531F3B937500309AE8"
6967
BuildableName = "Differentiator.framework"
7068
BlueprintName = "Differentiator"
71-
ReferencedContainer = "container:RxDataSources.xcodeproj">
69+
ReferencedContainer = "container:Example.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
7472
</ProfileAction>

‎Examples/Example.xcodeproj/xcshareddata/xcschemes/Example.xcscheme

Lines changed: 5 additions & 27 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 = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -17,7 +17,7 @@
1717
BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
1818
BuildableName = "Example.app"
1919
BlueprintName = "Example"
20-
ReferencedContainer = "container:RxDataSources.xcodeproj">
20+
ReferencedContainer = "container:Example.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -26,37 +26,16 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
32-
<TestableReference
33-
skipped = "NO">
34-
<BuildableReference
35-
BuildableIdentifier = "primary"
36-
BlueprintIdentifier = "C8984CB01C36B723001E4272"
37-
BuildableName = "ExampleUITests.xctest"
38-
BlueprintName = "ExampleUITests"
39-
ReferencedContainer = "container:RxDataSources.xcodeproj">
40-
</BuildableReference>
41-
</TestableReference>
42-
<TestableReference
43-
skipped = "NO">
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "C81905AD1DEA019100AE679C"
47-
BuildableName = "Tests.xctest"
48-
BlueprintName = "Tests"
49-
ReferencedContainer = "container:RxDataSources.xcodeproj">
50-
</BuildableReference>
51-
</TestableReference>
5231
</Testables>
5332
<MacroExpansion>
5433
<BuildableReference
5534
BuildableIdentifier = "primary"
5635
BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
5736
BuildableName = "Example.app"
5837
BlueprintName = "Example"
59-
ReferencedContainer = "container:RxDataSources.xcodeproj">
38+
ReferencedContainer = "container:Example.xcodeproj">
6039
</BuildableReference>
6140
</MacroExpansion>
6241
<AdditionalOptions>
@@ -66,7 +45,6 @@
6645
buildConfiguration = "Debug"
6746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
6847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
69-
language = ""
7048
launchStyle = "0"
7149
useCustomWorkingDirectory = "NO"
7250
ignoresPersistentStateOnLaunch = "NO"
@@ -80,7 +58,7 @@
8058
BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
8159
BuildableName = "Example.app"
8260
BlueprintName = "Example"
83-
ReferencedContainer = "container:RxDataSources.xcodeproj">
61+
ReferencedContainer = "container:Example.xcodeproj">
8462
</BuildableReference>
8563
</BuildableProductRunnable>
8664
<AdditionalOptions>
@@ -99,7 +77,7 @@
9977
BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
10078
BuildableName = "Example.app"
10179
BlueprintName = "Example"
102-
ReferencedContainer = "container:RxDataSources.xcodeproj">
80+
ReferencedContainer = "container:Example.xcodeproj">
10381
</BuildableReference>
10482
</BuildableProductRunnable>
10583
</ProfileAction>

‎Examples/Example.xcodeproj/xcshareddata/xcschemes/ExampleUITests.xcscheme

Lines changed: 2 additions & 4 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 = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -10,7 +10,6 @@
1010
buildConfiguration = "Debug"
1111
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
1212
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
13-
language = ""
1413
shouldUseLaunchSchemeArgsEnv = "YES">
1514
<Testables>
1615
<TestableReference
@@ -20,7 +19,7 @@
2019
BlueprintIdentifier = "C8984CB01C36B723001E4272"
2120
BuildableName = "ExampleUITests.xctest"
2221
BlueprintName = "ExampleUITests"
23-
ReferencedContainer = "container:RxDataSources.xcodeproj">
22+
ReferencedContainer = "container:Example.xcodeproj">
2423
</BuildableReference>
2524
</TestableReference>
2625
</Testables>
@@ -31,7 +30,6 @@
3130
buildConfiguration = "Debug"
3231
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3332
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
34-
language = ""
3533
launchStyle = "0"
3634
useCustomWorkingDirectory = "NO"
3735
ignoresPersistentStateOnLaunch = "NO"

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

Lines changed: 4 additions & 6 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 = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -17,7 +17,7 @@
1717
BlueprintIdentifier = "C8984C591C36AF35001E4272"
1818
BuildableName = "RxDataSources.framework"
1919
BlueprintName = "RxDataSources"
20-
ReferencedContainer = "container:RxDataSources.xcodeproj">
20+
ReferencedContainer = "container:Example.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
2323
</BuildActionEntries>
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -37,7 +36,6 @@
3736
buildConfiguration = "Debug"
3837
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3938
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
40-
language = ""
4139
launchStyle = "0"
4240
useCustomWorkingDirectory = "NO"
4341
ignoresPersistentStateOnLaunch = "NO"
@@ -50,7 +48,7 @@
5048
BlueprintIdentifier = "C8984C591C36AF35001E4272"
5149
BuildableName = "RxDataSources.framework"
5250
BlueprintName = "RxDataSources"
53-
ReferencedContainer = "container:RxDataSources.xcodeproj">
51+
ReferencedContainer = "container:Example.xcodeproj">
5452
</BuildableReference>
5553
</MacroExpansion>
5654
<AdditionalOptions>
@@ -68,7 +66,7 @@
6866
BlueprintIdentifier = "C8984C591C36AF35001E4272"
6967
BuildableName = "RxDataSources.framework"
7068
BlueprintName = "RxDataSources"
71-
ReferencedContainer = "container:RxDataSources.xcodeproj">
69+
ReferencedContainer = "container:Example.xcodeproj">
7270
</BuildableReference>
7371
</MacroExpansion>
7472
</ProfileAction>

‎Examples/Example.xcodeproj/xcshareddata/xcschemes/Tests.xcscheme

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

0 commit comments

Comments
 (0)