Skip to content

Commit

Permalink
Merge commit '04c5820a6cca34b98cb48b8baab1dd44f44e857d' into technica…
Browse files Browse the repository at this point in the history
…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
NerijusLas committed Apr 24, 2017
2 parents d2780da + 04c5820 commit bee60cb
Show file tree
Hide file tree
Showing 161 changed files with 1,181 additions and 5,113 deletions.
46 changes: 43 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@

# Xcode
#
# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore

## Build generated
build/
DerivedData/

## Various settings
*.pbxuser
!default.pbxuser
*.mode1v3
Expand All @@ -12,23 +18,57 @@ build/
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
xcuserdata/

## Other
*.xccheckout
*.moved-aside
*.xcuserstate

## Obj-C/Swift specific
DerivedData
*.hmap
*.ipa
*.xcuserstate
*.dSYM.zip
*.dSYM

## Playgrounds
timeline.xctimeline
playground.xcworkspace

# Swift Package Manager
#
# Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
# Packages/
.build/
project.xcworkspace

# CocoaPods
#
# We recommend against adding the Pods directory to your .gitignore. However
# you should judge for yourself, the pros and cons are mentioned at:
# http://guides.cocoapods.org/using/using-cocoapods.html#should-i-ignore-the-pods-directory-in-source-control
# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
#
# Pods/

# Carthage
#
# Add this line if you want to avoid checking in source code from Carthage dependencies.
# Carthage/Checkouts

Carthage/Build

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
fastlane/test_output
Carthage
Charts.framework.zip
ChartsRealm.framework.zip
1 change: 0 additions & 1 deletion .swift-version

This file was deleted.

35 changes: 14 additions & 21 deletions .travis.yml
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)
1 change: 0 additions & 1 deletion Cartfile
Original file line number Diff line number Diff line change
@@ -1 +0,0 @@
github "realm/realm-cocoa" ~> 1.1
3 changes: 1 addition & 2 deletions Cartfile.resolved
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"
8 changes: 1 addition & 7 deletions Charts.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "Charts"
s.version = "3.0.1"
s.version = "3.0.2"
s.summary = "Charts is a powerful & easy to use chart library for iOS, tvOS and OSX (and Android)"
s.homepage = "https://github.com/danielgindi/Charts"
s.license = { :type => "Apache License, Version 2.0", :file => "LICENSE" }
Expand All @@ -14,10 +14,4 @@ Pod::Spec.new do |s|
s.subspec "Core" do |ss|
ss.source_files = "Source/Charts/**/*.swift"
end

s.subspec "Realm" do |ss|
ss.source_files = "Source/ChartsRealm/**/*.swift"
ss.dependency "Charts/Core"
ss.dependency "RealmSwift", "~> 1.1"
end
end
Loading

0 comments on commit bee60cb

Please sign in to comment.