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

Revert "Merge Swift 3 into master" #191

Merged
merged 1 commit into from
Sep 22, 2016
Merged

Conversation

nscoding
Copy link
Contributor

Reverts #189 to cut a spec and satisfy #190

@nscoding nscoding merged commit 3161d05 into master Sep 22, 2016
@ghost ghost added the CLA Signed label Sep 22, 2016
@yas375
Copy link
Contributor

yas375 commented Sep 22, 2016

This seem like a very weird thing to do!!
You are reverting Swift 3.0 work from master because there is a guy who doesn't like to point to a commit in their Podfile. This is ridiculous!

You can just have a version of library which works good for both Swift 2.3 and Swift 3.0 as all other libraries do. This is what #if swift(>=3) for.

@nscoding
Copy link
Contributor Author

@yas375 hey, I will reapply it and cut a new spec with 2.1.4, I should have cut 2.1.3 before merging the swift 3 branch.

@nscoding
Copy link
Contributor Author

This will be done with #194, sorry for the inconvenience.

@nscoding nscoding deleted the revert-189-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)
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