Skip to content
This repository was archived by the owner on Feb 1, 2022. It is now read-only.

Commit f6525a0

Browse files
pmairoldipmairoldi
committed
update xcode project for xcode 9
1 parent 69cdd84 commit f6525a0

File tree

9 files changed

+865
-844
lines changed

9 files changed

+865
-844
lines changed

‎Charts.xcodeproj/project.pbxproj

+848-803
Large diffs are not rendered by default.

‎Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme

+7-24
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
1414
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "06165F231D8110E600722320"
17+
BlueprintIdentifier = "5FE6E04B0BD1A05295AA30D4"
1818
BuildableName = "Charts.framework"
1919
BlueprintName = "Charts"
2020
ReferencedContainer = "container:Charts.xcodeproj">
@@ -26,36 +26,28 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
shouldUseLaunchSchemeArgsEnv = "YES"
30-
codeCoverageEnabled = "YES">
29+
language = ""
30+
shouldUseLaunchSchemeArgsEnv = "YES">
3131
<Testables>
3232
<TestableReference
3333
skipped = "NO">
3434
<BuildableReference
3535
BuildableIdentifier = "primary"
36-
BlueprintIdentifier = "06165F2D1D8110E600722320"
36+
BlueprintIdentifier = "FA416F5A67B98B3910AC1D86"
3737
BuildableName = "ChartsTests.xctest"
3838
BlueprintName = "ChartsTests"
3939
ReferencedContainer = "container:Charts.xcodeproj">
4040
</BuildableReference>
4141
</TestableReference>
4242
</Testables>
43-
<MacroExpansion>
44-
<BuildableReference
45-
BuildableIdentifier = "primary"
46-
BlueprintIdentifier = "06165F231D8110E600722320"
47-
BuildableName = "Charts.framework"
48-
BlueprintName = "Charts"
49-
ReferencedContainer = "container:Charts.xcodeproj">
50-
</BuildableReference>
51-
</MacroExpansion>
5243
<AdditionalOptions>
5344
</AdditionalOptions>
5445
</TestAction>
5546
<LaunchAction
5647
buildConfiguration = "Debug"
5748
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5849
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
50+
language = ""
5951
launchStyle = "0"
6052
useCustomWorkingDirectory = "NO"
6153
ignoresPersistentStateOnLaunch = "NO"
@@ -65,7 +57,7 @@
6557
<MacroExpansion>
6658
<BuildableReference
6759
BuildableIdentifier = "primary"
68-
BlueprintIdentifier = "06165F231D8110E600722320"
60+
BlueprintIdentifier = "5FE6E04B0BD1A05295AA30D4"
6961
BuildableName = "Charts.framework"
7062
BlueprintName = "Charts"
7163
ReferencedContainer = "container:Charts.xcodeproj">
@@ -87,15 +79,6 @@
8779
savedToolIdentifier = ""
8880
useCustomWorkingDirectory = "NO"
8981
debugDocumentVersioning = "YES">
90-
<MacroExpansion>
91-
<BuildableReference
92-
BuildableIdentifier = "primary"
93-
BlueprintIdentifier = "06165F231D8110E600722320"
94-
BuildableName = "Charts.framework"
95-
BlueprintName = "Charts"
96-
ReferencedContainer = "container:Charts.xcodeproj">
97-
</BuildableReference>
98-
</MacroExpansion>
9982
</ProfileAction>
10083
<AnalyzeAction
10184
buildConfiguration = "Debug">

‎Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme

