forked from ChartsOrg/Charts
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge commit '04c5820a6cca34b98cb48b8baab1dd44f44e857d' into technica…
…l/update_upstream * commit '04c5820a6cca34b98cb48b8baab1dd44f44e857d': (61 commits) add switch for clearing `lastHighlighted` in clear() (ChartsOrg#2355) update schemes, move script to file like ChartsRealm use name instead of uuid, add run script for copying missing framework for ChartsTests 1. use xcode 8.3 image 2. use Apple TV 1080p (10.2) and iPhone 7 (10.3) device id in Travis CI Fix Simple Bar Chart Demo, switch use of x and y values (ChartsOrg#2365) Converted swift 3.0 DBL_MIN leftover Removed leftover script from the combined Realm era Removed leftover scheme v3.0.2 Removed unrequited script gitignore updates Added @discardableResult to silence warnings when it’s safe to ignore result Moved Realm stuff to https://github.com/danielgindi/ChartsRealm Remove line width minimum constraint Updated build-dependencies.sh loosen realm version requirement fix Xcode 8.3 compiler warnings fix ChartsOrg#2222 move default backgroundColor to initialize() as initWithCoder also needs it Updated to use Realm version 2.4.3 Consider _yAxis.isDrawLimitLinesBehindDataEnabled for radar chart ... # Conflicts: # Source/ChartsRealm/Data/RealmBarDataSet.swift
- Loading branch information
Showing
161 changed files
with
1,181 additions
and
5,113 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 was deleted.
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,30 +1,23 @@ | ||
osx_image: xcode8 | ||
osx_image: xcode8.3 | ||
language: objective-c | ||
|
||
rvm: | ||
- 2.2 | ||
|
||
- 2.2 | ||
env: | ||
global: | ||
- LANG=en_US.UTF-8 | ||
- 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" | ||
|
||
- PLATFORM="iOS" | ||
- PLATFORM="tvOS" | ||
- PLATFORM="macOS" | ||
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) |
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 +0,0 @@ | ||
github "realm/realm-cocoa" ~> 1.1 | ||
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,2 +1 @@ | ||
github "facebook/ios-snapshot-test-case" "da629211c17a4c507e2e866e8a19ed3122af770b" | ||
github "realm/realm-cocoa" "v1.1.0" | ||
github "facebook/ios-snapshot-test-case" "c1808fb4435ffc3db2203e7623935f39fc31aa8f" |
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
Oops, something went wrong.