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.

Sign up for GitHub

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 project structure for simplicity and fixing carthage #1422

Merged
merged 22 commits into from
Sep 17, 2016
Merged

Update project structure for simplicity and fixing carthage #1422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c0a910a
add cartfile
pmairoldi Sep 7, 2016
5d443dc
working single scheme for charts
pmairoldi Sep 8, 2016
7a8f3fc
move charts and charts realm to same project
pmairoldi Sep 8, 2016
7971a6e
fix demos
pmairoldi Sep 8, 2016
bd44df9
update cocoapods to 1.0
pmairoldi Sep 9, 2016
89afdc3
update podspec source paths
pmairoldi Sep 9, 2016
4f2c69b
set ruby version to 2.2.2
pmairoldi Sep 9, 2016
0c43aa7
fix build?
pmairoldi Sep 9, 2016
bbcb7c0
update to xcode 8
pmairoldi Sep 16, 2016
c116f97
merge from master
pmairoldi Sep 17, 2016
cbc5312
set swift version
pmairoldi Sep 17, 2016
16d7374
remove Carthage.xcconfig
pmairoldi Sep 17, 2016
31a33a0
update cartfile
pmairoldi Sep 17, 2016
5371f97
update podspec
pmairoldi Sep 17, 2016
74b9597
remove chartutil
pmairoldi Sep 17, 2016
00c09aa
re-add Carthage config since search paths seem to not work from xcode
pmairoldi Sep 17, 2016
f2ccba5
update tests
pmairoldi Sep 17, 2016
06d789f
remove @3x since we never use them
pmairoldi Sep 17, 2016
0b85100
update test files
pmairoldi Sep 17, 2016
5570c38
update travis to xcode 8
pmairoldi Sep 17, 2016
4ae9fd8
update test for tvos
pmairoldi Sep 17, 2016
13834f9
Merge branch 'master' into workspacing
pmairoldi Sep 17, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
7 changes: 4 additions & 3 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
osx_image: xcode7.3
osx_image: xcode8
language: objective-c
rvm: "2.2.2"

env:
global:
Expand All @@ -10,10 +11,10 @@ cache:

before_install:
- brew update
- cd Charts && carthage bootstrap
- carthage bootstrap

script:
- rake test
- bundle exec rake test

# after_success:
# - bash <(curl -s https://codecov.io/bash)
1 change: 1 addition & 0 deletions Cartfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "realm/realm-cocoa" ~> 1.1
1 change: 1 addition & 0 deletions Cartfile.private
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "facebook/ios-snapshot-test-case" "master"
2 changes: 2 additions & 0 deletions Cartfile.resolved
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
github "facebook/ios-snapshot-test-case" "da629211c17a4c507e2e866e8a19ed3122af770b"
github "realm/realm-cocoa" "v1.1.0"
15 changes: 15 additions & 0 deletions Carthage.xcconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
//
// Carthage.xcconfig
// Charts
//
// Copyright 2015 Daniel Cohen Gindi & Philipp Jahoda
// A port of MPAndroidChart for iOS
// Licensed under Apache License 2.0
//
// https://github.com/danielgindi/Charts
//

FRAMEWORK_SEARCH_PATHS[sdk=macosx*] = $(SRCROOT)/Carthage/Build/Mac/ $(inherited)
FRAMEWORK_SEARCH_PATHS[sdk=iphone*] = $(SRCROOT)/Carthage/Build/iOS/ $(inherited)
FRAMEWORK_SEARCH_PATHS[sdk=watch*] = $(SRCROOT)/Carthage/Build/watchOS/ $(inherited)
FRAMEWORK_SEARCH_PATHS[sdk=appletv*] = $(SRCROOT)/Carthage/Build/tvOS/ $(inherited)
8 changes: 4 additions & 4 deletions Charts.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ Pod::Spec.new do |s|
s.osx.deployment_target = "10.11"
s.source = { :git => "https://github.com/danielgindi/Charts.git", :tag => "v#{s.version}" }
s.default_subspec = "Core"
s.prepare_command = "sed -i '' -e 's/import Charts//g' ChartsRealm/Classes/**/*.swift"
s.prepare_command = "sed -i '' -e 's/import Charts//g' Source/ChartsRealm/**/*.swift"

s.subspec "Core" do |ss|
ss.source_files = "Charts/Classes/**/*.swift"
ss.source_files = "Source/Charts/**/*.swift"
end