+9-16
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0820"
3+
LastUpgradeVersion = "0900"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
@@ -9,12 +9,12 @@
99
<BuildActionEntry
1010
buildForTesting = "YES"
1111
buildForRunning = "YES"
12-
buildForProfiling = "NO"
13-
buildForArchiving = "NO"
14-
buildForAnalyzing = "NO">
12+
buildForProfiling = "YES"
13+
buildForArchiving = "YES"
14+
buildForAnalyzing = "YES">
1515
<BuildableReference
1616
BuildableIdentifier = "primary"
17-
BlueprintIdentifier = "06165F2D1D8110E600722320"
17+
BlueprintIdentifier = "FA416F5A67B98B3910AC1D86"
1818
BuildableName = "ChartsTests.xctest"
1919
BlueprintName = "ChartsTests"
2020
ReferencedContainer = "container:Charts.xcodeproj">
@@ -26,14 +26,15 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29+
language = ""
2930
shouldUseLaunchSchemeArgsEnv = "YES"
3031
codeCoverageEnabled = "YES">
3132
<Testables>
3233
<TestableReference
3334
skipped = "NO">
3435
<BuildableReference
3536
BuildableIdentifier = "primary"
36-
BlueprintIdentifier = "06165F2D1D8110E600722320"
37+
BlueprintIdentifier = "FA416F5A67B98B3910AC1D86"
3738
BuildableName = "ChartsTests.xctest"
3839
BlueprintName = "ChartsTests"
3940
ReferencedContainer = "container:Charts.xcodeproj">
@@ -47,6 +48,7 @@
4748
buildConfiguration = "Debug"
4849
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4950
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
51+
language = ""
5052
launchStyle = "0"
5153
useCustomWorkingDirectory = "NO"
5254
ignoresPersistentStateOnLaunch = "NO"
@@ -56,7 +58,7 @@
5658
<MacroExpansion>
5759
<BuildableReference
5860
BuildableIdentifier = "primary"
59-
BlueprintIdentifier = "06165F2D1D8110E600722320"
61+
BlueprintIdentifier = "FA416F5A67B98B3910AC1D86"
6062
BuildableName = "ChartsTests.xctest"
6163
BlueprintName = "ChartsTests"
6264
ReferencedContainer = "container:Charts.xcodeproj">
@@ -78,15 +80,6 @@
7880
savedToolIdentifier = ""
7981
useCustomWorkingDirectory = "NO"
8082
debugDocumentVersioning = "YES">
81-
<MacroExpansion>
82-
<BuildableReference
83-
BuildableIdentifier = "primary"
84-
BlueprintIdentifier = "06165F2D1D8110E600722320"
85-
BuildableName = "ChartsTests.xctest"
86-
BlueprintName = "ChartsTests"
87-
ReferencedContainer = "container:Charts.xcodeproj">
88-
</BuildableReference>
89-
</MacroExpansion>
9083
</ProfileAction>
9184
<AnalyzeAction
9285
buildConfiguration = "Debug">

‎Charts/ChartsTests/Media.xcassets/Contents.json renamed to ‎Tests/Supporting Files/Media.xcassets/Contents.json

File renamed without changes.

‎Charts/ChartsTests/Media.xcassets/icon.imageset/Contents.json renamed to ‎Tests/Supporting Files/Media.xcassets/icon.imageset/Contents.json

File renamed without changes.

‎Charts/ChartsTests/Media.xcassets/icon.imageset/star-1.png renamed to ‎Tests/Supporting Files/Media.xcassets/icon.imageset/star-1.png

File renamed without changes.

‎Charts/ChartsTests/Media.xcassets/icon.imageset/star-2.png renamed to ‎Tests/Supporting Files/Media.xcassets/icon.imageset/star-2.png

File renamed without changes.

‎Charts/ChartsTests/Media.xcassets/icon.imageset/star.png renamed to ‎Tests/Supporting Files/Media.xcassets/icon.imageset/star.png

File renamed without changes.

‎scripts/copy-carthage-frameworks.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ esac
1111
for (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do
1212
VAR=SCRIPT_INPUT_FILE_$n
1313
framework=$(basename "${!VAR}")
14-
export SCRIPT_INPUT_FILE_$n="$SRCROOT"/Carthage/Build/$plat/"$framework".framework
14+
export SCRIPT_INPUT_FILE_$n="$SRCROOT"/Carthage/Build/$plat/"$framework"
1515
done
1616

1717
/usr/local/bin/carthage copy-frameworks || exit

0 commit comments

Comments
 (0)