Merge remote-tracking branch 'origin/develop'

This commit is contained in:
Robert Payne 2015-02-12 15:15:56 +13:00
commit 79f5ca54ca
3 changed files with 9 additions and 27 deletions

View File

@ -1,4 +1,6 @@
Preview
Beta
=======
Snap is currently in preview and regular Changelogs will be provided as it comes out of preview into production quality code.
# 0.0.6 - February 11th, 2015
* Renamed `maker` to `make` in all block APIs

View File

@ -1,12 +1,12 @@
Pod::Spec.new do |s|
s.name = 'Snap'
s.version = '0.0.5'
s.version = '0.0.6'
s.license = 'MIT'
s.summary = 'Harness the power of auto layout with a simplified, chainable, and compile time safe syntax.'
s.homepage = 'https://github.com/Masonry/Snap'
s.authors = { 'Robert Payne' => 'robertpayne@me.com' }
s.social_media_url = 'http://twitter.com/robertjpayne'
s.source = { :git => 'https://github.com/Masonry/Snap.git', :tag => '0.0.5' }
s.source = { :git => 'https://github.com/Masonry/Snap.git', :tag => '0.0.6' }
s.ios.deployment_target = '8.0'
s.osx.deployment_target = '10.9'

View File

@ -68,15 +68,15 @@ public extension View {
public var snp_centerWithinMargins: ConstraintItem { return ConstraintItem(object: self, attributes: ConstraintAttributes.CenterWithinMargins) }
#endif
public func snp_makeConstraints(block: (maker: ConstraintMaker) -> ()) {
public func snp_makeConstraints(block: (make: ConstraintMaker) -> ()) {
ConstraintMaker.makeConstraints(self, block: block)
}
public func snp_updateConstraints(block: (maker: ConstraintMaker) -> ()) {
public func snp_updateConstraints(block: (make: ConstraintMaker) -> ()) {
ConstraintMaker.updateConstraints(self, block: block)
}
public func snp_remakeConstraints(block: (maker: ConstraintMaker) -> ()) {
public func snp_remakeConstraints(block: (make: ConstraintMaker) -> ()) {
ConstraintMaker.remakeConstraints(self, block: block)
}
@ -84,26 +84,6 @@ public extension View {
ConstraintMaker.removeConstraints(self)
}
public func snp_prepareConstraints(tag: String, block: (maker: ConstraintMaker) -> ()) {
}
public func snp_enableConstraints(tag: String) {
}
public func snp_disableConstraints(tag: String) {
}
public func snp_toggleConstraints(tag: String) {
}
public func snp_removeConstraints(tag: String) {
}
// internal
internal var snp_installedLayoutConstraints: Array<LayoutConstraint> {