s.subspec "Realm" do |ss|
ss.source_files = "ChartsRealm/Classes/**/*.swift"
ss.source_files = "Source/ChartsRealm/**/*.swift"
ss.dependency "Charts/Core"
ss.dependency "RealmSwift", "~> 1.0.2"
ss.dependency "RealmSwift", "~> 1.1"
end
end
1,446 changes: 1,446 additions & 0 deletions Charts.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 12 additions & 11 deletions ...cshareddata/xcschemes/Charts-iOS.xcscheme → ...oj/xcshareddata/xcschemes/Charts.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
BlueprintIdentifier = "06165F231D8110E600722320"
BuildableName = "Charts.framework"
BlueprintName = "Charts-iOS"
BlueprintName = "Charts"
ReferencedContainer = "container:Charts.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -26,13 +26,14 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "06AEE7A11BDC3F8B009875AE"
BlueprintIdentifier = "06165F2D1D8110E600722320"
BuildableName = "ChartsTests.xctest"
BlueprintName = "ChartsTests"
ReferencedContainer = "container:Charts.xcodeproj">
Expand All @@ -42,9 +43,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
BlueprintIdentifier = "06165F231D8110E600722320"
BuildableName = "Charts.framework"
BlueprintName = "Charts-iOS"
BlueprintName = "Charts"
ReferencedContainer = "container:Charts.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand All @@ -64,16 +65,16 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
BlueprintIdentifier = "06165F231D8110E600722320"
BuildableName = "Charts.framework"
BlueprintName = "Charts-iOS"
BlueprintName = "Charts"
ReferencedContainer = "container:Charts.xcodeproj">
</BuildableReference>
</MacroExpansion>
<EnvironmentVariables>
<EnvironmentVariable
key = "FB_REFERENCE_IMAGE_DIR"
value = "$(SOURCE_ROOT)/$(PROJECT_NAME)Tests/ReferenceImages"
value = "$(SOURCE_ROOT)/Tests/Charts/ReferenceImages"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
Expand All @@ -89,9 +90,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "5BA8EC3F1A9D14DC00CE82E1"
BlueprintIdentifier = "06165F231D8110E600722320"
BuildableName = "Charts.framework"
BlueprintName = "Charts-iOS"
BlueprintName = "Charts"
ReferencedContainer = "container:Charts.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
47 changes: 37 additions & 10 deletions ...xcshareddata/xcschemes/Charts-TV.xcscheme → ...shareddata/xcschemes/ChartsRealm.xcscheme
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
BuildableName = "Charts.framework"
BlueprintName = "Charts-TV"
BlueprintIdentifier = "06B120D41D811E6200D14B02"
BuildableName = "ChartsRealm.framework"
BlueprintName = "ChartsRealm"
ReferencedContainer = "container:Charts.xcodeproj">
</BuildableReference>
</BuildActionEntry>
Expand All @@ -26,9 +26,29 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES">
shouldUseLaunchSchemeArgsEnv = "YES"
codeCoverageEnabled = "YES">
<Testables>
<TestableReference
skipped = "NO">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "06B120FE1D811F1600D14B02"
BuildableName = "ChartsRealmTests.xctest"
BlueprintName = "ChartsRealmTests"
ReferencedContainer = "container:Charts.xcodeproj">
</BuildableReference>
</TestableReference>
</Testables>
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "06B120D41D811E6200D14B02"
BuildableName = "ChartsRealm.framework"
BlueprintName = "ChartsRealm"
ReferencedContainer = "container:Charts.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</TestAction>
Expand All @@ -45,12 +65,19 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
BuildableName = "Charts.framework"
BlueprintName = "Charts-TV"
BlueprintIdentifier = "06B120D41D811E6200D14B02"
BuildableName = "ChartsRealm.framework"
BlueprintName = "ChartsRealm"
ReferencedContainer = "container:Charts.xcodeproj">
</BuildableReference>
</MacroExpansion>
<EnvironmentVariables>
<EnvironmentVariable
key = "FB_REFERENCE_IMAGE_DIR"
value = "$(SOURCE_ROOT)/Tests/ChartsRealm/ReferenceImages"
isEnabled = "YES">
</EnvironmentVariable>
</EnvironmentVariables>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
Expand All @@ -63,9 +90,9 @@
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A52C5C361BAC5CA400594CDD"
BuildableName = "Charts.framework"
BlueprintName = "Charts-TV"
BlueprintIdentifier = "06B120D41D811E6200D14B02"
BuildableName = "ChartsRealm.framework"
BlueprintName = "ChartsRealm"
ReferencedContainer = "container:Charts.xcodeproj">
</BuildableReference>
</MacroExpansion>
Expand Down
1 change: 0 additions & 1 deletion Charts/Cartfile.private
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion Charts/Cartfile.resolved
View file
Open in desktop

This file was deleted.

Loading