Merge pull request #1 from danielgindi/master

Merge

Charts.podspec

@@ -1,12 +1,12 @@
 Pod::Spec.new do |s|
   s.name = "Charts"
-  s.version = "2.1.5"
+  s.version = "2.1.6"
   s.summary = "ios-charts is a powerful & easy to use chart library for iOS"
   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.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"
 end

Charts/Cartfile.private

@@ -0,0 +1 @@
+github "facebook/ios-snapshot-test-case" ~> 2.0

Charts/Cartfile.resolved

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

Charts/Carthage/Checkouts/ios-snapshot-test-case/.gitignore

@@ -0,0 +1,18 @@
+.DS_Store
+*/build/*
+*.pbxuser
+!default.pbxuser
+*.mode1v3
+!default.mode1v3
+*.mode2v3
+!default.mode2v3
+*.perspectivev3
+!default.perspectivev3
+xcuserdata
+profile
+*.moved-aside
+DerivedData
+.idea/
+*.hmap
+*.xccheckout
+Pods

Charts/Carthage/Checkouts/ios-snapshot-test-case/.travis.yml

@@ -0,0 +1,6 @@
+language: objective-c
+osx_image: xcode7
+before_script:
+  - gem install cocoapods -v 0.37.2 --no-ri --no-rdoc
+script:
+  ./build.sh

Charts/Carthage/Checkouts/ios-snapshot-test-case/CHANGELOG.md

@@ -0,0 +1,50 @@
+# Change Log
+
+All notable changes to this project will be documented in this file.
+
+## 2.0.7
+
+  - Change FBSnapshotTestController from private to public (#129)
+
+## 2.0.6
+
+  - Added modulemap and podspec fixes to build with Xcode 7.1 (#127)
+
+## 2.0.5
+
+  - Swift 2.0 (#111, #120) (Thanks to @pietbrauer and @grantjk)
+  - Fix pod spec by disabling bitcode (#115) (Thanks to @soleares)
+  - Fix for incorrect errors with multiple suffixes (#119) (Thanks to @Grubas7)
+  - Support for Model and OS in image names (#121 thanks to @esttorhe)
+
+## 2.0.4
+
+  - Support loading reference images from the test bundle (#104) (Thanks to @yiding)
+  - Fix for retina tolerance comparisons (#107)
+
+## 2.0.3
+
+  - New property added `usesDrawViewHierarchyInRect` to handle cases like `UIVisualEffect` (#70), `UIAppearance` (#91) and Size Classes (#92) (#100)
+
+## 2.0.2
+
+  - Fix for retina comparisons (#96) 
+
+## 2.0.1
+
+  - Allow usage of Objective-C subspec only, for projects supporting iOS 7 (#93) (Thanks to @x2on)
+
+## 2.0.0
+
+  - Approximate comparison (#88) (Thanks to @nap-sam-dean)
+  - Swift support (#87) (Thanks to @pietbrauer)
+
+## 1.8.1
+
+  - Prevent mangling of C function names when compiled with a C++ compiler. (#79)
+
+## 1.8.0
+
+  - The default directories for snapshots images are now **ReferenceImages_32** (32bit) and **ReferenceImages_64** (64bit) and the suffix depends on the architecture when the test is running. (#77) 
+  	- If a test fails for a given suffix, it will try to load and compare all other suffixes before failing.
+  - Added assertion on setRecordMode. (#76)

Charts/Carthage/Checkouts/ios-snapshot-test-case/Carthage/Build

@@ -0,0 +1 @@
+../../../../Carthage/Build

Charts/Carthage/Checkouts/ios-snapshot-test-case/FBSnapshotTestCase.podspec

@@ -0,0 +1,32 @@
+Pod::Spec.new do |s|
+  s.name         = "FBSnapshotTestCase"
+  s.version      = "2.0.7"
+  s.summary      = "Snapshot view unit tests for iOS"
+  s.description  = <<-DESC
+                    A "snapshot test case" takes a configured UIView or CALayer
+                    and uses the renderInContext: method to get an image snapshot
+                    of its contents. It compares this snapshot to a "reference image"
+                    stored in your source code repository and fails the test if the
+                    two images don't match.
+                   DESC
+  s.homepage     = "https://github.com/facebook/ios-snapshot-test-case"
+  s.license      = 'BSD'
+  s.author       = 'Facebook'
+  s.source       = { :git => "https://github.com/facebook/ios-snapshot-test-case.git",
+                     :tag => s.version.to_s }
+  s.platform     = :ios, '7.0'
+  s.requires_arc = true
+  s.frameworks    = 'XCTest','UIKit','Foundation','QuartzCore'
+  s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
+  s.default_subspecs = 'SwiftSupport'
+  s.module_map = 'FBSnapshotTestCase.modulemap'
+  s.subspec 'Core' do |cs|
+    cs.source_files = 'FBSnapshotTestCase/**/*.{h,m}', 'FBSnapshotTestCase/*.{h,m}'
+    cs.public_header_files = 'FBSnapshotTestCase/FBSnapshotTestCase.h','FBSnapshotTestCase/FBSnapshotTestCasePlatform.h','FBSnapshotTestCase/FBSnapshotTestController.h'
+    cs.private_header_files = 'FBSnapshotTestCase/Categories/UIImage+Compare.h','FBSnapshotTestCase/Categories/UIImage+Diff.h','FBSnapshotTestCase/Categories/UIImage+Snapshot.h'
+  end
+  s.subspec 'SwiftSupport' do |cs|
+    cs.dependency 'FBSnapshotTestCase/Core'
+    cs.source_files = 'FBSnapshotTestCase/**/*.swift'
+  end
+end