-
-
Notifications
You must be signed in to change notification settings - Fork 6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from danielgindi/master
Update
- Loading branch information
Showing
347 changed files
with
81,883 additions
and
4,163 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| osx_image: xcode7.2 | ||
| language: objective-c | ||
|
|
||
| env: | ||
| global: | ||
| - LANG=en_US.UTF-8 | ||
|
|
||
| cache: | ||
| - bundler | ||
|
|
||
| before_install: | ||
| - brew update | ||
| - cd Charts && carthage bootstrap | ||
|
|
||
| script: | ||
| - rake test | ||
|
|
||
| # after_success: | ||
| # - bash <(curl -s https://codecov.io/bash) |
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,24 @@ | ||
| Pod::Spec.new do |s| | ||
| s.name = "Charts" | ||
| s.version = "2.1.5" | ||
| s.summary = "ios-charts is a powerful & easy to use chart library for iOS" | ||
| s.version = "2.2.3" | ||
| s.summary = "ios-charts is a powerful & easy to use chart library for iOS, tvOS and OSX" | ||
| s.homepage = "https://github.com/danielgindi/ios-charts" | ||
| 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.osx.deployment_target = "10.11" | ||
| 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" | ||
| s.default_subspec = "Core" | ||
| s.prepare_command = "sed -i '' -e 's/import Charts//g' ChartsRealm/Classes/**/*.swift" | ||
|
|
||
| s.subspec "Core" do |ss| | ||
| ss.source_files = "Charts/Classes/**/*.swift" | ||
| end | ||
|
|
||
| s.subspec "Realm" do |ss| | ||
| ss.source_files = "ChartsRealm/Classes/**/*.swift" | ||
| ss.dependency "Charts/Core" | ||
| ss.dependency "RealmSwift", "~> 0.97" | ||
| end | ||
| end |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| github "facebook/ios-snapshot-test-case" ~> 2.0 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1 @@ | ||
| github "facebook/ios-snapshot-test-case" "2.0.7" |
Large diffs are not rendered by default.
Oops, something went wrong.
80 changes: 80 additions & 0 deletions
80
Charts/Charts.xcodeproj/xcshareddata/xcschemes/Charts-OSX.xcscheme
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <Scheme | ||
| LastUpgradeVersion = "0720" | ||
| version = "1.3"> | ||
| <BuildAction | ||
| parallelizeBuildables = "YES" | ||
| buildImplicitDependencies = "YES"> | ||
| <BuildActionEntries> | ||
| <BuildActionEntry | ||
| buildForTesting = "YES" | ||
| buildForRunning = "YES" | ||
| buildForProfiling = "YES" | ||
| buildForArchiving = "YES" | ||
| buildForAnalyzing = "YES"> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "65B3F5BE1C7370BE000983D0" | ||
| BuildableName = "Charts.framework" | ||
| BlueprintName = "Charts-OSX" | ||
| ReferencedContainer = "container:Charts.xcodeproj"> | ||
| </BuildableReference> | ||
| </BuildActionEntry> | ||
| </BuildActionEntries> | ||
| </BuildAction> | ||
| <TestAction | ||
| buildConfiguration = "Debug" | ||
| selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
| selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
| shouldUseLaunchSchemeArgsEnv = "YES"> | ||
| <Testables> | ||
| </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" | ||
| allowLocationSimulation = "YES"> | ||
| <MacroExpansion> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "65B3F5BE1C7370BE000983D0" | ||
| BuildableName = "Charts.framework" | ||
| BlueprintName = "Charts-OSX" | ||
| ReferencedContainer = "container:Charts.xcodeproj"> | ||
| </BuildableReference> | ||
| </MacroExpansion> | ||
| <AdditionalOptions> | ||
| </AdditionalOptions> | ||
| </LaunchAction> | ||
| <ProfileAction | ||
| buildConfiguration = "Release" | ||
| shouldUseLaunchSchemeArgsEnv = "YES" | ||
| savedToolIdentifier = "" | ||
| useCustomWorkingDirectory = "NO" | ||
| debugDocumentVersioning = "YES"> | ||
| <MacroExpansion> | ||
| <BuildableReference | ||
| BuildableIdentifier = "primary" | ||
| BlueprintIdentifier = "65B3F5BE1C7370BE000983D0" | ||
| BuildableName = "Charts.framework" | ||
| BlueprintName = "Charts-OSX" | ||
| ReferencedContainer = "container:Charts.xcodeproj"> | ||
| </BuildableReference> | ||
| </MacroExpansion> | ||
| </ProfileAction> | ||
| <AnalyzeAction | ||
| buildConfiguration = "Debug"> | ||
| </AnalyzeAction> | ||
| <ArchiveAction | ||
| buildConfiguration = "Release" | ||
| revealArchiveInOrganizer = "YES"> | ||
| </ArchiveAction> | ||
| </Scheme> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.