diff --git a/Sources/SwiftAutoLayout.swift b/Sources/SwiftAutoLayout.swift index a781a17..8857b40 100644 --- a/Sources/SwiftAutoLayout.swift +++ b/Sources/SwiftAutoLayout.swift @@ -108,7 +108,7 @@ public extension LayoutRegion { } public extension View { - public var baseline: LayoutItem { return layoutItem(self, .Baseline) } + public var baseline: LayoutItem { return layoutItem(self, .LastBaseline) } @available(iOS 8.0, OSX 10.11, *) public var firstBaseline: LayoutItem { return layoutItem(self, .FirstBaseline) } @@ -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 } diff --git a/SwiftAutoLayout.podspec b/SwiftAutoLayout.podspec new file mode 100644 index 0000000..10f139c --- /dev/null +++ b/SwiftAutoLayout.podspec @@ -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