Skip to content

Commit 6a849f5

Browse files
andersioandersio
authored
Xcode 10 compatibility (#8)
* Standalone FlexibleDiff targets for macOS, iOS and tvOS. * Update Nimble and Quick. * /flatMap/compactMap/ * Move CI to Xcode 10. * Update CI config. * Update CI config again. * Disable "Find Implicit Dependencies".
1 parent 4e582a5 commit 6a849f5

File tree

11 files changed

+1133
-183
lines changed

11 files changed

+1133
-183
lines changed

‎.travis.yml‎

Lines changed: 6 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: objective-c
2-
osx_image: xcode9
2+
osx_image: xcode10
33
install: true
44
branches:
55
only:
@@ -14,53 +14,26 @@ cache:
1414

1515
jobs:
1616
include:
17-
- osx_image: xcode9
17+
- osx_image: xcode10
1818
script:
19-
- XCODE_SCHEME=FlexibleDiff
19+
- XCODE_SCHEME=FlexibleDiff-macOS
2020
XCODE_SDK=macosx
2121
XCODE_ACTION="build test"
2222
XCODE_DESTINATION="arch=x86_64"
2323
script/build
24-
- XCODE_SCHEME=FlexibleDiff
24+
- XCODE_SCHEME=FlexibleDiff-iOS
2525
XCODE_SDK=iphonesimulator
2626
XCODE_ACTION="build-for-testing test-without-building"
2727
XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 6s"
2828
script/build
29-
- XCODE_SCHEME=FlexibleDiff
29+
- XCODE_SCHEME=FlexibleDiff-tvOS
3030
XCODE_SDK=appletvsimulator
3131
XCODE_ACTION="build-for-testing test-without-building"
3232
XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV"
3333
script/build
34-
- XCODE_SCHEME=FlexibleDiff
35-
XCODE_SDK=watchsimulator
36-
XCODE_ACTION=build
37-
XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch Series 3 - 38mm"
38-
script/build
39-
- osx_image: xcode9.3beta
40-
script:
41-
- XCODE_SCHEME=FlexibleDiff
42-
XCODE_SDK=macosx
43-
XCODE_ACTION="build test"
44-
XCODE_DESTINATION="arch=x86_64"
45-
script/build
46-
- XCODE_SCHEME=FlexibleDiff
47-
XCODE_SDK=iphonesimulator
48-
XCODE_ACTION="build-for-testing test-without-building"
49-
XCODE_DESTINATION="platform=iOS Simulator,name=iPhone 6s"
50-
script/build
51-
- XCODE_SCHEME=FlexibleDiff
52-
XCODE_SDK=appletvsimulator
53-
XCODE_ACTION="build-for-testing test-without-building"
54-
XCODE_DESTINATION="platform=tvOS Simulator,name=Apple TV"
55-
script/build
56-
- XCODE_SCHEME=FlexibleDiff
57-
XCODE_SDK=watchsimulator
58-
XCODE_ACTION=build
59-
XCODE_DESTINATION="platform=watchOS Simulator,name=Apple Watch Series 3 - 38mm"
60-
script/build
6134
- script:
6235
- pod repo update --silent
63-
- pod lib lint FlexibleDiff.podspec
36+
- pod lib lint FlexibleDiff.podspec --use-libraries
6437
env:
6538
- JOB=PODSPEC
6639
- stage: carthage

‎Cartfile.resolved‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
github "Quick/Nimble" "v7.0.2"
2-
github "Quick/Quick" "v1.2.0"
3-
github "jspahrsummers/xcconfigs" "0.11"
1+
github "Quick/Nimble" "v7.3.1"
2+
github "Quick/Quick" "v1.3.2"
3+
github "jspahrsummers/xcconfigs" "0.12"

‎Carthage/Checkouts/Nimble‎

Submodule Nimble updated 105 files

‎Carthage/Checkouts/Quick‎

Submodule Quick updated 54 files

‎Carthage/Checkouts/xcconfigs‎

‎FlexibleDiff.xcodeproj/project.pbxproj‎

Lines changed: 821 additions & 132 deletions
Large diffs are not rendered by default.

FlexibleDiff.xcodeproj/xcshareddata/xcschemes/FlexibleDiff.xcscheme renamed to FlexibleDiff.xcodeproj/xcshareddata/xcschemes/FlexibleDiff-iOS.xcscheme

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0900"
3+
LastUpgradeVersion = "1000"
44
version = "1.3">
55
<BuildAction
6-
parallelizeBuildables = "YES"
7-
buildImplicitDependencies = "YES">
6+
parallelizeBuildables = "NO"
7+
buildImplicitDependencies = "NO">
88
<BuildActionEntries>
99
<BuildActionEntry
1010
buildForTesting = "YES"
@@ -16,26 +16,53 @@
1616
BuildableIdentifier = "primary"
1717
BlueprintIdentifier = "9A4CCB171F95DEF000ACF758"
1818
BuildableName = "FlexibleDiff.framework"
19-
BlueprintName = "FlexibleDiff"
19+
BlueprintName = "FlexibleDiff-iOS"
2020
ReferencedContainer = "container:FlexibleDiff.xcodeproj">
2121
</BuildableReference>
2222
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "NO"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "NO">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "1F1A74281940169200FFFC47"
32+
BuildableName = "Nimble.framework"
33+
BlueprintName = "Nimble-iOS"
34+
ReferencedContainer = "container:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
<BuildActionEntry
38+
buildForTesting = "YES"
39+
buildForRunning = "NO"
40+
buildForProfiling = "NO"
41+
buildForArchiving = "NO"
42+
buildForAnalyzing = "NO">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "5A5D117B19473F2100F6D13D"
46+
BuildableName = "Quick.framework"
47+
BlueprintName = "Quick-iOS"
48+
ReferencedContainer = "container:Carthage/Checkouts/Quick/Quick.xcodeproj">
49+
</BuildableReference>
50+
</BuildActionEntry>
2351
</BuildActionEntries>
2452
</BuildAction>
2553
<TestAction
2654
buildConfiguration = "Debug"
2755
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2856
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3057
shouldUseLaunchSchemeArgsEnv = "YES">
3158
<Testables>
3259
<TestableReference
3360
skipped = "NO">
3461
<BuildableReference
3562
BuildableIdentifier = "primary"
36-
BlueprintIdentifier = "9A4CCB4B1F95E18900ACF758"
63+
BlueprintIdentifier = "65F8C21621836A8E00924657"
3764
BuildableName = "FlexibleDiffTests.xctest"
38-
BlueprintName = "FlexibleDiffTests"
65+
BlueprintName = "FlexibleDiffTests-iOS"
3966
ReferencedContainer = "container:FlexibleDiff.xcodeproj">
4067
</BuildableReference>
4168
</TestableReference>
@@ -45,7 +72,7 @@
4572
BuildableIdentifier = "primary"
4673
BlueprintIdentifier = "9A4CCB171F95DEF000ACF758"
4774
BuildableName = "FlexibleDiff.framework"
48-
BlueprintName = "FlexibleDiff"
75+
BlueprintName = "FlexibleDiff-iOS"
4976
ReferencedContainer = "container:FlexibleDiff.xcodeproj">
5077
</BuildableReference>
5178
</MacroExpansion>
@@ -56,7 +83,6 @@
5683
buildConfiguration = "Debug"
5784
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5885
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
59-
language = ""
6086
launchStyle = "0"
6187
useCustomWorkingDirectory = "NO"
6288
ignoresPersistentStateOnLaunch = "NO"
@@ -68,7 +94,7 @@
6894
BuildableIdentifier = "primary"
6995
BlueprintIdentifier = "9A4CCB171F95DEF000ACF758"
7096
BuildableName = "FlexibleDiff.framework"
71-
BlueprintName = "FlexibleDiff"
97+
BlueprintName = "FlexibleDiff-iOS"
7298
ReferencedContainer = "container:FlexibleDiff.xcodeproj">
7399
</BuildableReference>
74100
</MacroExpansion>
@@ -86,7 +112,7 @@
86112
BuildableIdentifier = "primary"
87113
BlueprintIdentifier = "9A4CCB171F95DEF000ACF758"
88114
BuildableName = "FlexibleDiff.framework"
89-
BlueprintName = "FlexibleDiff"
115+
BlueprintName = "FlexibleDiff-iOS"
90116
ReferencedContainer = "container:FlexibleDiff.xcodeproj">
91117
</BuildableReference>
92118
</MacroExpansion>

‎FlexibleDiff.xcodeproj/xcshareddata/xcschemes/FlexibleDiff-macOS.xcscheme‎

Lines changed: 127 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
LastUpgradeVersion = "1000"
4+
version = "1.3">
5+
<BuildAction
6+
parallelizeBuildables = "NO"
7+
buildImplicitDependencies = "NO">
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 = "65F8C1CD2183699500924657"
18+
BuildableName = "FlexibleDiff.framework"
19+
BlueprintName = "FlexibleDiff-macOS"
20+
ReferencedContainer = "container:FlexibleDiff.xcodeproj">
21+
</BuildableReference>
22+
</BuildActionEntry>
23+
<BuildActionEntry
24+
buildForTesting = "YES"
25+
buildForRunning = "NO"
26+
buildForProfiling = "NO"
27+
buildForArchiving = "NO"
28+
buildForAnalyzing = "NO">
29+
<BuildableReference
30+
BuildableIdentifier = "primary"
31+
BlueprintIdentifier = "1F925EAC195C0D6300ED456B"
32+
BuildableName = "Nimble.framework"
33+
BlueprintName = "Nimble-macOS"
34+
ReferencedContainer = "container:Carthage/Checkouts/Nimble/Nimble.xcodeproj">
35+
</BuildableReference>
36+
</BuildActionEntry>
37+
<BuildActionEntry
38+
buildForTesting = "YES"
39+
buildForRunning = "NO"
40+
buildForProfiling = "NO"
41+
buildForArchiving = "NO"
42+
buildForAnalyzing = "NO">
43+
<BuildableReference
44+
BuildableIdentifier = "primary"
45+
BlueprintIdentifier = "DAEB6B8D1943873100289F44"
46+
BuildableName = "Quick.framework"
47+
BlueprintName = "Quick-macOS"
48+
ReferencedContainer = "container:Carthage/Checkouts/Quick/Quick.xcodeproj">
49+
</BuildableReference>
50+
</BuildActionEntry>
51+
</BuildActionEntries>
52+
</BuildAction>
53+
<TestAction
54+
buildConfiguration = "Debug"
55+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
56+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
57+
shouldUseLaunchSchemeArgsEnv = "YES">
58+
<Testables>
59+
<TestableReference
60+
skipped = "NO">
61+
<BuildableReference
62+
BuildableIdentifier = "primary"
63+
BlueprintIdentifier = "65F8C23421836AB200924657"
64+
BuildableName = "FlexibleDiffTests.xctest"
65+
BlueprintName = "FlexibleDiffTests-macOS"
66+
ReferencedContainer = "container:FlexibleDiff.xcodeproj">
67+
</BuildableReference>
68+
</TestableReference>
69+
</Testables>
70+
<MacroExpansion>
71+
<BuildableReference
72+
BuildableIdentifier = "primary"
73+
BlueprintIdentifier = "65F8C1CD2183699500924657"
74+
BuildableName = "FlexibleDiff.framework"
75+
BlueprintName = "FlexibleDiff-macOS"
76+
ReferencedContainer = "container:FlexibleDiff.xcodeproj">
77+
</BuildableReference>
78+
</MacroExpansion>
79+
<AdditionalOptions>
80+
</AdditionalOptions>
81+
</TestAction>
82+
<LaunchAction
83+
buildConfiguration = "Debug"
84+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
85+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
86+
launchStyle = "0"
87+
useCustomWorkingDirectory = "NO"
88+
ignoresPersistentStateOnLaunch = "NO"
89+
debugDocumentVersioning = "YES"
90+
debugServiceExtension = "internal"
91+
allowLocationSimulation = "YES">
92+
<MacroExpansion>
93+
<BuildableReference
94+
BuildableIdentifier = "primary"
95+
BlueprintIdentifier = "65F8C1CD2183699500924657"
96+
BuildableName = "FlexibleDiff.framework"
97+
BlueprintName = "FlexibleDiff-macOS"
98+
ReferencedContainer = "container:FlexibleDiff.xcodeproj">
99+
</BuildableReference>
100+
</MacroExpansion>
101+
<AdditionalOptions>
102+
</AdditionalOptions>
103+
</LaunchAction>
104+
<ProfileAction
105+
buildConfiguration = "Release"
106+
shouldUseLaunchSchemeArgsEnv = "YES"
107+
savedToolIdentifier = ""
108+
useCustomWorkingDirectory = "NO"
109+
debugDocumentVersioning = "YES">
110+
<MacroExpansion>
111+
<BuildableReference
112+
BuildableIdentifier = "primary"
113+
BlueprintIdentifier = "65F8C1CD2183699500924657"
114+
BuildableName = "FlexibleDiff.framework"
115+
BlueprintName = "FlexibleDiff-macOS"
116+
ReferencedContainer = "container:FlexibleDiff.xcodeproj">
117+
</BuildableReference>
118+
</MacroExpansion>
119+
</ProfileAction>
120+
<AnalyzeAction
121+
buildConfiguration = "Debug">
122+
</AnalyzeAction>
123+
<ArchiveAction
124+
buildConfiguration = "Release"
125+
revealArchiveInOrganizer = "YES">
126+
</ArchiveAction>
127+
</Scheme>

0 commit comments

Comments
 (0)