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

Merge Swift 3 in master #194

Merged
merged 4 commits into from
Sep 22, 2016
Merged

Merge Swift 3 in master #194

merged 4 commits into from
Sep 22, 2016

Conversation

nscoding
Copy link
Contributor

This merges the code for Swift 3 and Xcode 8 into master.

Ian Terrell and others added 4 commits August 4, 2016 14:29
This keeps support for Swift 2.x.
- Updated Swift sample code
- Podfile includes CocoaPods workaround to set SWIFT_VERSION
- Cocoapods version used is 1.0.1
- Updated reference image for slight differences in OS gradient
Merge Swift 3 branch into master
@ghost ghost added the CLA Signed label Sep 22, 2016
@nscoding nscoding merged commit f9f89db into master Sep 22, 2016
@nscoding nscoding mentioned this pull request Oct 6, 2016
@nscoding nscoding deleted the swift-beta-3 branch October 7, 2016 18:48
thorthugnasty pushed a commit to thorthugnasty/ios-snapshot-test-case that referenced this pull request Jan 26, 2017
…t-case into andrewli/add-color-tolerance

* 'master' of https://github.com/facebook/ios-snapshot-test-case:
  Fix documentation warnings (facebookarchive#205)
  Add Reference to IMAGE_DIFF_DIR (facebookarchive#201)
  Update pod version and change log (facebookarchive#199)
  Bump version to 2.1.4 (facebookarchive#198)
  Replace big macro with Objective-C method for easier debugging. (facebookarchive#180)
  Merge Swift 3 in master (facebookarchive#194)
  Fix pod verification (facebookarchive#193)
  Bump version to 2.3 (facebookarchive#192)
  Revert "Merge Swift 3 into master" (facebookarchive#191)
  Merge Swift 3 into master (facebookarchive#189)
@@ -1,5 +1,5 @@
language: objective-c
osx_image: xcode7.3

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

xcode7.3

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants