Skip to content

Commit df66818

Browse files
kzaherkzaher
committed
Fixes CI.
1 parent d1a98c3 commit df66818

File tree

4 files changed

+160
-5
lines changed

4 files changed

+160
-5
lines changed

‎.travis.yml

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

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

1919
script: eval "${BUILD}"
2020

‎Podfile

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,11 @@ target 'RxDataSources' do
66
pod 'RxCocoa', '~> 3.0'
77
end
88

9+
target 'Tests' do
10+
pod 'RxSwift', '~> 3.0'
11+
pod 'RxCocoa', '~> 3.0'
12+
end
13+
914
target 'Example' do
1015
pod 'RxSwift', '~> 3.0'
1116
pod 'RxCocoa', '~> 3.0'

‎RxDataSources.xcodeproj/project.pbxproj

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,27 @@
9696
remoteGlobalIDString = C87C345C1F36352600DB85FE;
9797
remoteInfo = Dependencies;
9898
};
99+
C85CB0C41F4349E6005CE91A /* PBXContainerItemProxy */ = {
100+
isa = PBXContainerItemProxy;
101+
containerPortal = C8984C511C36AF35001E4272 /* Project object */;
102+
proxyType = 1;
103+
remoteGlobalIDString = C87C345C1F36352600DB85FE;
104+
remoteInfo = Dependencies;
105+
};
106+
C85CB0C61F434A80005CE91A /* PBXContainerItemProxy */ = {
107+
isa = PBXContainerItemProxy;
108+
containerPortal = C8984C511C36AF35001E4272 /* Project object */;
109+
proxyType = 1;
110+
remoteGlobalIDString = C87C345C1F36352600DB85FE;
111+
remoteInfo = Dependencies;
112+
};
113+
C85CB0C81F434A83005CE91A /* PBXContainerItemProxy */ = {
114+
isa = PBXContainerItemProxy;
115+
containerPortal = C8984C511C36AF35001E4272 /* Project object */;
116+
proxyType = 1;
117+
remoteGlobalIDString = C87C345C1F36352600DB85FE;
118+
remoteInfo = Dependencies;
119+
};
99120
C87C34311F36346A00DB85FE /* PBXContainerItemProxy */ = {
100121
isa = PBXContainerItemProxy;
101122
containerPortal = C87C34191F36346A00DB85FE /* Rx.xcodeproj */;
@@ -687,6 +708,7 @@
687708
buildRules = (
688709
);
689710
dependencies = (
711+
C85CB0C51F4349E6005CE91A /* PBXTargetDependency */,
690712
);
691713
name = Tests;
692714
productName = Tests;
@@ -745,6 +767,7 @@
745767
buildRules = (
746768
);
747769
dependencies = (
770+
C85CB0C91F434A83005CE91A /* PBXTargetDependency */,
748771
C87C34651F36353B00DB85FE /* PBXTargetDependency */,
749772
C87C349C1F363B1400DB85FE /* PBXTargetDependency */,
750773
C87C34A01F363B1400DB85FE /* PBXTargetDependency */,
@@ -766,6 +789,7 @@
766789
buildRules = (
767790
);
768791
dependencies = (
792+
C85CB0C71F434A80005CE91A /* PBXTargetDependency */,
769793
C8984CB71C36B723001E4272 /* PBXTargetDependency */,
770794
);
771795
name = ExampleUITests;
@@ -1150,6 +1174,21 @@
11501174
target = C87C345C1F36352600DB85FE /* Dependencies */;
11511175
targetProxy = C82C3C9C1F3B93D900309AE8 /* PBXContainerItemProxy */;
11521176
};
1177+
C85CB0C51F4349E6005CE91A /* PBXTargetDependency */ = {
1178+
isa = PBXTargetDependency;
1179+
target = C87C345C1F36352600DB85FE /* Dependencies */;
1180+
targetProxy = C85CB0C41F4349E6005CE91A /* PBXContainerItemProxy */;
1181+
};
1182+
C85CB0C71F434A80005CE91A /* PBXTargetDependency */ = {
1183+
isa = PBXTargetDependency;
1184+
target = C87C345C1F36352600DB85FE /* Dependencies */;
1185+
targetProxy = C85CB0C61F434A80005CE91A /* PBXContainerItemProxy */;
1186+
};
1187+
C85CB0C91F434A83005CE91A /* PBXTargetDependency */ = {
1188+
isa = PBXTargetDependency;
1189+
target = C87C345C1F36352600DB85FE /* Dependencies */;
1190+
targetProxy = C85CB0C81F434A83005CE91A /* PBXContainerItemProxy */;
1191+
};
11531192
C87C34611F36353300DB85FE /* PBXTargetDependency */ = {
11541193
isa = PBXTargetDependency;
11551194
target = C87C345C1F36352600DB85FE /* Dependencies */;

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

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "0810"
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 = "C8984C9A1C36B6FA001E4272"
18+
BuildableName = "Example.app"
19+
BlueprintName = "Example"
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+
<TestableReference
32+
skipped = "NO">
33+
<BuildableReference
34+
BuildableIdentifier = "primary"
35+
BlueprintIdentifier = "C8984CB01C36B723001E4272"
36+
BuildableName = "ExampleUITests.xctest"
37+
BlueprintName = "ExampleUITests"
38+
ReferencedContainer = "container:RxDataSources.xcodeproj">
39+
</BuildableReference>
40+
</TestableReference>
41+
<TestableReference
42+
skipped = "NO">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "C81905AD1DEA019100AE679C"
46+
BuildableName = "Tests.xctest"
47+
BlueprintName = "Tests"
48+
ReferencedContainer = "container:RxDataSources.xcodeproj">
49+
</BuildableReference>
50+
</TestableReference>
51+
</Testables>
52+
<MacroExpansion>
53+
<BuildableReference
54+
BuildableIdentifier = "primary"
55+
BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
56+
BuildableName = "Example.app"
57+
BlueprintName = "Example"
58+
ReferencedContainer = "container:RxDataSources.xcodeproj">
59+
</BuildableReference>
60+
</MacroExpansion>
61+
<AdditionalOptions>
62+
</AdditionalOptions>
63+
</TestAction>
64+
<LaunchAction
65+
buildConfiguration = "Debug"
66+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
67+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
68+
launchStyle = "0"
69+
useCustomWorkingDirectory = "NO"
70+
ignoresPersistentStateOnLaunch = "NO"
71+
debugDocumentVersioning = "YES"
72+
debugServiceExtension = "internal"
73+
allowLocationSimulation = "YES">
74+
<BuildableProductRunnable
75+
runnableDebuggingMode = "0">
76+
<BuildableReference
77+
BuildableIdentifier = "primary"
78+
BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
79+
BuildableName = "Example.app"
80+
BlueprintName = "Example"
81+
ReferencedContainer = "container:RxDataSources.xcodeproj">
82+
</BuildableReference>
83+
</BuildableProductRunnable>
84+
<AdditionalOptions>
85+
</AdditionalOptions>
86+
</LaunchAction>
87+
<ProfileAction
88+
buildConfiguration = "Release"
89+
shouldUseLaunchSchemeArgsEnv = "YES"
90+
savedToolIdentifier = ""
91+
useCustomWorkingDirectory = "NO"
92+
debugDocumentVersioning = "YES">
93+
<BuildableProductRunnable
94+
runnableDebuggingMode = "0">
95+
<BuildableReference
96+
BuildableIdentifier = "primary"
97+
BlueprintIdentifier = "C8984C9A1C36B6FA001E4272"
98+
BuildableName = "Example.app"
99+
BlueprintName = "Example"
100+
ReferencedContainer = "container:RxDataSources.xcodeproj">
101+
</BuildableReference>
102+
</BuildableProductRunnable>
103+
</ProfileAction>
104+
<AnalyzeAction
105+
buildConfiguration = "Debug">
106+
</AnalyzeAction>
107+
<ArchiveAction
108+
buildConfiguration = "Release"
109+
revealArchiveInOrganizer = "YES">
110+
</ArchiveAction>
111+
</Scheme>

0 commit comments

Comments
 (0)