Merge pull request #501 from petester42/simplified-targets

update targets to build framework with same name
ChartsOrg · Oct 24, 2015 · e9743d5 · e9743d5
2 parents dbc0db6 + 91bb0cb
commit e9743d5
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 141 deletions.
diff --git a/Charts.podspec b/Charts.podspec
@@ -6,7 +6,7 @@ Pod::Spec.new do |s|
   s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
   s.authors = "Daniel Cohen Gindi", "Philipp Jahoda"
   s.ios.deployment_target = "8.0"
+  s.tvos.deployment_target = "9.0"
   s.source = { :git => "https://github.com/danielgindi/ios-charts.git", :tag => "v#{s.version}" }
   s.source_files = "Classes", "Charts/Classes/**/*.swift"
-  s.frameworks = "Foundation", "UIKit", "CoreGraphics"
 end
diff --git a/Charts/Charts.xcodeproj/project.pbxproj b/Charts/Charts.xcodeproj/project.pbxproj
diff --git a/.../xcshareddata/xcschemes/ChartsTV.xcscheme → ...xcshareddata/xcschemes/Charts-TV.xcscheme b/.../xcshareddata/xcschemes/ChartsTV.xcscheme → ...xcshareddata/xcschemes/Charts-TV.xcscheme
@@ -15,8 +15,8 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
-               BuildableName = "ChartsTV.framework"
-               BlueprintName = "ChartsTV"
+               BuildableName = "Charts.framework"
+               BlueprintName = "Charts-TV"
                ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
@@ -46,8 +46,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
-            BuildableName = "ChartsTV.framework"
-            BlueprintName = "ChartsTV"
+            BuildableName = "Charts.framework"
+            BlueprintName = "Charts-TV"
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
@@ -64,8 +64,8 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
-            BuildableName = "ChartsTV.framework"
-            BlueprintName = "ChartsTV"
+            BuildableName = "Charts.framework"
+            BlueprintName = "Charts-TV"
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/...oj/xcshareddata/xcschemes/Charts.xcscheme → ...cshareddata/xcschemes/Charts-iOS.xcscheme b/...oj/xcshareddata/xcschemes/Charts.xcscheme → ...cshareddata/xcschemes/Charts-iOS.xcscheme
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0700"
+   LastUpgradeVersion = "0710"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"
@@ -16,51 +16,28 @@
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
                BuildableName = "Charts.framework"
-               BlueprintName = "Charts"
-               ReferencedContainer = "container:Charts.xcodeproj">
-            </BuildableReference>
-         </BuildActionEntry>
-         <BuildActionEntry
-            buildForTesting = "YES"
-            buildForRunning = "YES"
-            buildForProfiling = "NO"
-            buildForArchiving = "NO"
-            buildForAnalyzing = "YES">
-            <BuildableReference
-               BuildableIdentifier = "primary"
-               BlueprintIdentifier = "5BA8EC4A1A9D14DC00CE82E1"
-               BuildableName = "ChartsTests.xctest"
-               BlueprintName = "ChartsTests"
+               BlueprintName = "Charts-iOS"
                ReferencedContainer = "container:Charts.xcodeproj">
             </BuildableReference>
          </BuildActionEntry>
       </BuildActionEntries>
    </BuildAction>
    <TestAction
+      buildConfiguration = "Debug"
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
-      shouldUseLaunchSchemeArgsEnv = "YES"
-      buildConfiguration = "Debug">
+      shouldUseLaunchSchemeArgsEnv = "YES">
       <Testables>
       </Testables>
-      <MacroExpansion>
-         <BuildableReference
-            BuildableIdentifier = "primary"
-            BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
-            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"
-      buildConfiguration = "Debug"
       ignoresPersistentStateOnLaunch = "NO"
       debugDocumentVersioning = "YES"
       debugServiceExtension = "internal"
@@ -70,25 +47,25 @@
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
             BuildableName = "Charts.framework"
-            BlueprintName = "Charts"
+            BlueprintName = "Charts-iOS"
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
       <AdditionalOptions>
       </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
+      buildConfiguration = "Release"
       shouldUseLaunchSchemeArgsEnv = "YES"
       savedToolIdentifier = ""
       useCustomWorkingDirectory = "NO"
-      buildConfiguration = "Release"
       debugDocumentVersioning = "YES">
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
             BuildableName = "Charts.framework"
-            BlueprintName = "Charts"
+            BlueprintName = "Charts-iOS"
             ReferencedContainer = "container:Charts.xcodeproj">
          </BuildableReference>
       </MacroExpansion>

diff --git a/Charts/ChartsTV/ChartsTV.h b/Charts/ChartsTV/ChartsTV.h
diff --git a/Charts/ChartsTV/Info.plist b/Charts/ChartsTV/Info.plist