Merge with master;

Author: Antondomashnev

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to this project will be documented in this file.
 
+## 2.1.1
+
+  - Added tvOS support for cocoapods (#163)
+  - Remove custom module map for cocoapods (#141)
+
 ## 2.1.0
 
   - Changed FBSnapshotTestController from private to public in the xcodeproj (#135)

FBSnapshotTestCase.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "FBSnapshotTestCase"
-  s.version      = "2.1.0"
+  s.version      = "2.1.1"
   s.summary      = "Snapshot view unit tests for iOS"
   s.description  = <<-DESC
                     A "snapshot test case" takes a configured UIView or CALayer
@@ -14,9 +14,10 @@ Pod::Spec.new do |s|
   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.ios.deployment_target  = '7.0'
+  s.tvos.deployment_target = '9.0'
   s.requires_arc = true
-  s.frameworks    = 'XCTest','UIKit','Foundation','QuartzCore'
+  s.frameworks   = 'XCTest','UIKit','Foundation','QuartzCore'
   s.pod_target_xcconfig = { 'ENABLE_BITCODE' => 'NO' }
   s.default_subspecs = 'SwiftSupport'
   s.subspec 'Core' do |cs|

FBSnapshotTestCaseDemo/Podfile.lock

@@ -1,8 +1,8 @@
 PODS:
-  - FBSnapshotTestCase (2.1.0):
-    - FBSnapshotTestCase/SwiftSupport (= 2.1.0)
-  - FBSnapshotTestCase/Core (2.1.0)
-  - FBSnapshotTestCase/SwiftSupport (2.1.0):
+  - FBSnapshotTestCase (2.1.1):
+    - FBSnapshotTestCase/SwiftSupport (= 2.1.1)
+  - FBSnapshotTestCase/Core (2.1.1)
+  - FBSnapshotTestCase/SwiftSupport (2.1.1):
     - FBSnapshotTestCase/Core
 
 DEPENDENCIES: