Skip to content

Swift 2.3 #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
aufflick wants to merge 5 commits into from
Closed

Swift 2.3 #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ce89f87
Preliminary podspec
aufflick May 20, 2016
b9b7f71
Single change required for swift 2.3 compatibility
aufflick Sep 27, 2016
e2fbb14
Added osx to podspec
aufflick Oct 26, 2016
3aaa377
Added osx to podspec
aufflick Oct 26, 2016
ccc8529
AppKit and UIKit have different optionality for firstItem in Swift 2.3
aufflick Oct 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions Sources/SwiftAutoLayout.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public extension LayoutRegion {
}

public extension View {
public var baseline: LayoutItem<YAxis> { return layoutItem(self, .Baseline) }
public var baseline: LayoutItem<YAxis> { return layoutItem(self, .LastBaseline) }

@available(iOS 8.0, OSX 10.11, *)
public var firstBaseline: LayoutItem<YAxis> { return layoutItem(self, .FirstBaseline) }
Expand Down Expand Up @@ -149,7 +149,11 @@ public extension UIView {
infix operator ~ { associativity left precedence 120 }

public func ~(lhs: NSLayoutConstraint, rhs: LayoutPriority) -> NSLayoutConstraint {
let newConstraint = NSLayoutConstraint(item: lhs.firstItem, attribute: lhs.firstAttribute, relatedBy: lhs.relation, toItem: lhs.secondItem, attribute: lhs.secondAttribute, multiplier: lhs.multiplier, constant: lhs.constant)
#if os(OSX)
let newConstraint = NSLayoutConstraint(item: lhs.firstItem!, attribute: lhs.firstAttribute, relatedBy: lhs.relation, toItem: lhs.secondItem, attribute: lhs.secondAttribute, multiplier: lhs.multiplier, constant: lhs.constant)
#else
let newConstraint = NSLayoutConstraint(item: lhs.firstItem, attribute: lhs.firstAttribute, relatedBy: lhs.relation, toItem: lhs.secondItem, attribute: lhs.secondAttribute, multiplier: lhs.multiplier, constant: lhs.constant)
#endif
newConstraint.priority = rhs
return newConstraint
}
14 changes: 14 additions & 0 deletions SwiftAutoLayout.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
Pod::Spec.new do |s|
s.name = "SwiftAutoLayout"
s.version = "1.0.0"
s.summary = "Tiny Swift SDL for Autolayout"
s.homepage = "https://github.com/indragiek/SwiftAutoLayout"
s.author = { "Indragie Karunatne" => "i@indragie.com" }
s.license = "MIT"
s.ios.deployment_target = "8.0"
s.osx.deployment_target = "10.9"
s.source = { :git => "https://github.com/indragiek/SwiftAutoLayout.git", :tag => "#{s.version}" }
s.source_files = "Sources/*.{swift}"
s.ios.framework = "UIKit"
s.osx.framework = "Cocoa"
end