mirrors
/
SnapKit
mirror of https://github.com/SnapKit/SnapKit
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #212 from nickskull/develop 

Update deprecated code to Swift 2.2
This commit is contained in:
Robert Payne 2016-03-24 11:03:21 +13:00
parent 1ca48df9b1 afe3db62b4
commit 39e754c5af
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -1,5 +1,5 @@
language: objective-c language: objective-c
osx_image: xcode7 osx_image: xcode7.3
branches: branches:
only: only:
- master - master

8
Source/View+SnapKit.swift
View File

@ -127,7 +127,7 @@ public extension View {
:returns: the constraints made :returns: the constraints made
*/ */
public func snp_prepareConstraints(file: String = __FILE__, line: UInt = __LINE__, @noescape closure: (make: ConstraintMaker) -> Void) -> [Constraint] { public func snp_prepareConstraints(file: String = #file, line: UInt = #line, @noescape closure: (make: ConstraintMaker) -> Void) -> [Constraint] {
return ConstraintMaker.prepareConstraints(view: self, file: file, line: line, closure: closure) return ConstraintMaker.prepareConstraints(view: self, file: file, line: line, closure: closure)
} }
@ -136,7 +136,7 @@ public extension View {
:param: closure that will be passed the `ConstraintMaker` to make the constraints with :param: closure that will be passed the `ConstraintMaker` to make the constraints with
*/ */
public func snp_makeConstraints(file: String = __FILE__, line: UInt = __LINE__, @noescape closure: (make: ConstraintMaker) -> Void) -> Void { public func snp_makeConstraints(file: String = #file, line: UInt = #line, @noescape closure: (make: ConstraintMaker) -> Void) -> Void {
ConstraintMaker.makeConstraints(view: self, file: file, line: line, closure: closure) ConstraintMaker.makeConstraints(view: self, file: file, line: line, closure: closure)
} }
@ -147,7 +147,7 @@ public extension View {
:param: closure that will be passed the `ConstraintMaker` to update the constraints with :param: closure that will be passed the `ConstraintMaker` to update the constraints with
*/ */
public func snp_updateConstraints(file: String = __FILE__, line: UInt = __LINE__, @noescape closure: (make: ConstraintMaker) -> Void) -> Void { public func snp_updateConstraints(file: String = #file, line: UInt = #line, @noescape closure: (make: ConstraintMaker) -> Void) -> Void {
ConstraintMaker.updateConstraints(view: self, file: file, line: line, closure: closure) ConstraintMaker.updateConstraints(view: self, file: file, line: line, closure: closure)
} }
@ -156,7 +156,7 @@ public extension View {
:param: closure that will be passed the `ConstraintMaker` to remake the constraints with :param: closure that will be passed the `ConstraintMaker` to remake the constraints with
*/ */
public func snp_remakeConstraints(file: String = __FILE__, line: UInt = __LINE__, @noescape closure: (make: ConstraintMaker) -> Void) -> Void { public func snp_remakeConstraints(file: String = #file, line: UInt = #line, @noescape closure: (make: ConstraintMaker) -> Void) -> Void {
ConstraintMaker.remakeConstraints(view: self, file: file, line: line, closure: closure) ConstraintMaker.remakeConstraints(view: self, file: file, line: line, closure: closure)
} }