Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update targets to build framework with same name #501

Merged
merged 1 commit into from
Oct 24, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Charts.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -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
112 changes: 54 additions & 58 deletions Charts/Charts.xcodeproj/project.pbxproj

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -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>
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0700"
LastUpgradeVersion = "0710"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
Expand All @@ -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"
Expand All @@ -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>
Expand Down
19 changes: 0 additions & 19 deletions Charts/ChartsTV/ChartsTV.h

This file was deleted.

26 changes: 0 additions & 26 deletions Charts/ChartsTV/Info.plist

This file was deleted.