Update xcode project for xcode 9

.travis.yml

@@ -1,23 +1,31 @@
-osx_image: xcode8.3
 language: objective-c
-rvm:
-- 2.2
+osx_image: xcode8.3
+matrix:
+  include:
+    - osx_image: xcode8.3
+      env: PLATFORM="iOS"
+    - osx_image: xcode8.3
+      env: PLATFORM="tvOS"
+    - osx_image: xcode8.3
+      env: PLATFORM="macOS"
+    - osx_image: xcode9
+      env: PLATFORM="iOS"
+    - osx_image: xcode9
+      env: PLATFORM="tvOS"
+    - osx_image: xcode9
+      env: PLATFORM="macOS"
 env:
   global:
-  - LANG=en_US.UTF-8
-  - secure: HRl5Cg3/LmTJYCSDGtV8Fiqf6OgWXR6C5YkNviOElU9YmcCTvnmE7MCm+gK8hJNIQ2mWCBTlxTC7jJxeYlx0D+JQ6IhRc75B4zXgbtth6HCzlvhWDcBbNU/K+JPDjy2EAoVgvf8Xseq6GqM4WcVg2Pwr9PS3aaH/SKDE6yVoPXRM2wXRAxIdxayqm/RQgG88jAKgg+Ub5DKW/c9NLLbUf/WdY9SgQDJtqeZCMv7G3/IzW34KZgVPsqSrPByzZXbf7KgYkYLQlscH4mcUctk1qxhdCae//zcgUZo/utpXWbPXQqtvDpuqrg9IRvoGxa/D1I7dLSJsVnk4aP7RW18vn4HJ82C2AiEp+lU2TQE9y5lXcGssZVIa5aZNTWL90HVer3Kg6AnHffvdCSZ/UHsMZJFURUXL9fRIlWVGuEDeQOqlV6lUmEtp/BiEdV4D5PuCyT6snsmEwkc51goyqh6uS6XhJyqYEQdxdoybznwp91tVmASsRybppIGHTkcWN5csF4zQt40tEwd8LoqM+bBUo0wxKiKsNsecL4JA+YDYs2saZY9U3s8jAaIon+qDu071fPRaPEvBhYHYDhy4cTvBXibyGUYGHkrgLu0w19wDfHcJKt2In58yOmaCCLNoTGp/ZLNVRyZ8VDlj/NdJ2dWpMsL2Aj7OxU065kCL2FlvuRU=
-  matrix:
-  - PLATFORM="iOS"
-  - PLATFORM="tvOS"
-  - PLATFORM="macOS"
+    - LANG=en_US.UTF-8
+    - secure: HRl5Cg3/LmTJYCSDGtV8Fiqf6OgWXR6C5YkNviOElU9YmcCTvnmE7MCm+gK8hJNIQ2mWCBTlxTC7jJxeYlx0D+JQ6IhRc75B4zXgbtth6HCzlvhWDcBbNU/K+JPDjy2EAoVgvf8Xseq6GqM4WcVg2Pwr9PS3aaH/SKDE6yVoPXRM2wXRAxIdxayqm/RQgG88jAKgg+Ub5DKW/c9NLLbUf/WdY9SgQDJtqeZCMv7G3/IzW34KZgVPsqSrPByzZXbf7KgYkYLQlscH4mcUctk1qxhdCae//zcgUZo/utpXWbPXQqtvDpuqrg9IRvoGxa/D1I7dLSJsVnk4aP7RW18vn4HJ82C2AiEp+lU2TQE9y5lXcGssZVIa5aZNTWL90HVer3Kg6AnHffvdCSZ/UHsMZJFURUXL9fRIlWVGuEDeQOqlV6lUmEtp/BiEdV4D5PuCyT6snsmEwkc51goyqh6uS6XhJyqYEQdxdoybznwp91tVmASsRybppIGHTkcWN5csF4zQt40tEwd8LoqM+bBUo0wxKiKsNsecL4JA+YDYs2saZY9U3s8jAaIon+qDu071fPRaPEvBhYHYDhy4cTvBXibyGUYGHkrgLu0w19wDfHcJKt2In58yOmaCCLNoTGp/ZLNVRyZ8VDlj/NdJ2dWpMsL2Aj7OxU065kCL2FlvuRU=
 cache:
-- bundler
+  - bundler
 before_install:
-- brew update
-- brew upgrade carthage || true
-- carthage version
-- carthage bootstrap --platform $PLATFORM
+  - brew update
+  - brew upgrade carthage || true
+  - carthage version
+  - carthage bootstrap --platform $PLATFORM
 script:
-- bundle exec rake ci[$PLATFORM]
+  - bundle exec rake ci[$PLATFORM]
 after_success:
-- bash <(curl -s https://codecov.io/bash)
+  - bash <(curl -s https://codecov.io/bash)

Cartfile.resolved

@@ -1 +1 @@
-github "facebook/ios-snapshot-test-case" "c1808fb4435ffc3db2203e7623935f39fc31aa8f"
+github "facebook/ios-snapshot-test-case" "ed4e6a6e81bfb69a5223156e6c3d389a416cf6e3"

Charts.xcodeproj/xcshareddata/xcschemes/Charts.xcscheme

@@ -1,101 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
+            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
             buildForProfiling = "YES"
-            buildForArchiving = "YES"
-            buildForAnalyzing = "YES">
+            buildForArchiving = "YES">
             <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F231D8110E600722320"
-               BuildableName = "Charts.framework"
-               BlueprintName = "Charts"
-               ReferencedContainer = "container:Charts.xcodeproj">
+               BuildableIdentifier = 'primary'
+               BlueprintIdentifier = 'A58A4ED274A941CA248EA921'
+               BlueprintName = 'Charts'
+               ReferencedContainer = 'container:Charts.xcodeproj'
+               BuildableName = 'Charts.framework'>
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
-      codeCoverageEnabled = "YES">
+      buildConfiguration = "Debug"
+      codeCoverageEnabled = "NO">
+      <AdditionalOptions>
+      </AdditionalOptions>
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F2D1D8110E600722320"
-               BuildableName = "ChartsTests.xctest"
-               BlueprintName = "ChartsTests"
-               ReferencedContainer = "container:Charts.xcodeproj">
+               BuildableIdentifier = 'primary'
+               BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
+               BlueprintName = 'ChartsTests'
+               ReferencedContainer = 'container:Charts.xcodeproj'
+               BuildableName = 'ChartsTests.xctest'>
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F231D8110E600722320"
-            BuildableName = "Charts.framework"
-            BlueprintName = "Charts"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F231D8110E600722320"
-            BuildableName = "Charts.framework"
-            BlueprintName = "Charts"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
       <EnvironmentVariables>
          <EnvironmentVariable
-            key = "FB_REFERENCE_IMAGE_DIR"
-            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
-            isEnabled = "YES">
+            key = 'FB_REFERENCE_IMAGE_DIR'
+            value = '$(SOURCE_ROOT)/Tests/ReferenceImages'
+            isEnabled = 'YES'>
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F231D8110E600722320"
-            BuildableName = "Charts.framework"
-            BlueprintName = "Charts"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      debugDocumentVersioning = "YES"
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

Charts.xcodeproj/xcshareddata/xcschemes/ChartsTests.xcscheme

@@ -1,92 +1,74 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0820"
+   LastUpgradeVersion = "0700"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
       buildImplicitDependencies = "YES">
       <BuildActionEntries>
          <BuildActionEntry
+            buildForAnalyzing = "YES"
             buildForTesting = "YES"
             buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "NO">
+            buildForProfiling = "YES"
+            buildForArchiving = "YES">
             <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F2D1D8110E600722320"
-               BuildableName = "ChartsTests.xctest"
-               BlueprintName = "ChartsTests"
-               ReferencedContainer = "container:Charts.xcodeproj">
+               BuildableIdentifier = 'primary'
+               BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
+               BlueprintName = 'ChartsTests'
+               ReferencedContainer = 'container:Charts.xcodeproj'
+               BuildableName = 'ChartsTests.xctest'>
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES"
+      buildConfiguration = "Debug"
       codeCoverageEnabled = "YES">
+      <AdditionalOptions>
+      </AdditionalOptions>
       <Testables>
          <TestableReference
             skipped = "NO">
             <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "06165F2D1D8110E600722320"
-               BuildableName = "ChartsTests.xctest"
-               BlueprintName = "ChartsTests"
-               ReferencedContainer = "container:Charts.xcodeproj">
+               BuildableIdentifier = 'primary'
+               BlueprintIdentifier = 'F2749BD5443C1CB5FE2080C2'
+               BlueprintName = 'ChartsTests'
+               ReferencedContainer = 'container:Charts.xcodeproj'
+               BuildableName = 'ChartsTests.xctest'>
             </BuildableReference>
          </TestableReference>
       </Testables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       launchStyle = "0"
       useCustomWorkingDirectory = "NO"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
+      buildConfiguration = "Debug"
       allowLocationSimulation = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F2D1D8110E600722320"
-            BuildableName = "ChartsTests.xctest"
-            BlueprintName = "ChartsTests"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      <AdditionalOptions>
+      </AdditionalOptions>
       <EnvironmentVariables>
          <EnvironmentVariable
-            key = "FB_REFERENCE_IMAGE_DIR"
-            value = "$(SOURCE_ROOT)/Tests/ReferenceImages"
-            isEnabled = "YES">
+            key = 'FB_REFERENCE_IMAGE_DIR'
+            value = '$(SOURCE_ROOT)/Tests/ReferenceImages'
+            isEnabled = 'YES'>
          </EnvironmentVariable>
       </EnvironmentVariables>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
-      buildConfiguration = "Release"
-      shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      debugDocumentVersioning = "YES">
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "06165F2D1D8110E600722320"
-            BuildableName = "ChartsTests.xctest"
-            BlueprintName = "ChartsTests"
-            ReferencedContainer = "container:Charts.xcodeproj">
-         </BuildableReference>
-      </MacroExpansion>
+      debugDocumentVersioning = "YES"
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES">
    </ProfileAction>
    <AnalyzeAction
       buildConfiguration = "Debug">

FrameworkSpec

@@ -0,0 +1,62 @@
+language = swift("3.0")
+platforms = [
+  macos("10.11"),
+  ios("8.0"),
+  tvos("9.0")
+]
+
+test_platforms = [
+  ios("8.0"),
+  tvos("9.0")
+]
+
+environment_variables = {
+  "FB_REFERENCE_IMAGE_DIR": "$(SOURCE_ROOT)/Tests/ReferenceImages"
+}
+
+build_dependencies = new_script do |script|
+  script.name = "Build Dependencies"
+  script.script = "exec \"${SRCROOT}/scripts/build-dependencies.sh\""
+end
+
+charts_tests = new_target do |target|
+  target.name = "ChartsTests"
+  target.platforms = test_platforms
+  target.language = language
+  target.info_plist = "Tests/Supporting Files/Info.plist"
+  target.bundle_id = "com.dcg.ChartsTests"
+  target.include_files = ["Tests/**/*.swift"]
+  target.exclude_files = []
+  target.resource_files = ["Tests/**/*.xcassets"]
+  target.dependencies = [
+    "Charts",
+    "FBSnapshotTestCase"
+  ]
+  target.type = :unit_test_bundle
+  target.enable_code_coverage = true
+  target.pre_build_scripts = [
+    build_dependencies
+  ]
+  target.environment_variables = environment_variables
+end
+
+charts = new_target do |target|
+  target.name = "Charts"
+  target.platforms = platforms
+  target.language = language
+  target.info_plist = "Source/Supporting Files/Info.plist"
+  target.bundle_id = "com.dcg.Charts"
+  target.header = "Source/Supporting Files/Charts.h"
+  target.include_files = ["Source/Charts/**/*.swift"]
+  target.exclude_files = []
+  target.is_safe_for_extensions = true
+  target.test_target = charts_tests
+  target.environment_variables = environment_variables
+end
+
+project.name = "Charts"
+project.scripts_directory = "scripts"
+project.targets = [
+  charts,
+  charts_tests
+]

Rakefile

@@ -84,8 +84,6 @@ def run_xcodebuild(schemes_to_execute, tasks, destination, is_test, xcprety_args
   schemes_to_execute.each do |scheme|
     xcodebuild type, project_name, scheme, configuration, sdk, device, tasks, xcprety_args
   end
-
-  sh 'killall Simulator' if is_test
 end
 
 def execute(tasks, platform, xcprety_args: '')