diff --git a/AutoLayoutDSL.podspec b/AutoLayoutDSL.podspec index 5a58b86..3135ae1 100644 --- a/AutoLayoutDSL.podspec +++ b/AutoLayoutDSL.podspec @@ -1,6 +1,6 @@ Pod::Spec.new do |s| s.name = "AutoLayoutDSL" - s.version = "0.1.0" + s.version = "0.1.1" s.summary = "A straightforward DSL for specifying Cocoa Auto Layout constraints." s.description = <<-DESC AutoLayoutDSL allows you to turn this: @@ -28,7 +28,7 @@ Pod::Spec.new do |s| s.requires_arc = true s.source_files = 'Classes' s.resources = 'Assets' - s.dependency 'BlocksKit', '~> 1.8' + s.dependency 'BlocksKit', '~> 2.0' s.xcconfig = { 'CLANG_CXX_LANGUAGE_STANDARD' => 'c++11', 'CLANG_CXX_LIBRARY' => 'libc++' diff --git a/Classes/ConstraintGroup.mm b/Classes/ConstraintGroup.mm index 0ca63ea..0b7c4e0 100644 --- a/Classes/ConstraintGroup.mm +++ b/Classes/ConstraintGroup.mm @@ -31,7 +31,7 @@ NSString *ConstraintGroup::groupName() { - return [_groups reduce:nil withBlock:^id(NSString *groupName, NSString *groupItem) + return [_groups bk_reduce:nil withBlock:^id(NSString *groupName, NSString *groupItem) { return groupName ? [groupName stringByAppendingFormat:@".%@", groupItem] : groupItem; }]; diff --git a/Classes/NSObject+AutoLayoutDSL.m b/Classes/NSObject+AutoLayoutDSL.m index 3611890..1c4b1b1 100644 --- a/Classes/NSObject+AutoLayoutDSL.m +++ b/Classes/NSObject+AutoLayoutDSL.m @@ -5,7 +5,7 @@ // Copyright 2013 David Whetstone. All rights reserved. // -#import +#import static void * const kLayoutIDKey; @@ -13,12 +13,12 @@ @implementation NSObject (AutoLayoutDSL) - (void)setLayoutID:(NSString *)layoutID { - [self associateValue:layoutID withKey:&kLayoutIDKey]; + [self bk_associateValue:layoutID withKey:&kLayoutIDKey]; } - (NSString *)layoutID { - return [self associatedValueForKey:&kLayoutIDKey]; + return [self bk_associatedValueForKey:&kLayoutIDKey]; } @end diff --git a/Project/Podfile.lock b/Project/Podfile.lock new file mode 100644 index 0000000..a91c8f9 --- /dev/null +++ b/Project/Podfile.lock @@ -0,0 +1,34 @@ +PODS: + - BlocksKit (2.0.0): + - BlocksKit/All + - BlocksKit/All (2.0.0): + - BlocksKit/Core + - BlocksKit/DynamicDelegate + - BlocksKit/MessageUI + - BlocksKit/UIKit + - BlocksKit/Core (2.0.0) + - BlocksKit/DynamicDelegate (2.0.0): + - libffi + - BlocksKit/MessageUI (2.0.0): + - BlocksKit/DynamicDelegate + - BlocksKit/UIKit (2.0.0): + - BlocksKit/DynamicDelegate + - Kiwi (2.2.3): + - Kiwi/SenTestingKit + - Kiwi/ARC (2.2.3) + - Kiwi/NonARC (2.2.3) + - Kiwi/SenTestingKit (2.2.3): + - Kiwi/ARC + - Kiwi/NonARC + - libffi (3.0.13) + +DEPENDENCIES: + - BlocksKit (~> 2.0) + - Kiwi + +SPEC CHECKSUMS: + BlocksKit: b29ee3f28ba06a09f5c64987314ce5b75b2c3962 + Kiwi: 04c51e880831d291748ec702d42c4101f7eb95c9 + libffi: 64ef39353e747bb2b25e1026afd96a157bf9231c + +COCOAPODS: 0.29.0