Merge remote-tracking branch 'danielgindi/master'

.gitignore

@@ -1,6 +1,15 @@
+# OS X
+.DS_Store
+
 # Xcode
 #
+# gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
+
+## Build generated
 build/
+DerivedData/
+
+## Various settings
 *.pbxuser
 !default.pbxuser
 *.mode1v3
@@ -9,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

.travis.yml

@@ -1,19 +1,23 @@
-osx_image: xcode7.2
+osx_image: xcode8.2
 language: objective-c
-
+rvm:
+- 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"
 cache:
-  - bundler
-
+- bundler
 before_install:
-  - brew update
-  - cd Charts && carthage bootstrap
-
+- brew update
+- brew upgrade carthage || true
+- carthage version
+- travis_wait carthage bootstrap --platform $PLATFORM
 script:
-  - rake test
-
-# after_success:
-#   - bash <(curl -s https://codecov.io/bash)
+- bundle exec rake ci[$PLATFORM]
+after_success:
+- bash <(curl -s https://codecov.io/bash)

CONTRIBUTING.md

@@ -31,7 +31,7 @@ If you are reporting a bug which can be observed visually, please add to your is
 ````
     First line must be up to 50 chars (Fixes #1234)
 
-    The first line should be a short statement as to what have changed, and should also include an issue number, prefixed with a dash.
+    The first line should be a short statement as to what have changed, and should also include an issue number, prefixed with a hash.
     The body of the message comes after an empty new line, and describes the changes
     more thoroughly, especially if there was a special case handled there,
     or maybe some trickery that only code wizards can understand.

Cartfile.private

@@ -0,0 +1 @@
+github "facebook/ios-snapshot-test-case" "master"

Cartfile.resolved

@@ -0,0 +1 @@
+github "facebook/ios-snapshot-test-case" "c1808fb4435ffc3db2203e7623935f39fc31aa8f"

Carthage.xcconfig

@@ -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)

Charts.podspec

@@ -1,24 +1,17 @@
 Pod::Spec.new do |s|
   s.name = "Charts"
-  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.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" }
   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 = { :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.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"
+    ss.source_files  = "Source/Charts/**/*.swift"
   end
 end