Skip to content
This repository has been archived by the owner on Jan 13, 2022. It is now read-only.

Commit

Permalink
Merge with master;
Browse files Browse the repository at this point in the history
  • Loading branch information
Antondomashnev committed May 23, 2016
2 parents 068f680 + 212db43 commit 804df9d
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
7 changes: 4 additions & 3 deletions FBSnapshotTestCase.podspec
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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|
Expand Down
8 changes: 4 additions & 4 deletions FBSnapshotTestCaseDemo/Podfile.lock
Original file line number Diff line number Diff line change
@@ -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:
Expand Down

0 comments on commit 804df9d

Please sign in to comment.