瀏覽代碼

update xcode project for xcode 9

Pierre-Marc Airoldi 8 年之前
父節點
當前提交
f6525a0443

文件差異過大導致無法顯示
+ 515 - 521
Charts.xcodeproj/project.pbxproj


+ 7 - 24
Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    version = "1.3">
    <BuildAction
    <BuildAction
       parallelizeBuildables = "YES"
       parallelizeBuildables = "YES"
@@ -14,7 +14,7 @@
             buildForAnalyzing = "YES">
             buildForAnalyzing = "YES">
             <BuildableReference
             <BuildableReference
                BuildableIdentifier = "primary"
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F231D8110E600722320"
+               BlueprintIdentifier = "5FE6E04B0BD1A05295AA30D4"
                BuildableName = "Charts.framework"
                BuildableName = "Charts.framework"
                BlueprintName = "Charts"
                BlueprintName = "Charts"
                ReferencedContainer = "container:Charts.xcodeproj">
                ReferencedContainer = "container:Charts.xcodeproj">
@@ -26,29 +26,20 @@
       buildConfiguration = "Debug"
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      language = ""
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       <Testables>
          <TestableReference
          <TestableReference
             skipped = "NO">
             skipped = "NO">
             <BuildableReference
             <BuildableReference
                BuildableIdentifier = "primary"
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F2D1D8110E600722320"
+               BlueprintIdentifier = "FA416F5A67B98B3910AC1D86"
                BuildableName = "ChartsTests.xctest"
                BuildableName = "ChartsTests.xctest"
                BlueprintName = "ChartsTests"
                BlueprintName = "ChartsTests"
                ReferencedContainer = "container:Charts.xcodeproj">
                ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
             </BuildableReference>
          </TestableReference>
          </TestableReference>
       </Testables>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F231D8110E600722320"
-            BuildableName = "Charts.framework"
-            BlueprintName = "Charts"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
       <AdditionalOptions>
       <AdditionalOptions>
       </AdditionalOptions>
       </AdditionalOptions>
    </TestAction>
    </TestAction>
@@ -56,6 +47,7 @@
       buildConfiguration = "Debug"
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -65,7 +57,7 @@
       <MacroExpansion>
       <MacroExpansion>
          <BuildableReference
          <BuildableReference
             BuildableIdentifier = "primary"
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F231D8110E600722320"
+            BlueprintIdentifier = "5FE6E04B0BD1A05295AA30D4"
             BuildableName = "Charts.framework"
             BuildableName = "Charts.framework"
             BlueprintName = "Charts"
             BlueprintName = "Charts"
             ReferencedContainer = "container:Charts.xcodeproj">
             ReferencedContainer = "container:Charts.xcodeproj">
@@ -87,15 +79,6 @@
       savedToolIdentifier = ""
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F231D8110E600722320"
-            BuildableName = "Charts.framework"
-            BlueprintName = "Charts"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    </ProfileAction>
    <AnalyzeAction
    <AnalyzeAction
       buildConfiguration = "Debug">
       buildConfiguration = "Debug">

+ 9 - 16
Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0900"
    version = "1.3">
    version = "1.3">
    <BuildAction
    <BuildAction
       parallelizeBuildables = "YES"
       parallelizeBuildables = "YES"
@@ -9,12 +9,12 @@
          <BuildActionEntry
          <BuildActionEntry
             buildForTesting = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
             <BuildableReference
             <BuildableReference
                BuildableIdentifier = "primary"
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F2D1D8110E600722320"
+               BlueprintIdentifier = "FA416F5A67B98B3910AC1D86"
                BuildableName = "ChartsTests.xctest"
                BuildableName = "ChartsTests.xctest"
                BlueprintName = "ChartsTests"
                BlueprintName = "ChartsTests"
                ReferencedContainer = "container:Charts.xcodeproj">
                ReferencedContainer = "container:Charts.xcodeproj">
@@ -26,6 +26,7 @@
       buildConfiguration = "Debug"
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       shouldUseLaunchSchemeArgsEnv = "YES"
       shouldUseLaunchSchemeArgsEnv = "YES"
       codeCoverageEnabled = "YES">
       codeCoverageEnabled = "YES">
       <Testables>
       <Testables>
@@ -33,7 +34,7 @@
             skipped = "NO">
             skipped = "NO">
             <BuildableReference
             <BuildableReference
                BuildableIdentifier = "primary"
                BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F2D1D8110E600722320"
+               BlueprintIdentifier = "FA416F5A67B98B3910AC1D86"
                BuildableName = "ChartsTests.xctest"
                BuildableName = "ChartsTests.xctest"
                BlueprintName = "ChartsTests"
                BlueprintName = "ChartsTests"
                ReferencedContainer = "container:Charts.xcodeproj">
                ReferencedContainer = "container:Charts.xcodeproj">
@@ -47,6 +48,7 @@
       buildConfiguration = "Debug"
       buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      language = ""
       launchStyle = "0"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       ignoresPersistentStateOnLaunch = "NO"
@@ -56,7 +58,7 @@
       <MacroExpansion>
       <MacroExpansion>
          <BuildableReference
          <BuildableReference
             BuildableIdentifier = "primary"
             BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F2D1D8110E600722320"
+            BlueprintIdentifier = "FA416F5A67B98B3910AC1D86"
             BuildableName = "ChartsTests.xctest"
             BuildableName = "ChartsTests.xctest"
             BlueprintName = "ChartsTests"
             BlueprintName = "ChartsTests"
             ReferencedContainer = "container:Charts.xcodeproj">
             ReferencedContainer = "container:Charts.xcodeproj">
@@ -78,15 +80,6 @@
       savedToolIdentifier = ""
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
       useCustomWorkingDirectory = "NO"
       debugDocumentVersioning = "YES">
       debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F2D1D8110E600722320"
-            BuildableName = "ChartsTests.xctest"
-            BlueprintName = "ChartsTests"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
    </ProfileAction>
    </ProfileAction>
    <AnalyzeAction
    <AnalyzeAction
       buildConfiguration = "Debug">
       buildConfiguration = "Debug">

+ 0 - 0
Charts/ChartsTests/Media.xcassets/Contents.json → Tests/Supporting Files/Media.xcassets/Contents.json


+ 0 - 0
Charts/ChartsTests/Media.xcassets/icon.imageset/Contents.json → Tests/Supporting Files/Media.xcassets/icon.imageset/Contents.json


+ 0 - 0
Charts/ChartsTests/Media.xcassets/icon.imageset/star-1.png → Tests/Supporting Files/Media.xcassets/icon.imageset/star-1.png


+ 0 - 0
Charts/ChartsTests/Media.xcassets/icon.imageset/star-2.png → Tests/Supporting Files/Media.xcassets/icon.imageset/star-2.png


+ 0 - 0
Charts/ChartsTests/Media.xcassets/icon.imageset/star.png → Tests/Supporting Files/Media.xcassets/icon.imageset/star.png


+ 1 - 1
scripts/copy-carthage-frameworks.sh

@@ -11,7 +11,7 @@ esac
 for (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do
 for (( n = 0; n < SCRIPT_INPUT_FILE_COUNT; n++ )); do
     VAR=SCRIPT_INPUT_FILE_$n
     VAR=SCRIPT_INPUT_FILE_$n
     framework=$(basename "${!VAR}")
     framework=$(basename "${!VAR}")
-    export SCRIPT_INPUT_FILE_$n="$SRCROOT"/Carthage/Build/$plat/"$framework".framework
+    export SCRIPT_INPUT_FILE_$n="$SRCROOT"/Carthage/Build/$plat/"$framework"
 done
 done
 
 
 /usr/local/bin/carthage copy-frameworks || exit
 /usr/local/bin/carthage copy-frameworks || exit

部分文件因文件數量過多而無法顯示