diff --git a/Examples/Masonry iOS Examples.xcodeproj/project.pbxproj b/Examples/Masonry iOS Examples.xcodeproj/project.pbxproj index 2c6dd0c..877bbd6 100644 --- a/Examples/Masonry iOS Examples.xcodeproj/project.pbxproj +++ b/Examples/Masonry iOS Examples.xcodeproj/project.pbxproj @@ -252,7 +252,7 @@ <key>isa</key> <string>PBXShellScriptBuildPhase</string> <key>name</key> - <string>Copy Pods Resources</string> + <string>[CP] Copy Pods Resources</string> <key>outputPaths</key> <array/> <key>runOnlyForDeploymentPostprocessing</key> @@ -276,7 +276,7 @@ <key>isa</key> <string>PBXShellScriptBuildPhase</string> <key>name</key> - <string>Check Pods Manifest.lock</string> + <string>[CP] Check Pods Manifest.lock</string> <key>outputPaths</key> <array/> <key>runOnlyForDeploymentPostprocessing</key> @@ -313,7 +313,7 @@ fi <key>isa</key> <string>PBXShellScriptBuildPhase</string> <key>name</key> - <string>Embed Pods Frameworks</string> + <string>[CP] Embed Pods Frameworks</string> <key>outputPaths</key> <array/> <key>runOnlyForDeploymentPostprocessing</key> diff --git a/Podfile.lock b/Podfile.lock index 1e2464a..9a36546 100644 --- a/Podfile.lock +++ b/Podfile.lock @@ -1,6 +1,6 @@ PODS: - - Expecta (1.0.0) - - Masonry (1.0.0) + - Expecta (1.0.5) + - Masonry (1.0.2) DEPENDENCIES: - Expecta @@ -11,7 +11,9 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024 - Masonry: b529bb169217897b6354d4b56b1fada6d475b13d + Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe + Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: a30c350a250a8af6afde1caabae52ede1d76714b + +COCOAPODS: 1.0.1 diff --git a/Pods/Expecta/Expecta/EXPDoubleTuple.m b/Pods/Expecta/Expecta/EXPDoubleTuple.m index 829e354..9ebef50 100644 --- a/Pods/Expecta/Expecta/EXPDoubleTuple.m +++ b/Pods/Expecta/Expecta/EXPDoubleTuple.m @@ -1,6 +1,9 @@ #import "EXPDoubleTuple.h" +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" @implementation EXPDoubleTuple +#pragma clang diagnostic pop @synthesize values = _values, size = _size; diff --git a/Pods/Expecta/Expecta/EXPExpect.m b/Pods/Expecta/Expecta/EXPExpect.m index 729794d..230e137 100644 --- a/Pods/Expecta/Expecta/EXPExpect.m +++ b/Pods/Expecta/Expecta/EXPExpect.m @@ -6,7 +6,10 @@ #import "EXPBlockDefinedMatcher.h" #import <libkern/OSAtomic.h> +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" @implementation EXPExpect +#pragma clang diagnostic pop @dynamic actual, @@ -42,6 +45,7 @@ - (void)dealloc { + [_actualBlock release]; _actualBlock = nil; [super dealloc]; } @@ -176,7 +180,10 @@ @end +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" @implementation EXPDynamicPredicateMatcher +#pragma clang diagnostic pop - (instancetype)initWithExpectation:(EXPExpect *)expectation selector:(SEL)selector { diff --git a/Pods/Expecta/Expecta/EXPFloatTuple.m b/Pods/Expecta/Expecta/EXPFloatTuple.m index 8e8505b..b7ccf08 100644 --- a/Pods/Expecta/Expecta/EXPFloatTuple.m +++ b/Pods/Expecta/Expecta/EXPFloatTuple.m @@ -1,6 +1,9 @@ #import "EXPFloatTuple.h" +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" @implementation EXPFloatTuple +#pragma clang diagnostic pop @synthesize values = _values, size = _size; diff --git a/Pods/Expecta/Expecta/EXPUnsupportedObject.m b/Pods/Expecta/Expecta/EXPUnsupportedObject.m index 4312bef..3d062e3 100644 --- a/Pods/Expecta/Expecta/EXPUnsupportedObject.m +++ b/Pods/Expecta/Expecta/EXPUnsupportedObject.m @@ -1,6 +1,9 @@ #import "EXPUnsupportedObject.h" +#pragma clang diagnostic push +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" @implementation EXPUnsupportedObject +#pragma clang diagnostic pop @synthesize type=_type; diff --git a/Pods/Expecta/Expecta/Expecta.h b/Pods/Expecta/Expecta/Expecta.h index 6e5188e..066e988 100644 --- a/Pods/Expecta/Expecta/Expecta.h +++ b/Pods/Expecta/Expecta/Expecta.h @@ -12,4 +12,4 @@ FOUNDATION_EXPORT const unsigned char ExpectaVersionString[]; // Enable shorthand by default #define expect(...) EXP_expect((__VA_ARGS__)) -#define failure(...) EXP_failure((__VA_ARGS__)) \ No newline at end of file +#define failure(...) EXP_failure((__VA_ARGS__)) diff --git a/Pods/Expecta/Expecta/ExpectaObject.h b/Pods/Expecta/Expecta/ExpectaObject.h index ef2a38a..e4277a9 100644 --- a/Pods/Expecta/Expecta/ExpectaObject.h +++ b/Pods/Expecta/Expecta/ExpectaObject.h @@ -1,7 +1,7 @@ #import <Foundation/Foundation.h> #define EXPObjectify(value) _EXPObjectify(@encode(__typeof__((value))), (value)) -#define EXP_expect(actual) _EXP_expect(self, __LINE__, __FILE__, ^id{ return EXPObjectify((actual)); }) +#define EXP_expect(actual) _EXP_expect(self, __LINE__, __FILE__, ^id{ __typeof__((actual)) strongActual = (actual); return EXPObjectify(strongActual); }) #define EXPMatcherInterface(matcherName, matcherArguments) _EXPMatcherInterface(matcherName, matcherArguments) #define EXPMatcherImplementationBegin(matcherName, matcherArguments) _EXPMatcherImplementationBegin(matcherName, matcherArguments) #define EXPMatcherImplementationEnd _EXPMatcherImplementationEnd diff --git a/Pods/Expecta/Expecta/ExpectaSupport.h b/Pods/Expecta/Expecta/ExpectaSupport.h index fb0ef4f..28fc5e0 100644 --- a/Pods/Expecta/Expecta/ExpectaSupport.h +++ b/Pods/Expecta/Expecta/ExpectaSupport.h @@ -53,6 +53,7 @@ EXPFixCategoriesBug(EXPMatcher##matcherName##Matcher); \ #define _EXPMatcherImplementationEnd \ } \ [self applyMatcher:matcher to:&actual]; \ + [[[NSThread currentThread] threadDictionary] removeObjectForKey:@"EXP_currentMatcher"]; \ } copy]; \ _EXP_release(matcher); \ return _EXP_autorelease(matcherBlock); \ diff --git a/Pods/Expecta/Expecta/Matchers/EXPMatchers+equal.m b/Pods/Expecta/Expecta/Matchers/EXPMatchers+equal.m index a610df0..0dc4d33 100644 --- a/Pods/Expecta/Expecta/Matchers/EXPMatchers+equal.m +++ b/Pods/Expecta/Expecta/Matchers/EXPMatchers+equal.m @@ -21,7 +21,14 @@ EXPMatcherImplementationBegin(_equal, (id expected)) { }); failureMessageForTo(^NSString *{ - return [NSString stringWithFormat:@"expected: %@, got: %@", EXPDescribeObject(expected), EXPDescribeObject(actual)]; + NSString *expectedDescription = EXPDescribeObject(expected); + NSString *actualDescription = EXPDescribeObject(actual); + + if (![expectedDescription isEqualToString:actualDescription]) { + return [NSString stringWithFormat:@"expected: %@, got: %@", EXPDescribeObject(expected), EXPDescribeObject(actual)]; + } else { + return [NSString stringWithFormat:@"expected (%@): %@, got (%@): %@", NSStringFromClass([expected class]), EXPDescribeObject(expected), NSStringFromClass([actual class]), EXPDescribeObject(actual)]; + } }); failureMessageForNotTo(^NSString *{ diff --git a/Pods/Expecta/README.md b/Pods/Expecta/README.md index c3eb648..1933707 100644 --- a/Pods/Expecta/README.md +++ b/Pods/Expecta/README.md @@ -21,7 +21,7 @@ expect(baz).to.equal(3.14159); Expecta is framework-agnostic: it works well with XCTest and XCTest-compatible test frameworks such as [Specta](http://github.com/petejkim/specta/). -## Setup +## Installation You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [CocoaPods](http://github.com/CocoaPods/CocoaPods) or [completely manually](#setting-up-manually). @@ -46,10 +46,10 @@ You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [C end target :MyAppTests do - pod 'Expecta', '~> 0.2.4' + pod 'Expecta', '~> 1.0.0' end ``` - + 2. Run `pod update` or `pod install` in your project directory. ### Setting Up Manually @@ -60,17 +60,17 @@ You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [C 4. For **OS X projects**, copy and add `Expecta.framework` in the `Products/osx` folder to your project's test target. For **iOS projects**, copy and add `Expecta.framework` in the `Products/ios` folder to your project's test target. - + You can also use `libExpecta.a` if you prefer to link Expecta as a static library — iOS 7.x and below require this. - + 6. Add `-ObjC` and `-all_load` to the **Other Linker Flags** build setting for the test target in your Xcode project. 7. You can now use Expecta in your test classes by adding the following import: ```objective-c @import Expecta; // If you're using Expecta.framework - + // OR - + #import <Expecta/Expecta.h> // If you're using the static library, or the framework ``` diff --git a/Pods/Local Podspecs/Masonry.podspec.json b/Pods/Local Podspecs/Masonry.podspec.json index 8b84e3b..39f1626 100644 --- a/Pods/Local Podspecs/Masonry.podspec.json +++ b/Pods/Local Podspecs/Masonry.podspec.json @@ -1,6 +1,6 @@ { "name": "Masonry", - "version": "1.0.0", + "version": "1.0.2", "license": "MIT", "summary": "Harness the power of Auto Layout NSLayoutConstraints with a simplified, chainable and expressive syntax.", "homepage": "https://github.com/cloudkite/Masonry", @@ -10,7 +10,7 @@ "social_media_url": "http://twitter.com/cloudkite", "source": { "git": "https://github.com/cloudkite/Masonry.git", - "tag": "v1.0.0" + "tag": "v1.0.2" }, "description": "Masonry is a light-weight layout framework which wraps AutoLayout with a nicer syntax.\nMasonry has its own layout DSL which provides a chainable way of describing your\nNSLayoutConstraints which results in layout code which is more concise and readable.\n Masonry supports iOS and Mac OSX.", "source_files": "Masonry/*.{h,m}", diff --git a/Pods/Manifest.lock b/Pods/Manifest.lock index 1e2464a..9a36546 100644 --- a/Pods/Manifest.lock +++ b/Pods/Manifest.lock @@ -1,6 +1,6 @@ PODS: - - Expecta (1.0.0) - - Masonry (1.0.0) + - Expecta (1.0.5) + - Masonry (1.0.2) DEPENDENCIES: - Expecta @@ -11,7 +11,9 @@ EXTERNAL SOURCES: :path: "./" SPEC CHECKSUMS: - Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024 - Masonry: b529bb169217897b6354d4b56b1fada6d475b13d + Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe + Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e -COCOAPODS: 0.39.0 +PODFILE CHECKSUM: a30c350a250a8af6afde1caabae52ede1d76714b + +COCOAPODS: 1.0.1 diff --git a/Pods/ObjectiveC.gcda b/Pods/ObjectiveC.gcda deleted file mode 100644 index c1b5737..0000000 Binary files a/Pods/ObjectiveC.gcda and /dev/null differ diff --git a/Pods/ObjectiveC.gcno b/Pods/ObjectiveC.gcno deleted file mode 100644 index 1f2a6fa..0000000 Binary files a/Pods/ObjectiveC.gcno and /dev/null differ diff --git a/Pods/Pods.xcodeproj/project.pbxproj b/Pods/Pods.xcodeproj/project.pbxproj index 208047b..51717c6 100644 --- a/Pods/Pods.xcodeproj/project.pbxproj +++ b/Pods/Pods.xcodeproj/project.pbxproj @@ -10,6 +10,19 @@ <string>46</string> <key>objects</key> <dict> + <key>008A5F43350B1984916B33BCAFD01149</key> + <dict> + <key>isa</key> + <string>PBXFileReference</string> + <key>lastKnownFileType</key> + <string>wrapper.framework</string> + <key>name</key> + <string>UIKit.framework</string> + <key>path</key> + <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/UIKit.framework</string> + <key>sourceTree</key> + <string>DEVELOPER_DIR</string> + </dict> <key>01B7B1098F825865196B739BF9E36C04</key> <dict> <key>includeInIndex</key> @@ -106,14 +119,20 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>03795746783FEB7886DA78C3914F0B16</key> + <key>04FB5395AFAF6DDF1ED7B654D1FC5237</key> <dict> <key>baseConfigurationReference</key> <string>EF1B79566A439B7A68A81F499EBFDDE1</string> <key>buildSettings</key> <dict> + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> + <string>iPhone Developer</string> + <key>DEBUG_INFORMATION_FORMAT</key> + <string>dwarf</string> <key>ENABLE_STRICT_OBJC_MSGSEND</key> <string>YES</string> + <key>GCC_NO_COMMON_BLOCKS</key> + <string>YES</string> <key>IPHONEOS_DEPLOYMENT_TARGET</key> <string>8.0</string> <key>MACH_O_TYPE</key> @@ -126,6 +145,8 @@ <string></string> <key>PODS_ROOT</key> <string>$(SRCROOT)</string> + <key>PRODUCT_BUNDLE_IDENTIFIER</key> + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> <key>PRODUCT_NAME</key> <string>$(TARGET_NAME)</string> <key>SDKROOT</key> @@ -153,13 +174,6 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>072295001E57DD17A014E75544C5CC3E</key> - <dict> - <key>fileRef</key> - <string>A09A7E81E94D5275573AF19B08C7093C</string> - <key>isa</key> - <string>PBXBuildFile</string> - </dict> <key>07282695806D1DFBF187BFA004D80641</key> <dict> <key>fileRef</key> @@ -227,6 +241,21 @@ </array> </dict> </dict> + <key>08EF1010060E25B5CD5BA885B03DB0EA</key> + <dict> + <key>children</key> + <array> + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> + <string>008A5F43350B1984916B33BCAFD01149</string> + <string>44E91E6A6263B0D61B049B648F6271E7</string> + </array> + <key>isa</key> + <string>PBXGroup</string> + <key>name</key> + <string>iOS</string> + <key>sourceTree</key> + <string><group></string> + </dict> <key>0A28546AD6B1C73C384E28625120AED5</key> <dict> <key>includeInIndex</key> @@ -255,6 +284,13 @@ <key>sourceTree</key> <string><group></string> </dict> + <key>0A834D048C2A012491E25113117D56A0</key> + <dict> + <key>fileRef</key> + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> + <key>isa</key> + <string>PBXBuildFile</string> + </dict> <key>0AAF8809A7BBA8A694825848A7EF07D2</key> <dict> <key>includeInIndex</key> @@ -283,6 +319,13 @@ <key>sourceTree</key> <string><group></string> </dict> + <key>0DF7EB35BC5CF15C74582F7026DA8FAC</key> + <dict> + <key>fileRef</key> + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> + <key>isa</key> + <string>PBXBuildFile</string> + </dict> <key>0F2DF08BADAA0D595D88E9A5F2F4AE8F</key> <dict> <key>includeInIndex</key> @@ -406,7 +449,7 @@ <dict> <key>children</key> <array> - <string>DECD63C15EA4A6A5E09172088586BA30</string> + <string>08EF1010060E25B5CD5BA885B03DB0EA</string> </array> <key>isa</key> <string>PBXGroup</string> @@ -599,8 +642,8 @@ <string>2147483647</string> <key>files</key> <array> - <string>66081D3480D1FA028C4DE2344BF616D4</string> - <string>69363A59A4E2FF95D6A62AA88641A20A</string> + <string>7C8990F70B3DFACC64C905887ECE29A7</string> + <string>F415F451C67C56BD2821DFDC2802FE6C</string> </array> <key>isa</key> <string>PBXFrameworksBuildPhase</string> @@ -611,8 +654,8 @@ <dict> <key>buildConfigurations</key> <array> - <string>1D72FB8E3585AC8DF5186144CB58A821</string> - <string>A9D74DD3D4F98043508191259AF0C28D</string> + <string>8EF03F0376BCC789614FBDADB0ECCD0B</string> + <string>DFB95B1AA7E6CB668B2326B1E4E78683</string> </array> <key>defaultConfigurationIsVisible</key> <string>0</string> @@ -634,40 +677,6 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>1BC29259D6F9F1A79B534F2B8B4D8363</key> - <dict> - <key>baseConfigurationReference</key> - <string>489F09523F5700F4F414FA98E0BDEEE4</string> - <key>buildSettings</key> - <dict> - <key>ENABLE_STRICT_OBJC_MSGSEND</key> - <string>YES</string> - <key>GCC_PREFIX_HEADER</key> - <string>Target Support Files/Expecta/Expecta-prefix.pch</string> - <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> - <key>MTL_ENABLE_DEBUG_INFO</key> - <string>YES</string> - <key>OTHER_LDFLAGS</key> - <string></string> - <key>OTHER_LIBTOOLFLAGS</key> - <string></string> - <key>PRIVATE_HEADERS_FOLDER_PATH</key> - <string></string> - <key>PRODUCT_NAME</key> - <string>$(TARGET_NAME)</string> - <key>PUBLIC_HEADERS_FOLDER_PATH</key> - <string></string> - <key>SDKROOT</key> - <string>iphoneos</string> - <key>SKIP_INSTALL</key> - <string>YES</string> - </dict> - <key>isa</key> - <string>XCBuildConfiguration</string> - <key>name</key> - <string>Debug</string> - </dict> <key>1C060BC1E7116BC87FA94B45087D771B</key> <dict> <key>includeInIndex</key> @@ -696,43 +705,36 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>1D20E91754698E478D6D3E468D5EC2C8</key> - <dict> - <key>includeInIndex</key> - <string>1</string> - <key>isa</key> - <string>PBXFileReference</string> - <key>lastKnownFileType</key> - <string>sourcecode.c.h</string> - <key>name</key> - <string>EXPMatchers+beNil.h</string> - <key>path</key> - <string>Expecta/Matchers/EXPMatchers+beNil.h</string> - <key>sourceTree</key> - <string><group></string> - </dict> - <key>1D72FB8E3585AC8DF5186144CB58A821</key> + <key>1C4E4899BE01820151368B07EB14F4A0</key> <dict> <key>baseConfigurationReference</key> - <string>C5ABB1C6CB3F9F99597CCF6727731A7B</string> + <string>489F09523F5700F4F414FA98E0BDEEE4</string> <key>buildSettings</key> <dict> + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> + <string>iPhone Developer</string> + <key>DEBUG_INFORMATION_FORMAT</key> + <string>dwarf-with-dsym</string> <key>ENABLE_STRICT_OBJC_MSGSEND</key> <string>YES</string> + <key>GCC_NO_COMMON_BLOCKS</key> + <string>YES</string> + <key>GCC_PREFIX_HEADER</key> + <string>Target Support Files/Expecta/Expecta-prefix.pch</string> <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> - <key>MACH_O_TYPE</key> - <string>staticlib</string> + <string>5.1.1</string> <key>MTL_ENABLE_DEBUG_INFO</key> - <string>YES</string> + <string>NO</string> <key>OTHER_LDFLAGS</key> <string></string> <key>OTHER_LIBTOOLFLAGS</key> <string></string> - <key>PODS_ROOT</key> - <string>$(SRCROOT)</string> + <key>PRIVATE_HEADERS_FOLDER_PATH</key> + <string></string> <key>PRODUCT_NAME</key> <string>$(TARGET_NAME)</string> + <key>PUBLIC_HEADERS_FOLDER_PATH</key> + <string></string> <key>SDKROOT</key> <string>iphoneos</string> <key>SKIP_INSTALL</key> @@ -741,7 +743,22 @@ <key>isa</key> <string>XCBuildConfiguration</string> <key>name</key> - <string>Debug</string> + <string>Release</string> + </dict> + <key>1D20E91754698E478D6D3E468D5EC2C8</key> + <dict> + <key>includeInIndex</key> + <string>1</string> + <key>isa</key> + <string>PBXFileReference</string> + <key>lastKnownFileType</key> + <string>sourcecode.c.h</string> + <key>name</key> + <string>EXPMatchers+beNil.h</string> + <key>path</key> + <string>Expecta/Matchers/EXPMatchers+beNil.h</string> + <key>sourceTree</key> + <string><group></string> </dict> <key>1F04D682D92E0B2B40FCE8BE214BDA61</key> <dict> @@ -929,13 +946,6 @@ </array> </dict> </dict> - <key>28C4BD9F8680B3B22D8E0A7A85F1BAA2</key> - <dict> - <key>fileRef</key> - <string>A09A7E81E94D5275573AF19B08C7093C</string> - <key>isa</key> - <string>PBXBuildFile</string> - </dict> <key>2945FAA75C956DD6A541EB51E42E6899</key> <dict> <key>fileRef</key> @@ -1048,19 +1058,12 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>2CE1968601928518466CC3211E3C6E0D</key> - <dict> - <key>fileRef</key> - <string>A09A7E81E94D5275573AF19B08C7093C</string> - <key>isa</key> - <string>PBXBuildFile</string> - </dict> <key>2D8E8EC45A3A1A1D94AE762CB5028504</key> <dict> <key>buildConfigurations</key> <array> - <string>A70CDAD61F90AC503C7D04CC22DA2923</string> - <string>FB45FFD90572718D82AB9092B750F0CA</string> + <string>47BEF9D903506B003EA5C2B249729489</string> + <string>AAF678CED40D3499169D10F63CA0719E</string> </array> <key>defaultConfigurationIsVisible</key> <string>0</string> @@ -1069,6 +1072,46 @@ <key>isa</key> <string>XCConfigurationList</string> </dict> + <key>2DAE732D13CB652A1ECC83370B3C00E5</key> + <dict> + <key>baseConfigurationReference</key> + <string>D17CA42B2DBD2AB2BBA3CBB7E2205968</string> + <key>buildSettings</key> + <dict> + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> + <string>iPhone Developer</string> + <key>DEBUG_INFORMATION_FORMAT</key> + <string>dwarf</string> + <key>ENABLE_STRICT_OBJC_MSGSEND</key> + <string>YES</string> + <key>GCC_NO_COMMON_BLOCKS</key> + <string>YES</string> + <key>GCC_PREFIX_HEADER</key> + <string>Target Support Files/Masonry/Masonry-prefix.pch</string> + <key>IPHONEOS_DEPLOYMENT_TARGET</key> + <string>6.0</string> + <key>MTL_ENABLE_DEBUG_INFO</key> + <string>YES</string> + <key>OTHER_LDFLAGS</key> + <string></string> + <key>OTHER_LIBTOOLFLAGS</key> + <string></string> + <key>PRIVATE_HEADERS_FOLDER_PATH</key> + <string></string> + <key>PRODUCT_NAME</key> + <string>$(TARGET_NAME)</string> + <key>PUBLIC_HEADERS_FOLDER_PATH</key> + <string></string> + <key>SDKROOT</key> + <string>iphoneos</string> + <key>SKIP_INSTALL</key> + <string>YES</string> + </dict> + <key>isa</key> + <string>XCBuildConfiguration</string> + <key>name</key> + <string>Debug</string> + </dict> <key>2EEEDC3E550D01C56D447F03D0A68EFA</key> <dict> <key>buildActionMask</key> @@ -1132,13 +1175,6 @@ <key>productType</key> <string>com.apple.product-type.library.static</string> </dict> - <key>2F85D170E76C661AB0D9E9A8B206C78D</key> - <dict> - <key>fileRef</key> - <string>A09A7E81E94D5275573AF19B08C7093C</string> - <key>isa</key> - <string>PBXBuildFile</string> - </dict> <key>2F9D3747596E4E074C3B776949091047</key> <dict> <key>fileRef</key> @@ -1322,49 +1358,13 @@ <key>runOnlyForDeploymentPostprocessing</key> <string>0</string> </dict> - <key>3E9ED5F264BDA4E96E5C47300AF9B75E</key> - <dict> - <key>baseConfigurationReference</key> - <string>AD6D89D8C414349AAD70BD448A0EB42D</string> - <key>buildSettings</key> - <dict> - <key>ENABLE_STRICT_OBJC_MSGSEND</key> - <string>YES</string> - <key>GCC_GENERATE_TEST_COVERAGE_FILES</key> - <string>YES</string> - <key>GCC_INSTRUMENT_PROGRAM_FLOW_ARCS</key> - <string>YES</string> - <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> - <key>MACH_O_TYPE</key> - <string>staticlib</string> - <key>MTL_ENABLE_DEBUG_INFO</key> - <string>NO</string> - <key>OTHER_LDFLAGS</key> - <string></string> - <key>OTHER_LIBTOOLFLAGS</key> - <string></string> - <key>PODS_ROOT</key> - <string>$(SRCROOT)</string> - <key>PRODUCT_NAME</key> - <string>$(TARGET_NAME)</string> - <key>SDKROOT</key> - <string>iphoneos</string> - <key>SKIP_INSTALL</key> - <string>YES</string> - </dict> - <key>isa</key> - <string>XCBuildConfiguration</string> - <key>name</key> - <string>Release</string> - </dict> <key>3FDF286F5F8FD72B4098D5CE557A32A7</key> <dict> <key>buildActionMask</key> <string>2147483647</string> <key>files</key> <array> - <string>28C4BD9F8680B3B22D8E0A7A85F1BAA2</string> + <string>0DF7EB35BC5CF15C74582F7026DA8FAC</string> </array> <key>isa</key> <string>PBXFrameworksBuildPhase</string> @@ -1437,6 +1437,13 @@ </array> </dict> </dict> + <key>42691DA8C339FD65A967DAB502CA4079</key> + <dict> + <key>fileRef</key> + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> + <key>isa</key> + <string>PBXBuildFile</string> + </dict> <key>430CE433DB59FE090A8CC6AFCFA43337</key> <dict> <key>fileRef</key> @@ -1490,6 +1497,19 @@ <key>sourceTree</key> <string><group></string> </dict> + <key>44E91E6A6263B0D61B049B648F6271E7</key> + <dict> + <key>isa</key> + <string>PBXFileReference</string> + <key>lastKnownFileType</key> + <string>wrapper.framework</string> + <key>name</key> + <string>XCTest.framework</string> + <key>path</key> + <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/XCTest.framework</string> + <key>sourceTree</key> + <string>DEVELOPER_DIR</string> + </dict> <key>46F312CBB94BAE62B58D3D7AE28E8DBD</key> <dict> <key>fileRef</key> @@ -1543,45 +1563,123 @@ <key>productType</key> <string>com.apple.product-type.library.static</string> </dict> - <key>481E644C11C98774BE98309BA0A2CB6C</key> - <dict> - <key>includeInIndex</key> - <string>1</string> - <key>isa</key> - <string>PBXFileReference</string> - <key>lastKnownFileType</key> - <string>sourcecode.c.h</string> - <key>name</key> - <string>EXPMatchers+beFalsy.h</string> - <key>path</key> - <string>Expecta/Matchers/EXPMatchers+beFalsy.h</string> - <key>sourceTree</key> - <string><group></string> - </dict> - <key>487899F028C39C1A518547A1AB2F625A</key> + <key>47BEF9D903506B003EA5C2B249729489</key> <dict> - <key>fileRef</key> - <string>7EBF9BAD2F54920E12BA8D79EB3EE01C</string> - <key>isa</key> - <string>PBXBuildFile</string> - <key>settings</key> + <key>buildSettings</key> <dict> - <key>COMPILER_FLAGS</key> - <string>-fno-objc-arc</string> - </dict> - </dict> - <key>489F09523F5700F4F414FA98E0BDEEE4</key> - <dict> - <key>includeInIndex</key> - <string>1</string> - <key>isa</key> - <string>PBXFileReference</string> - <key>lastKnownFileType</key> - <string>text.xcconfig</string> - <key>path</key> - <string>Expecta.xcconfig</string> - <key>sourceTree</key> - <string><group></string> + <key>ALWAYS_SEARCH_USER_PATHS</key> + <string>NO</string> + <key>CLANG_ANALYZER_NONNULL</key> + <string>YES</string> + <key>CLANG_CXX_LANGUAGE_STANDARD</key> + <string>gnu++0x</string> + <key>CLANG_CXX_LIBRARY</key> + <string>libc++</string> + <key>CLANG_ENABLE_MODULES</key> + <string>YES</string> + <key>CLANG_ENABLE_OBJC_ARC</key> + <string>YES</string> + <key>CLANG_WARN_BOOL_CONVERSION</key> + <string>YES</string> + <key>CLANG_WARN_CONSTANT_CONVERSION</key> + <string>YES</string> + <key>CLANG_WARN_DIRECT_OBJC_ISA_USAGE</key> + <string>YES</string> + <key>CLANG_WARN_EMPTY_BODY</key> + <string>YES</string> + <key>CLANG_WARN_ENUM_CONVERSION</key> + <string>YES</string> + <key>CLANG_WARN_INT_CONVERSION</key> + <string>YES</string> + <key>CLANG_WARN_OBJC_ROOT_CLASS</key> + <string>YES</string> + <key>CLANG_WARN_UNREACHABLE_CODE</key> + <string>YES</string> + <key>CLANG_WARN__DUPLICATE_METHOD_MATCH</key> + <string>YES</string> + <key>COPY_PHASE_STRIP</key> + <string>NO</string> + <key>ENABLE_TESTABILITY</key> + <string>YES</string> + <key>GCC_C_LANGUAGE_STANDARD</key> + <string>gnu99</string> + <key>GCC_DYNAMIC_NO_PIC</key> + <string>NO</string> + <key>GCC_OPTIMIZATION_LEVEL</key> + <string>0</string> + <key>GCC_PREPROCESSOR_DEFINITIONS</key> + <array> + <string>POD_CONFIGURATION_DEBUG=1</string> + <string>DEBUG=1</string> + <string>$(inherited)</string> + </array> + <key>GCC_SYMBOLS_PRIVATE_EXTERN</key> + <string>NO</string> + <key>GCC_WARN_64_TO_32_BIT_CONVERSION</key> + <string>YES</string> + <key>GCC_WARN_ABOUT_RETURN_TYPE</key> + <string>YES</string> + <key>GCC_WARN_UNDECLARED_SELECTOR</key> + <string>YES</string> + <key>GCC_WARN_UNINITIALIZED_AUTOS</key> + <string>YES</string> + <key>GCC_WARN_UNUSED_FUNCTION</key> + <string>YES</string> + <key>GCC_WARN_UNUSED_VARIABLE</key> + <string>YES</string> + <key>IPHONEOS_DEPLOYMENT_TARGET</key> + <string>8.0</string> + <key>ONLY_ACTIVE_ARCH</key> + <string>YES</string> + <key>STRIP_INSTALLED_PRODUCT</key> + <string>NO</string> + <key>SYMROOT</key> + <string>${SRCROOT}/../build</string> + </dict> + <key>isa</key> + <string>XCBuildConfiguration</string> + <key>name</key> + <string>Debug</string> + </dict> + <key>481E644C11C98774BE98309BA0A2CB6C</key> + <dict> + <key>includeInIndex</key> + <string>1</string> + <key>isa</key> + <string>PBXFileReference</string> + <key>lastKnownFileType</key> + <string>sourcecode.c.h</string> + <key>name</key> + <string>EXPMatchers+beFalsy.h</string> + <key>path</key> + <string>Expecta/Matchers/EXPMatchers+beFalsy.h</string> + <key>sourceTree</key> + <string><group></string> + </dict> + <key>487899F028C39C1A518547A1AB2F625A</key> + <dict> + <key>fileRef</key> + <string>7EBF9BAD2F54920E12BA8D79EB3EE01C</string> + <key>isa</key> + <string>PBXBuildFile</string> + <key>settings</key> + <dict> + <key>COMPILER_FLAGS</key> + <string>-fno-objc-arc</string> + </dict> + </dict> + <key>489F09523F5700F4F414FA98E0BDEEE4</key> + <dict> + <key>includeInIndex</key> + <string>1</string> + <key>isa</key> + <string>PBXFileReference</string> + <key>lastKnownFileType</key> + <string>text.xcconfig</string> + <key>path</key> + <string>Expecta.xcconfig</string> + <key>sourceTree</key> + <string><group></string> </dict> <key>48FB054B1F997F66CA0E17DB3B26223C</key> <dict> @@ -1731,7 +1829,7 @@ <string>2147483647</string> <key>files</key> <array> - <string>072295001E57DD17A014E75544C5CC3E</string> + <string>0A834D048C2A012491E25113117D56A0</string> </array> <key>isa</key> <string>PBXFrameworksBuildPhase</string> @@ -1797,8 +1895,8 @@ <dict> <key>buildConfigurations</key> <array> - <string>1BC29259D6F9F1A79B534F2B8B4D8363</string> - <string>6E073A0D16A8DFAEE80519C2A1D9553C</string> + <string>FBCEC5C8B899A450BBC3A217E518522C</string> + <string>1C4E4899BE01820151368B07EB14F4A0</string> </array> <key>defaultConfigurationIsVisible</key> <string>0</string> @@ -2027,19 +2125,6 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>622164B4107630D654F8782C72483711</key> - <dict> - <key>isa</key> - <string>PBXFileReference</string> - <key>lastKnownFileType</key> - <string>wrapper.framework</string> - <key>name</key> - <string>UIKit.framework</string> - <key>path</key> - <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/UIKit.framework</string> - <key>sourceTree</key> - <string>DEVELOPER_DIR</string> - </dict> <key>639FB58CFFC214FCCF32C06B0ACC9B5B</key> <dict> <key>includeInIndex</key> @@ -2080,13 +2165,6 @@ <string>-fno-objc-arc</string> </dict> </dict> - <key>66081D3480D1FA028C4DE2344BF616D4</key> - <dict> - <key>fileRef</key> - <string>A09A7E81E94D5275573AF19B08C7093C</string> - <key>isa</key> - <string>PBXBuildFile</string> - </dict> <key>663B481626C7E7C19A7A42120FFC0E77</key> <dict> <key>includeInIndex</key> @@ -2144,13 +2222,6 @@ </array> </dict> </dict> - <key>69363A59A4E2FF95D6A62AA88641A20A</key> - <dict> - <key>fileRef</key> - <string>F19621A55D90116B728D6C61C1B25EB8</string> - <key>isa</key> - <string>PBXBuildFile</string> - </dict> <key>69EBB956302554EA37775F4D806BC4DD</key> <dict> <key>fileRef</key> @@ -2219,40 +2290,6 @@ <string>-fno-objc-arc</string> </dict> </dict> - <key>6E073A0D16A8DFAEE80519C2A1D9553C</key> - <dict> - <key>baseConfigurationReference</key> - <string>489F09523F5700F4F414FA98E0BDEEE4</string> - <key>buildSettings</key> - <dict> - <key>ENABLE_STRICT_OBJC_MSGSEND</key> - <string>YES</string> - <key>GCC_PREFIX_HEADER</key> - <string>Target Support Files/Expecta/Expecta-prefix.pch</string> - <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> - <key>MTL_ENABLE_DEBUG_INFO</key> - <string>NO</string> - <key>OTHER_LDFLAGS</key> - <string></string> - <key>OTHER_LIBTOOLFLAGS</key> - <string></string> - <key>PRIVATE_HEADERS_FOLDER_PATH</key> - <string></string> - <key>PRODUCT_NAME</key> - <string>$(TARGET_NAME)</string> - <key>PUBLIC_HEADERS_FOLDER_PATH</key> - <string></string> - <key>SDKROOT</key> - <string>iphoneos</string> - <key>SKIP_INSTALL</key> - <string>YES</string> - </dict> - <key>isa</key> - <string>XCBuildConfiguration</string> - <key>name</key> - <string>Release</string> - </dict> <key>6EB2498C2AFB1DF8555CB7C1EF89CA5C</key> <dict> <key>fileRef</key> @@ -2308,42 +2345,6 @@ </array> </dict> </dict> - <key>718A7D4B90C40E4B8522A192471996B6</key> - <dict> - <key>baseConfigurationReference</key> - <string>41073685DCEF4DD54806A297165DB39F</string> - <key>buildSettings</key> - <dict> - <key>ENABLE_STRICT_OBJC_MSGSEND</key> - <string>YES</string> - <key>GCC_GENERATE_TEST_COVERAGE_FILES</key> - <string>YES</string> - <key>GCC_INSTRUMENT_PROGRAM_FLOW_ARCS</key> - <string>YES</string> - <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> - <key>MACH_O_TYPE</key> - <string>staticlib</string> - <key>MTL_ENABLE_DEBUG_INFO</key> - <string>YES</string> - <key>OTHER_LDFLAGS</key> - <string></string> - <key>OTHER_LIBTOOLFLAGS</key> - <string></string> - <key>PODS_ROOT</key> - <string>$(SRCROOT)</string> - <key>PRODUCT_NAME</key> - <string>$(TARGET_NAME)</string> - <key>SDKROOT</key> - <string>iphoneos</string> - <key>SKIP_INSTALL</key> - <string>YES</string> - </dict> - <key>isa</key> - <string>XCBuildConfiguration</string> - <key>name</key> - <string>Debug</string> - </dict> <key>72BBF7DE3688F93C88C5736A9BCD98AE</key> <dict> <key>fileRef</key> @@ -2384,6 +2385,50 @@ </array> </dict> </dict> + <key>753F7C0B8DFE76832111E1E02E10D991</key> + <dict> + <key>baseConfigurationReference</key> + <string>41073685DCEF4DD54806A297165DB39F</string> + <key>buildSettings</key> + <dict> + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> + <string>iPhone Developer</string> + <key>DEBUG_INFORMATION_FORMAT</key> + <string>dwarf</string> + <key>ENABLE_STRICT_OBJC_MSGSEND</key> + <string>YES</string> + <key>GCC_GENERATE_TEST_COVERAGE_FILES</key> + <string>YES</string> + <key>GCC_INSTRUMENT_PROGRAM_FLOW_ARCS</key> + <string>YES</string> + <key>GCC_NO_COMMON_BLOCKS</key> + <string>YES</string> + <key>IPHONEOS_DEPLOYMENT_TARGET</key> + <string>8.0</string> + <key>MACH_O_TYPE</key> + <string>staticlib</string> + <key>MTL_ENABLE_DEBUG_INFO</key> + <string>YES</string> + <key>OTHER_LDFLAGS</key> + <string></string> + <key>OTHER_LIBTOOLFLAGS</key> + <string></string> + <key>PODS_ROOT</key> + <string>$(SRCROOT)</string> + <key>PRODUCT_BUNDLE_IDENTIFIER</key> + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> + <key>PRODUCT_NAME</key> + <string>$(TARGET_NAME)</string> + <key>SDKROOT</key> + <string>iphoneos</string> + <key>SKIP_INSTALL</key> + <string>YES</string> + </dict> + <key>isa</key> + <string>XCBuildConfiguration</string> + <key>name</key> + <string>Debug</string> + </dict> <key>7559C19053134AD8CF9C91D122AC2090</key> <dict> <key>includeInIndex</key> @@ -2537,6 +2582,13 @@ <key>sourceTree</key> <string><group></string> </dict> + <key>7C8990F70B3DFACC64C905887ECE29A7</key> + <dict> + <key>fileRef</key> + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> + <key>isa</key> + <string>PBXBuildFile</string> + </dict> <key>7C9A0D7E24E5DCE2B938FC4C4901B353</key> <dict> <key>includeInIndex</key> @@ -2556,7 +2608,7 @@ <dict> <key>children</key> <array> - <string>BA6428E9F66FD5A23C0A2E06ED26CD2F</string> + <string>93A4A3777CF96A4AAC1D13BA6DCCEA73</string> <string>0DA9AF80DA7ECA5B4D31C526D9F57DB2</string> <string>122DA2E5084A4393C29BE363C764795C</string> <string>2C212CDC4B22CF51422FF7C8D4BF9E56</string> @@ -2707,45 +2759,13 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>861FA3D46E14DDFA0DF00DD281D574B0</key> + <key>872948DAF79618AD725E0BF364E5DDD4</key> <dict> - <key>baseConfigurationReference</key> - <string>590084C07434815AE5BEC2E76CD54154</string> - <key>buildSettings</key> - <dict> - <key>ENABLE_STRICT_OBJC_MSGSEND</key> - <string>YES</string> - <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> - <key>MACH_O_TYPE</key> - <string>staticlib</string> - <key>MTL_ENABLE_DEBUG_INFO</key> - <string>NO</string> - <key>OTHER_LDFLAGS</key> - <string></string> - <key>OTHER_LIBTOOLFLAGS</key> - <string></string> - <key>PODS_ROOT</key> - <string>$(SRCROOT)</string> - <key>PRODUCT_NAME</key> - <string>$(TARGET_NAME)</string> - <key>SDKROOT</key> - <string>iphoneos</string> - <key>SKIP_INSTALL</key> - <string>YES</string> - </dict> - <key>isa</key> - <string>XCBuildConfiguration</string> - <key>name</key> - <string>Release</string> - </dict> - <key>872948DAF79618AD725E0BF364E5DDD4</key> - <dict> - <key>fileRef</key> - <string>ADBF0443B4181A4D41268AB9F62AA73C</string> - <key>isa</key> - <string>PBXBuildFile</string> - <key>settings</key> + <key>fileRef</key> + <string>ADBF0443B4181A4D41268AB9F62AA73C</string> + <key>isa</key> + <string>PBXBuildFile</string> + <key>settings</key> <dict> <key>COMPILER_FLAGS</key> <string>-fno-objc-arc</string> @@ -2828,6 +2848,46 @@ </array> </dict> </dict> + <key>8EF03F0376BCC789614FBDADB0ECCD0B</key> + <dict> + <key>baseConfigurationReference</key> + <string>C5ABB1C6CB3F9F99597CCF6727731A7B</string> + <key>buildSettings</key> + <dict> + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> + <string>iPhone Developer</string> + <key>DEBUG_INFORMATION_FORMAT</key> + <string>dwarf</string> + <key>ENABLE_STRICT_OBJC_MSGSEND</key> + <string>YES</string> + <key>GCC_NO_COMMON_BLOCKS</key> + <string>YES</string> + <key>IPHONEOS_DEPLOYMENT_TARGET</key> + <string>8.0</string> + <key>MACH_O_TYPE</key> + <string>staticlib</string> + <key>MTL_ENABLE_DEBUG_INFO</key> + <string>YES</string> + <key>OTHER_LDFLAGS</key> + <string></string> + <key>OTHER_LIBTOOLFLAGS</key> + <string></string> + <key>PODS_ROOT</key> + <string>$(SRCROOT)</string> + <key>PRODUCT_BUNDLE_IDENTIFIER</key> + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> + <key>PRODUCT_NAME</key> + <string>$(TARGET_NAME)</string> + <key>SDKROOT</key> + <string>iphoneos</string> + <key>SKIP_INSTALL</key> + <string>YES</string> + </dict> + <key>isa</key> + <string>XCBuildConfiguration</string> + <key>name</key> + <string>Debug</string> + </dict> <key>8F3B66464C8F4DC1EDFFEA58A98F9B5C</key> <dict> <key>includeInIndex</key> @@ -2871,6 +2931,46 @@ </array> </dict> </dict> + <key>903FBF203C5658B140DF3CBEF5D2090D</key> + <dict> + <key>baseConfigurationReference</key> + <string>D17CA42B2DBD2AB2BBA3CBB7E2205968</string> + <key>buildSettings</key> + <dict> + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> + <string>iPhone Developer</string> + <key>DEBUG_INFORMATION_FORMAT</key> + <string>dwarf-with-dsym</string> + <key>ENABLE_STRICT_OBJC_MSGSEND</key> + <string>YES</string> + <key>GCC_NO_COMMON_BLOCKS</key> + <string>YES</string> + <key>GCC_PREFIX_HEADER</key> + <string>Target Support Files/Masonry/Masonry-prefix.pch</string> + <key>IPHONEOS_DEPLOYMENT_TARGET</key> + <string>6.0</string> + <key>MTL_ENABLE_DEBUG_INFO</key> + <string>NO</string> + <key>OTHER_LDFLAGS</key> + <string></string> + <key>OTHER_LIBTOOLFLAGS</key> + <string></string> + <key>PRIVATE_HEADERS_FOLDER_PATH</key> + <string></string> + <key>PRODUCT_NAME</key> + <string>$(TARGET_NAME)</string> + <key>PUBLIC_HEADERS_FOLDER_PATH</key> + <string></string> + <key>SDKROOT</key> + <string>iphoneos</string> + <key>SKIP_INSTALL</key> + <string>YES</string> + </dict> + <key>isa</key> + <string>XCBuildConfiguration</string> + <key>name</key> + <string>Release</string> + </dict> <key>913C17684F33A4694BD4B40BBDEFFCC5</key> <dict> <key>fileRef</key> @@ -2920,6 +3020,25 @@ </array> </dict> </dict> + <key>93A4A3777CF96A4AAC1D13BA6DCCEA73</key> + <dict> + <key>explicitFileType</key> + <string>text.script.ruby</string> + <key>includeInIndex</key> + <string>1</string> + <key>isa</key> + <string>PBXFileReference</string> + <key>lastKnownFileType</key> + <string>text</string> + <key>name</key> + <string>Podfile</string> + <key>path</key> + <string>../Podfile</string> + <key>sourceTree</key> + <string>SOURCE_ROOT</string> + <key>xcLanguageSpecificationIdentifier</key> + <string>xcode.lang.ruby</string> + </dict> <key>9419623067B9E86BA21AAA6E91E4B66D</key> <dict> <key>buildActionMask</key> @@ -2947,40 +3066,6 @@ </array> </dict> </dict> - <key>95AE3FB211FA06239C7330FF540873D7</key> - <dict> - <key>baseConfigurationReference</key> - <string>D17CA42B2DBD2AB2BBA3CBB7E2205968</string> - <key>buildSettings</key> - <dict> - <key>ENABLE_STRICT_OBJC_MSGSEND</key> - <string>YES</string> - <key>GCC_PREFIX_HEADER</key> - <string>Target Support Files/Masonry/Masonry-prefix.pch</string> - <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> - <key>MTL_ENABLE_DEBUG_INFO</key> - <string>YES</string> - <key>OTHER_LDFLAGS</key> - <string></string> - <key>OTHER_LIBTOOLFLAGS</key> - <string></string> - <key>PRIVATE_HEADERS_FOLDER_PATH</key> - <string></string> - <key>PRODUCT_NAME</key> - <string>$(TARGET_NAME)</string> - <key>PUBLIC_HEADERS_FOLDER_PATH</key> - <string></string> - <key>SDKROOT</key> - <string>iphoneos</string> - <key>SKIP_INSTALL</key> - <string>YES</string> - </dict> - <key>isa</key> - <string>XCBuildConfiguration</string> - <key>name</key> - <string>Debug</string> - </dict> <key>9616A699420336DD8F227A5C41E36432</key> <dict> <key>includeInIndex</key> @@ -3025,13 +3110,6 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>9A6AE1EF2E94AEB6912BE845583E7D57</key> - <dict> - <key>fileRef</key> - <string>622164B4107630D654F8782C72483711</string> - <key>isa</key> - <string>PBXBuildFile</string> - </dict> <key>9B546D0F895D9B5A8316B948CEE95C77</key> <dict> <key>fileRef</key> @@ -3081,19 +3159,6 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>A09A7E81E94D5275573AF19B08C7093C</key> - <dict> - <key>isa</key> - <string>PBXFileReference</string> - <key>lastKnownFileType</key> - <string>wrapper.framework</string> - <key>name</key> - <string>Foundation.framework</string> - <key>path</key> - <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/Foundation.framework</string> - <key>sourceTree</key> - <string>DEVELOPER_DIR</string> - </dict> <key>A26F992E8831118311F3DB7CB830595A</key> <dict> <key>fileRef</key> @@ -3132,79 +3197,6 @@ </array> </dict> </dict> - <key>A70CDAD61F90AC503C7D04CC22DA2923</key> - <dict> - <key>buildSettings</key> - <dict> - <key>ALWAYS_SEARCH_USER_PATHS</key> - <string>NO</string> - <key>CLANG_CXX_LANGUAGE_STANDARD</key> - <string>gnu++0x</string> - <key>CLANG_CXX_LIBRARY</key> - <string>libc++</string> - <key>CLANG_ENABLE_MODULES</key> - <string>YES</string> - <key>CLANG_ENABLE_OBJC_ARC</key> - <string>YES</string> - <key>CLANG_WARN_BOOL_CONVERSION</key> - <string>YES</string> - <key>CLANG_WARN_CONSTANT_CONVERSION</key> - <string>YES</string> - <key>CLANG_WARN_DIRECT_OBJC_ISA_USAGE</key> - <string>YES</string> - <key>CLANG_WARN_EMPTY_BODY</key> - <string>YES</string> - <key>CLANG_WARN_ENUM_CONVERSION</key> - <string>YES</string> - <key>CLANG_WARN_INT_CONVERSION</key> - <string>YES</string> - <key>CLANG_WARN_OBJC_ROOT_CLASS</key> - <string>YES</string> - <key>CLANG_WARN_UNREACHABLE_CODE</key> - <string>YES</string> - <key>CLANG_WARN__DUPLICATE_METHOD_MATCH</key> - <string>YES</string> - <key>COPY_PHASE_STRIP</key> - <string>NO</string> - <key>GCC_C_LANGUAGE_STANDARD</key> - <string>gnu99</string> - <key>GCC_DYNAMIC_NO_PIC</key> - <string>NO</string> - <key>GCC_OPTIMIZATION_LEVEL</key> - <string>0</string> - <key>GCC_PREPROCESSOR_DEFINITIONS</key> - <array> - <string>DEBUG=1</string> - <string>$(inherited)</string> - </array> - <key>GCC_SYMBOLS_PRIVATE_EXTERN</key> - <string>NO</string> - <key>GCC_WARN_64_TO_32_BIT_CONVERSION</key> - <string>YES</string> - <key>GCC_WARN_ABOUT_RETURN_TYPE</key> - <string>YES</string> - <key>GCC_WARN_UNDECLARED_SELECTOR</key> - <string>YES</string> - <key>GCC_WARN_UNINITIALIZED_AUTOS</key> - <string>YES</string> - <key>GCC_WARN_UNUSED_FUNCTION</key> - <string>YES</string> - <key>GCC_WARN_UNUSED_VARIABLE</key> - <string>YES</string> - <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> - <key>ONLY_ACTIVE_ARCH</key> - <string>YES</string> - <key>STRIP_INSTALLED_PRODUCT</key> - <string>NO</string> - <key>SYMROOT</key> - <string>${SRCROOT}/../build</string> - </dict> - <key>isa</key> - <string>XCBuildConfiguration</string> - <key>name</key> - <string>Debug</string> - </dict> <key>A7141BC83638F4B38D4D312BAE3BDAC4</key> <dict> <key>fileRef</key> @@ -3224,6 +3216,19 @@ <key>isa</key> <string>PBXBuildFile</string> </dict> + <key>A71B6C19E4D0C8A4D14A6EF1AB8728EB</key> + <dict> + <key>isa</key> + <string>PBXFileReference</string> + <key>lastKnownFileType</key> + <string>wrapper.framework</string> + <key>name</key> + <string>Foundation.framework</string> + <key>path</key> + <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Foundation.framework</string> + <key>sourceTree</key> + <string>DEVELOPER_DIR</string> + </dict> <key>A76F61E04DD2544A99CC2967B86C5809</key> <dict> <key>fileRef</key> @@ -3252,38 +3257,6 @@ </array> </dict> </dict> - <key>A9D74DD3D4F98043508191259AF0C28D</key> - <dict> - <key>baseConfigurationReference</key> - <string>1B998D4CCC665C40E8A45CF07DFD7ABC</string> - <key>buildSettings</key> - <dict> - <key>ENABLE_STRICT_OBJC_MSGSEND</key> - <string>YES</string> - <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> - <key>MACH_O_TYPE</key> - <string>staticlib</string> - <key>MTL_ENABLE_DEBUG_INFO</key> - <string>NO</string> - <key>OTHER_LDFLAGS</key> - <string></string> - <key>OTHER_LIBTOOLFLAGS</key> - <string></string> - <key>PODS_ROOT</key> - <string>$(SRCROOT)</string> - <key>PRODUCT_NAME</key> - <string>$(TARGET_NAME)</string> - <key>SDKROOT</key> - <string>iphoneos</string> - <key>SKIP_INSTALL</key> - <string>YES</string> - </dict> - <key>isa</key> - <string>XCBuildConfiguration</string> - <key>name</key> - <string>Release</string> - </dict> <key>AA7B402D31D86AE5E3DD083408311FF1</key> <dict> <key>fileRef</key> @@ -3312,6 +3285,77 @@ </array> </dict> </dict> + <key>AAF678CED40D3499169D10F63CA0719E</key> + <dict> + <key>buildSettings</key> + <dict> + <key>ALWAYS_SEARCH_USER_PATHS</key> + <string>NO</string> + <key>CLANG_ANALYZER_NONNULL</key> + <string>YES</string> + <key>CLANG_CXX_LANGUAGE_STANDARD</key> + <string>gnu++0x</string> + <key>CLANG_CXX_LIBRARY</key> + <string>libc++</string> + <key>CLANG_ENABLE_MODULES</key> + <string>YES</string> + <key>CLANG_ENABLE_OBJC_ARC</key> + <string>YES</string> + <key>CLANG_WARN_BOOL_CONVERSION</key> + <string>YES</string> + <key>CLANG_WARN_CONSTANT_CONVERSION</key> + <string>YES</string> + <key>CLANG_WARN_DIRECT_OBJC_ISA_USAGE</key> + <string>YES</string> + <key>CLANG_WARN_EMPTY_BODY</key> + <string>YES</string> + <key>CLANG_WARN_ENUM_CONVERSION</key> + <string>YES</string> + <key>CLANG_WARN_INT_CONVERSION</key> + <string>YES</string> + <key>CLANG_WARN_OBJC_ROOT_CLASS</key> + <string>YES</string> + <key>CLANG_WARN_UNREACHABLE_CODE</key> + <string>YES</string> + <key>CLANG_WARN__DUPLICATE_METHOD_MATCH</key> + <string>YES</string> + <key>COPY_PHASE_STRIP</key> + <string>YES</string> + <key>ENABLE_NS_ASSERTIONS</key> + <string>NO</string> + <key>GCC_C_LANGUAGE_STANDARD</key> + <string>gnu99</string> + <key>GCC_PREPROCESSOR_DEFINITIONS</key> + <array> + <string>POD_CONFIGURATION_RELEASE=1</string> + <string>$(inherited)</string> + </array> + <key>GCC_WARN_64_TO_32_BIT_CONVERSION</key> + <string>YES</string> + <key>GCC_WARN_ABOUT_RETURN_TYPE</key> + <string>YES</string> + <key>GCC_WARN_UNDECLARED_SELECTOR</key> + <string>YES</string> + <key>GCC_WARN_UNINITIALIZED_AUTOS</key> + <string>YES</string> + <key>GCC_WARN_UNUSED_FUNCTION</key> + <string>YES</string> + <key>GCC_WARN_UNUSED_VARIABLE</key> + <string>YES</string> + <key>IPHONEOS_DEPLOYMENT_TARGET</key> + <string>8.0</string> + <key>STRIP_INSTALLED_PRODUCT</key> + <string>NO</string> + <key>SYMROOT</key> + <string>${SRCROOT}/../build</string> + <key>VALIDATE_PRODUCT</key> + <string>YES</string> + </dict> + <key>isa</key> + <string>XCBuildConfiguration</string> + <key>name</key> + <string>Release</string> + </dict> <key>AB1D6408D48F6ECF3FCE553BE73961F5</key> <dict> <key>fileRef</key> @@ -3421,6 +3465,13 @@ <key>sourceTree</key> <string><group></string> </dict> + <key>AF4E7187E09A5AF3A0758991203153DC</key> + <dict> + <key>fileRef</key> + <string>008A5F43350B1984916B33BCAFD01149</string> + <key>isa</key> + <string>PBXBuildFile</string> + </dict> <key>B18DDF0B1F1819021C6B4FD309475D1B</key> <dict> <key>fileRef</key> @@ -3481,8 +3532,8 @@ <dict> <key>buildConfigurations</key> <array> - <string>95AE3FB211FA06239C7330FF540873D7</string> - <string>FCB543E03B40FD44221FE9A409AE51EA</string> + <string>2DAE732D13CB652A1ECC83370B3C00E5</string> + <string>903FBF203C5658B140DF3CBEF5D2090D</string> </array> <key>defaultConfigurationIsVisible</key> <string>0</string> @@ -3491,23 +3542,6 @@ <key>isa</key> <string>XCConfigurationList</string> </dict> - <key>BA6428E9F66FD5A23C0A2E06ED26CD2F</key> - <dict> - <key>includeInIndex</key> - <string>1</string> - <key>isa</key> - <string>PBXFileReference</string> - <key>lastKnownFileType</key> - <string>text</string> - <key>name</key> - <string>Podfile</string> - <key>path</key> - <string>../Podfile</string> - <key>sourceTree</key> - <string>SOURCE_ROOT</string> - <key>xcLanguageSpecificationIdentifier</key> - <string>xcode.lang.ruby</string> - </dict> <key>BB267133DB0AAEF96D19D2085B85E06D</key> <dict> <key>includeInIndex</key> @@ -3778,6 +3812,46 @@ <key>sourceTree</key> <string><group></string> </dict> + <key>C81070C7C06BA1A0C412F073110F269D</key> + <dict> + <key>baseConfigurationReference</key> + <string>590084C07434815AE5BEC2E76CD54154</string> + <key>buildSettings</key> + <dict> + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> + <string>iPhone Developer</string> + <key>DEBUG_INFORMATION_FORMAT</key> + <string>dwarf-with-dsym</string> + <key>ENABLE_STRICT_OBJC_MSGSEND</key> + <string>YES</string> + <key>GCC_NO_COMMON_BLOCKS</key> + <string>YES</string> + <key>IPHONEOS_DEPLOYMENT_TARGET</key> + <string>8.0</string> + <key>MACH_O_TYPE</key> + <string>staticlib</string> + <key>MTL_ENABLE_DEBUG_INFO</key> + <string>NO</string> + <key>OTHER_LDFLAGS</key> + <string></string> + <key>OTHER_LIBTOOLFLAGS</key> + <string></string> + <key>PODS_ROOT</key> + <string>$(SRCROOT)</string> + <key>PRODUCT_BUNDLE_IDENTIFIER</key> + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> + <key>PRODUCT_NAME</key> + <string>$(TARGET_NAME)</string> + <key>SDKROOT</key> + <string>iphoneos</string> + <key>SKIP_INSTALL</key> + <string>YES</string> + </dict> + <key>isa</key> + <string>XCBuildConfiguration</string> + <key>name</key> + <string>Release</string> + </dict> <key>C934D5D64F7FA6AE026CB137FBAD29E5</key> <dict> <key>children</key> @@ -3973,7 +4047,7 @@ <key>attributes</key> <dict> <key>LastSwiftUpdateCheck</key> - <string>0700</string> + <string>0730</string> <key>LastUpgradeCheck</key> <string>0700</string> </dict> @@ -4204,20 +4278,52 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>DECD63C15EA4A6A5E09172088586BA30</key> + <key>DE31B168D9197213CEB7B90E3ADEB4CC</key> <dict> - <key>children</key> - <array> - <string>A09A7E81E94D5275573AF19B08C7093C</string> - <string>622164B4107630D654F8782C72483711</string> - <string>F19621A55D90116B728D6C61C1B25EB8</string> - </array> + <key>fileRef</key> + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> <key>isa</key> - <string>PBXGroup</string> + <string>PBXBuildFile</string> + </dict> + <key>DFB95B1AA7E6CB668B2326B1E4E78683</key> + <dict> + <key>baseConfigurationReference</key> + <string>1B998D4CCC665C40E8A45CF07DFD7ABC</string> + <key>buildSettings</key> + <dict> + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> + <string>iPhone Developer</string> + <key>DEBUG_INFORMATION_FORMAT</key> + <string>dwarf-with-dsym</string> + <key>ENABLE_STRICT_OBJC_MSGSEND</key> + <string>YES</string> + <key>GCC_NO_COMMON_BLOCKS</key> + <string>YES</string> + <key>IPHONEOS_DEPLOYMENT_TARGET</key> + <string>8.0</string> + <key>MACH_O_TYPE</key> + <string>staticlib</string> + <key>MTL_ENABLE_DEBUG_INFO</key> + <string>NO</string> + <key>OTHER_LDFLAGS</key> + <string></string> + <key>OTHER_LIBTOOLFLAGS</key> + <string></string> + <key>PODS_ROOT</key> + <string>$(SRCROOT)</string> + <key>PRODUCT_BUNDLE_IDENTIFIER</key> + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> + <key>PRODUCT_NAME</key> + <string>$(TARGET_NAME)</string> + <key>SDKROOT</key> + <string>iphoneos</string> + <key>SKIP_INSTALL</key> + <string>YES</string> + </dict> + <key>isa</key> + <string>XCBuildConfiguration</string> <key>name</key> - <string>iOS</string> - <key>sourceTree</key> - <string><group></string> + <string>Release</string> </dict> <key>DFF580AE359407E841BA8D8DDCE6E299</key> <dict> @@ -4328,6 +4434,50 @@ <key>sourceTree</key> <string><group></string> </dict> + <key>E76DCF132766EC63E76B9D0818ADA5CC</key> + <dict> + <key>baseConfigurationReference</key> + <string>AD6D89D8C414349AAD70BD448A0EB42D</string> + <key>buildSettings</key> + <dict> + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> + <string>iPhone Developer</string> + <key>DEBUG_INFORMATION_FORMAT</key> + <string>dwarf-with-dsym</string> + <key>ENABLE_STRICT_OBJC_MSGSEND</key> + <string>YES</string> + <key>GCC_GENERATE_TEST_COVERAGE_FILES</key> + <string>YES</string> + <key>GCC_INSTRUMENT_PROGRAM_FLOW_ARCS</key> + <string>YES</string> + <key>GCC_NO_COMMON_BLOCKS</key> + <string>YES</string> + <key>IPHONEOS_DEPLOYMENT_TARGET</key> + <string>8.0</string> + <key>MACH_O_TYPE</key> + <string>staticlib</string> + <key>MTL_ENABLE_DEBUG_INFO</key> + <string>NO</string> + <key>OTHER_LDFLAGS</key> + <string></string> + <key>OTHER_LIBTOOLFLAGS</key> + <string></string> + <key>PODS_ROOT</key> + <string>$(SRCROOT)</string> + <key>PRODUCT_BUNDLE_IDENTIFIER</key> + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> + <key>PRODUCT_NAME</key> + <string>$(TARGET_NAME)</string> + <key>SDKROOT</key> + <string>iphoneos</string> + <key>SKIP_INSTALL</key> + <string>YES</string> + </dict> + <key>isa</key> + <string>XCBuildConfiguration</string> + <key>name</key> + <string>Release</string> + </dict> <key>E867CBF850D20C314BF4BD790432455D</key> <dict> <key>fileRef</key> @@ -4359,8 +4509,8 @@ <dict> <key>buildConfigurations</key> <array> - <string>03795746783FEB7886DA78C3914F0B16</string> - <string>861FA3D46E14DDFA0DF00DD281D574B0</string> + <string>04FB5395AFAF6DDF1ED7B654D1FC5237</string> + <string>C81070C7C06BA1A0C412F073110F269D</string> </array> <key>defaultConfigurationIsVisible</key> <string>0</string> @@ -4396,19 +4546,6 @@ <key>sourceTree</key> <string><group></string> </dict> - <key>F19621A55D90116B728D6C61C1B25EB8</key> - <dict> - <key>isa</key> - <string>PBXFileReference</string> - <key>lastKnownFileType</key> - <string>wrapper.framework</string> - <key>name</key> - <string>XCTest.framework</string> - <key>path</key> - <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/XCTest.framework</string> - <key>sourceTree</key> - <string>DEVELOPER_DIR</string> - </dict> <key>F1F4E65611F5567A86AF797EAC3E225B</key> <dict> <key>fileRef</key> @@ -4435,6 +4572,13 @@ </array> </dict> </dict> + <key>F415F451C67C56BD2821DFDC2802FE6C</key> + <dict> + <key>fileRef</key> + <string>44E91E6A6263B0D61B049B648F6271E7</string> + <key>isa</key> + <string>PBXBuildFile</string> + </dict> <key>F4CA468B5A9F8FF2A4DB8B236A8E71BF</key> <dict> <key>fileRef</key> @@ -4466,8 +4610,8 @@ <dict> <key>buildConfigurations</key> <array> - <string>718A7D4B90C40E4B8522A192471996B6</string> - <string>3E9ED5F264BDA4E96E5C47300AF9B75E</string> + <string>753F7C0B8DFE76832111E1E02E10D991</string> + <string>E76DCF132766EC63E76B9D0818ADA5CC</string> </array> <key>defaultConfigurationIsVisible</key> <string>0</string> @@ -4496,109 +4640,34 @@ <string>2147483647</string> <key>files</key> <array> - <string>2F85D170E76C661AB0D9E9A8B206C78D</string> - <string>9A6AE1EF2E94AEB6912BE845583E7D57</string> + <string>DE31B168D9197213CEB7B90E3ADEB4CC</string> + <string>AF4E7187E09A5AF3A0758991203153DC</string> </array> <key>isa</key> <string>PBXFrameworksBuildPhase</string> <key>runOnlyForDeploymentPostprocessing</key> <string>0</string> </dict> - <key>FB45FFD90572718D82AB9092B750F0CA</key> - <dict> - <key>buildSettings</key> - <dict> - <key>ALWAYS_SEARCH_USER_PATHS</key> - <string>NO</string> - <key>CLANG_CXX_LANGUAGE_STANDARD</key> - <string>gnu++0x</string> - <key>CLANG_CXX_LIBRARY</key> - <string>libc++</string> - <key>CLANG_ENABLE_MODULES</key> - <string>YES</string> - <key>CLANG_ENABLE_OBJC_ARC</key> - <string>YES</string> - <key>CLANG_WARN_BOOL_CONVERSION</key> - <string>YES</string> - <key>CLANG_WARN_CONSTANT_CONVERSION</key> - <string>YES</string> - <key>CLANG_WARN_DIRECT_OBJC_ISA_USAGE</key> - <string>YES</string> - <key>CLANG_WARN_EMPTY_BODY</key> - <string>YES</string> - <key>CLANG_WARN_ENUM_CONVERSION</key> - <string>YES</string> - <key>CLANG_WARN_INT_CONVERSION</key> - <string>YES</string> - <key>CLANG_WARN_OBJC_ROOT_CLASS</key> - <string>YES</string> - <key>CLANG_WARN_UNREACHABLE_CODE</key> - <string>YES</string> - <key>CLANG_WARN__DUPLICATE_METHOD_MATCH</key> - <string>YES</string> - <key>COPY_PHASE_STRIP</key> - <string>YES</string> - <key>ENABLE_NS_ASSERTIONS</key> - <string>NO</string> - <key>GCC_C_LANGUAGE_STANDARD</key> - <string>gnu99</string> - <key>GCC_PREPROCESSOR_DEFINITIONS</key> - <array> - <string>RELEASE=1</string> - </array> - <key>GCC_WARN_64_TO_32_BIT_CONVERSION</key> - <string>YES</string> - <key>GCC_WARN_ABOUT_RETURN_TYPE</key> - <string>YES</string> - <key>GCC_WARN_UNDECLARED_SELECTOR</key> - <string>YES</string> - <key>GCC_WARN_UNINITIALIZED_AUTOS</key> - <string>YES</string> - <key>GCC_WARN_UNUSED_FUNCTION</key> - <string>YES</string> - <key>GCC_WARN_UNUSED_VARIABLE</key> - <string>YES</string> - <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> - <key>STRIP_INSTALLED_PRODUCT</key> - <string>NO</string> - <key>SYMROOT</key> - <string>${SRCROOT}/../build</string> - <key>VALIDATE_PRODUCT</key> - <string>YES</string> - </dict> - <key>isa</key> - <string>XCBuildConfiguration</string> - <key>name</key> - <string>Release</string> - </dict> - <key>FC8A8F10966AF0D4BEF49EBF2CFF4C0C</key> - <dict> - <key>includeInIndex</key> - <string>1</string> - <key>isa</key> - <string>PBXFileReference</string> - <key>lastKnownFileType</key> - <string>sourcecode.c.h</string> - <key>path</key> - <string>Masonry.h</string> - <key>sourceTree</key> - <string><group></string> - </dict> - <key>FCB543E03B40FD44221FE9A409AE51EA</key> + <key>FBCEC5C8B899A450BBC3A217E518522C</key> <dict> <key>baseConfigurationReference</key> - <string>D17CA42B2DBD2AB2BBA3CBB7E2205968</string> + <string>489F09523F5700F4F414FA98E0BDEEE4</string> <key>buildSettings</key> <dict> + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> + <string>iPhone Developer</string> + <key>DEBUG_INFORMATION_FORMAT</key> + <string>dwarf</string> <key>ENABLE_STRICT_OBJC_MSGSEND</key> <string>YES</string> + <key>GCC_NO_COMMON_BLOCKS</key> + <string>YES</string> <key>GCC_PREFIX_HEADER</key> - <string>Target Support Files/Masonry/Masonry-prefix.pch</string> + <string>Target Support Files/Expecta/Expecta-prefix.pch</string> <key>IPHONEOS_DEPLOYMENT_TARGET</key> - <string>8.0</string> + <string>5.1.1</string> <key>MTL_ENABLE_DEBUG_INFO</key> - <string>NO</string> + <string>YES</string> <key>OTHER_LDFLAGS</key> <string></string> <key>OTHER_LIBTOOLFLAGS</key> @@ -4617,7 +4686,20 @@ <key>isa</key> <string>XCBuildConfiguration</string> <key>name</key> - <string>Release</string> + <string>Debug</string> + </dict> + <key>FC8A8F10966AF0D4BEF49EBF2CFF4C0C</key> + <dict> + <key>includeInIndex</key> + <string>1</string> + <key>isa</key> + <string>PBXFileReference</string> + <key>lastKnownFileType</key> + <string>sourcecode.c.h</string> + <key>path</key> + <string>Masonry.h</string> + <key>sourceTree</key> + <string><group></string> </dict> <key>FDD20DFD3F1DAF2BBE81558D91031534</key> <dict> @@ -4646,7 +4728,7 @@ <string>2147483647</string> <key>files</key> <array> - <string>2CE1968601928518466CC3211E3C6E0D</string> + <string>42691DA8C339FD65A967DAB502CA4079</string> </array> <key>isa</key> <string>PBXFrameworksBuildPhase</string> diff --git a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Masonry.xcscheme b/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Masonry.xcscheme deleted file mode 100644 index 33a4aa3..0000000 --- a/Pods/Pods.xcodeproj/xcshareddata/xcschemes/Masonry.xcscheme +++ /dev/null @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<Scheme - LastUpgradeVersion = "0700" - version = "1.3"> - <BuildAction - parallelizeBuildables = "YES" - buildImplicitDependencies = "YES"> - <BuildActionEntries> - <BuildActionEntry - buildForTesting = "YES" - buildForRunning = "YES" - buildForProfiling = "YES" - buildForArchiving = "YES" - buildForAnalyzing = "YES"> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "53480ED0BE09FF49E34B1702D485CAAB" - BuildableName = "libMasonry.a" - BlueprintName = "Masonry" - ReferencedContainer = "container:Pods.xcodeproj"> - </BuildableReference> - </BuildActionEntry> - </BuildActionEntries> - </BuildAction> - <TestAction - buildConfiguration = "Debug" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - shouldUseLaunchSchemeArgsEnv = "YES"> - <Testables> - </Testables> - <AdditionalOptions> - </AdditionalOptions> - </TestAction> - <LaunchAction - buildConfiguration = "Debug" - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - launchStyle = "0" - useCustomWorkingDirectory = "NO" - ignoresPersistentStateOnLaunch = "NO" - debugDocumentVersioning = "YES" - debugServiceExtension = "internal" - allowLocationSimulation = "YES"> - <MacroExpansion> - <BuildableReference - BuildableIdentifier = "primary" - BlueprintIdentifier = "53480ED0BE09FF49E34B1702D485CAAB" - BuildableName = "libMasonry.a" - BlueprintName = "Masonry" - ReferencedContainer = "container:Pods.xcodeproj"> - </BuildableReference> - </MacroExpansion> - <AdditionalOptions> - </AdditionalOptions> - </LaunchAction> - <ProfileAction - buildConfiguration = "Release" - shouldUseLaunchSchemeArgsEnv = "YES" - savedToolIdentifier = "" - useCustomWorkingDirectory = "NO" - debugDocumentVersioning = "YES"> - </ProfileAction> - <AnalyzeAction - buildConfiguration = "Debug"> - </AnalyzeAction> - <ArchiveAction - buildConfiguration = "Release" - revealArchiveInOrganizer = "YES"> - </ArchiveAction> -</Scheme> diff --git a/Pods/Target Support Files/Expecta/Expecta.xcconfig b/Pods/Target Support Files/Expecta/Expecta.xcconfig index 7fec2e9..22b2637 100644 --- a/Pods/Target Support Files/Expecta/Expecta.xcconfig +++ b/Pods/Target Support Files/Expecta/Expecta.xcconfig @@ -1,6 +1,11 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Expecta +ENABLE_BITCODE = NO +FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Expecta" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = -framework "Foundation" -framework "XCTest" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Pods/Target Support Files/Masonry/Masonry.xcconfig b/Pods/Target Support Files/Masonry/Masonry.xcconfig index 3ea1b2a..da38172 100644 --- a/Pods/Target Support Files/Masonry/Masonry.xcconfig +++ b/Pods/Target Support Files/Masonry/Masonry.xcconfig @@ -1,5 +1,9 @@ +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Masonry GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = "${PODS_ROOT}/Headers/Private" "${PODS_ROOT}/Headers/Private/Masonry" "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = -framework "Foundation" -framework "UIKit" +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_ROOT = ${SRCROOT} -SKIP_INSTALL = YES \ No newline at end of file +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} +SKIP_INSTALL = YES diff --git a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-acknowledgements.markdown b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-acknowledgements.markdown index 56a5907..2a48181 100644 --- a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-acknowledgements.markdown @@ -22,4 +22,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Generated by CocoaPods - http://cocoapods.org +Generated by CocoaPods - https://cocoapods.org diff --git a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-acknowledgements.plist b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-acknowledgements.plist index 834a37e..b05aaf6 100644 --- a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-acknowledgements.plist @@ -40,7 +40,7 @@ THE SOFTWARE.</string> </dict> <dict> <key>FooterText</key> - <string>Generated by CocoaPods - http://cocoapods.org</string> + <string>Generated by CocoaPods - https://cocoapods.org</string> <key>Title</key> <string></string> <key>Type</key> diff --git a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-frameworks.sh b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-frameworks.sh index 6f76344..893c16a 100755 --- a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-frameworks.sh +++ b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-frameworks.sh @@ -16,7 +16,7 @@ install_framework() local source="$1" fi - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" if [ -L "${source}" ]; then echo "Symlinked..." @@ -59,8 +59,8 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" + echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" + /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" fi } diff --git a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-resources.sh b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-resources.sh index 16774fb..0a15615 100755 --- a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-resources.sh +++ b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-resources.sh @@ -1,13 +1,28 @@ #!/bin/sh set -e -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt > "$RESOURCES_TO_COPY" XCASSET_FILES=() +case "${TARGETED_DEVICE_FAMILY}" in + 1,2) + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" + ;; + 1) + TARGET_DEVICE_ARGS="--target-device iphone" + ;; + 2) + TARGET_DEVICE_ARGS="--target-device ipad" + ;; + *) + TARGET_DEVICE_ARGS="--target-device mac" + ;; +esac + realpath() { DIRECTORY="$(cd "${1%/*}" && pwd)" FILENAME="${1##*/}" @@ -16,50 +31,57 @@ realpath() { install_resource() { - case $1 in + if [[ "$1" = /* ]] ; then + RESOURCE_PATH="$1" + else + RESOURCE_PATH="${PODS_ROOT}/$1" + fi + if [[ ! -e "$RESOURCE_PATH" ]] ; then + cat << EOM +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. +EOM + exit 1 + fi + case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") + ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; - /*) - echo "$1" - echo "$1" >> "$RESOURCES_TO_COPY" - ;; *) - echo "${PODS_ROOT}/$1" - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" + echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -68,21 +90,6 @@ rm -f "$RESOURCES_TO_COPY" if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] then - case "${TARGETED_DEVICE_FAMILY}" in - 1,2) - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" - ;; - 1) - TARGET_DEVICE_ARGS="--target-device iphone" - ;; - 2) - TARGET_DEVICE_ARGS="--target-device ipad" - ;; - *) - TARGET_DEVICE_ARGS="--target-device mac" - ;; - esac - # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) while read line; do @@ -91,5 +98,5 @@ then fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi diff --git a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples.debug.xcconfig b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples.debug.xcconfig index 838655a..30f2e9c 100644 --- a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples.debug.xcconfig +++ b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples.debug.xcconfig @@ -1,5 +1,8 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Masonry" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" -PODS_ROOT = ${SRCROOT}/../Pods \ No newline at end of file +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/../Pods diff --git a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples.release.xcconfig b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples.release.xcconfig index 838655a..30f2e9c 100644 --- a/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples.release.xcconfig +++ b/Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples.release.xcconfig @@ -1,5 +1,8 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Masonry" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" -PODS_ROOT = ${SRCROOT}/../Pods \ No newline at end of file +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/../Pods diff --git a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-acknowledgements.markdown b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-acknowledgements.markdown index 6a03f17..c6be231 100644 --- a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-acknowledgements.markdown @@ -23,4 +23,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Generated by CocoaPods - http://cocoapods.org +Generated by CocoaPods - https://cocoapods.org diff --git a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-acknowledgements.plist b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-acknowledgements.plist index 7dda205..d0842c5 100644 --- a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-acknowledgements.plist @@ -41,7 +41,7 @@ THE SOFTWARE. </dict> <dict> <key>FooterText</key> - <string>Generated by CocoaPods - http://cocoapods.org</string> + <string>Generated by CocoaPods - https://cocoapods.org</string> <key>Title</key> <string></string> <key>Type</key> diff --git a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-frameworks.sh b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-frameworks.sh index 6f76344..893c16a 100755 --- a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-frameworks.sh +++ b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-frameworks.sh @@ -16,7 +16,7 @@ install_framework() local source="$1" fi - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" if [ -L "${source}" ]; then echo "Symlinked..." @@ -59,8 +59,8 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" + echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" + /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" fi } diff --git a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-resources.sh b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-resources.sh index 16774fb..0a15615 100755 --- a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-resources.sh +++ b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests-resources.sh @@ -1,13 +1,28 @@ #!/bin/sh set -e -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt > "$RESOURCES_TO_COPY" XCASSET_FILES=() +case "${TARGETED_DEVICE_FAMILY}" in + 1,2) + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" + ;; + 1) + TARGET_DEVICE_ARGS="--target-device iphone" + ;; + 2) + TARGET_DEVICE_ARGS="--target-device ipad" + ;; + *) + TARGET_DEVICE_ARGS="--target-device mac" + ;; +esac + realpath() { DIRECTORY="$(cd "${1%/*}" && pwd)" FILENAME="${1##*/}" @@ -16,50 +31,57 @@ realpath() { install_resource() { - case $1 in + if [[ "$1" = /* ]] ; then + RESOURCE_PATH="$1" + else + RESOURCE_PATH="${PODS_ROOT}/$1" + fi + if [[ ! -e "$RESOURCE_PATH" ]] ; then + cat << EOM +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. +EOM + exit 1 + fi + case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") + ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; - /*) - echo "$1" - echo "$1" >> "$RESOURCES_TO_COPY" - ;; *) - echo "${PODS_ROOT}/$1" - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" + echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -68,21 +90,6 @@ rm -f "$RESOURCES_TO_COPY" if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] then - case "${TARGETED_DEVICE_FAMILY}" in - 1,2) - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" - ;; - 1) - TARGET_DEVICE_ARGS="--target-device iphone" - ;; - 2) - TARGET_DEVICE_ARGS="--target-device ipad" - ;; - *) - TARGET_DEVICE_ARGS="--target-device mac" - ;; - esac - # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) while read line; do @@ -91,5 +98,5 @@ then fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi diff --git a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests.debug.xcconfig b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests.debug.xcconfig index 1b77420..d87dde3 100644 --- a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests.debug.xcconfig +++ b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests.debug.xcconfig @@ -1,6 +1,9 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" +FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Expecta" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = $(inherited) -ObjC -l"Expecta" -framework "Foundation" -framework "XCTest" -PODS_ROOT = ${SRCROOT}/../Pods \ No newline at end of file +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/../Pods diff --git a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests.release.xcconfig b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests.release.xcconfig index 1b77420..d87dde3 100644 --- a/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests.release.xcconfig +++ b/Pods/Target Support Files/Pods-Masonry iOS Tests/Pods-Masonry iOS Tests.release.xcconfig @@ -1,6 +1,9 @@ -FRAMEWORK_SEARCH_PATHS = $(inherited) $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" +FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Expecta" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = $(inherited) -ObjC -l"Expecta" -framework "Foundation" -framework "XCTest" -PODS_ROOT = ${SRCROOT}/../Pods \ No newline at end of file +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/../Pods diff --git a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-acknowledgements.markdown b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-acknowledgements.markdown index 56a5907..2a48181 100644 --- a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-acknowledgements.markdown +++ b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-acknowledgements.markdown @@ -22,4 +22,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -Generated by CocoaPods - http://cocoapods.org +Generated by CocoaPods - https://cocoapods.org diff --git a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-acknowledgements.plist b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-acknowledgements.plist index 834a37e..b05aaf6 100644 --- a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-acknowledgements.plist +++ b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-acknowledgements.plist @@ -40,7 +40,7 @@ THE SOFTWARE.</string> </dict> <dict> <key>FooterText</key> - <string>Generated by CocoaPods - http://cocoapods.org</string> + <string>Generated by CocoaPods - https://cocoapods.org</string> <key>Title</key> <string></string> <key>Type</key> diff --git a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-frameworks.sh b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-frameworks.sh index 6f76344..893c16a 100755 --- a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-frameworks.sh +++ b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-frameworks.sh @@ -16,7 +16,7 @@ install_framework() local source="$1" fi - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" if [ -L "${source}" ]; then echo "Symlinked..." @@ -59,8 +59,8 @@ code_sign_if_enabled() { if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then # Use the current code_sign_identitiy echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" + echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" + /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" fi } diff --git a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-resources.sh b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-resources.sh index 16774fb..0a15615 100755 --- a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-resources.sh +++ b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader-resources.sh @@ -1,13 +1,28 @@ #!/bin/sh set -e -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt > "$RESOURCES_TO_COPY" XCASSET_FILES=() +case "${TARGETED_DEVICE_FAMILY}" in + 1,2) + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" + ;; + 1) + TARGET_DEVICE_ARGS="--target-device iphone" + ;; + 2) + TARGET_DEVICE_ARGS="--target-device ipad" + ;; + *) + TARGET_DEVICE_ARGS="--target-device mac" + ;; +esac + realpath() { DIRECTORY="$(cd "${1%/*}" && pwd)" FILENAME="${1##*/}" @@ -16,50 +31,57 @@ realpath() { install_resource() { - case $1 in + if [[ "$1" = /* ]] ; then + RESOURCE_PATH="$1" + else + RESOURCE_PATH="${PODS_ROOT}/$1" + fi + if [[ ! -e "$RESOURCE_PATH" ]] ; then + cat << EOM +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. +EOM + exit 1 + fi + case $RESOURCE_PATH in *.storyboard) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .storyboard`.storyboardc" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .storyboard`.storyboardc" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.xib) - echo "ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile ${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib ${PODS_ROOT}/$1 --sdk ${SDKROOT}" - ibtool --reference-external-strings-file --errors --warnings --notices --output-format human-readable-text --compile "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$1\" .xib`.nib" "${PODS_ROOT}/$1" --sdk "${SDKROOT}" + echo "ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile ${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib $RESOURCE_PATH --sdk ${SDKROOT} ${TARGET_DEVICE_ARGS}" + ibtool --reference-external-strings-file --errors --warnings --notices --minimum-deployment-target ${!DEPLOYMENT_TARGET_SETTING_NAME} --output-format human-readable-text --compile "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename \"$RESOURCE_PATH\" .xib`.nib" "$RESOURCE_PATH" --sdk "${SDKROOT}" ${TARGET_DEVICE_ARGS} ;; *.framework) - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" ;; *.xcdatamodel) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" ;; *.xcdatamodeld) - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" ;; *.xcmappingmodel) - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" ;; *.xcassets) - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") + ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") ;; - /*) - echo "$1" - echo "$1" >> "$RESOURCES_TO_COPY" - ;; *) - echo "${PODS_ROOT}/$1" - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" + echo "$RESOURCE_PATH" + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" ;; esac } -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" @@ -68,21 +90,6 @@ rm -f "$RESOURCES_TO_COPY" if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] then - case "${TARGETED_DEVICE_FAMILY}" in - 1,2) - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" - ;; - 1) - TARGET_DEVICE_ARGS="--target-device iphone" - ;; - 2) - TARGET_DEVICE_ARGS="--target-device ipad" - ;; - *) - TARGET_DEVICE_ARGS="--target-device mac" - ;; - esac - # Find all other xcassets (this unfortunately includes those of path pods and other targets). OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) while read line; do @@ -91,5 +98,5 @@ then fi done <<<"$OTHER_XCASSETS" - printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${IPHONEOS_DEPLOYMENT_TARGET}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" + printf "%s\0" "${XCASSET_FILES[@]}" | xargs -0 xcrun actool --output-format human-readable-text --notices --warnings --platform "${PLATFORM_NAME}" --minimum-deployment-target "${!DEPLOYMENT_TARGET_SETTING_NAME}" ${TARGET_DEVICE_ARGS} --compress-pngs --compile "${BUILT_PRODUCTS_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" fi diff --git a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader.debug.xcconfig b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader.debug.xcconfig index 838655a..30f2e9c 100644 --- a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader.debug.xcconfig +++ b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader.debug.xcconfig @@ -1,5 +1,8 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Masonry" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" -PODS_ROOT = ${SRCROOT}/../Pods \ No newline at end of file +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/../Pods diff --git a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader.release.xcconfig b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader.release.xcconfig index 838655a..30f2e9c 100644 --- a/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader.release.xcconfig +++ b/Pods/Target Support Files/Pods-MasonryTestsLoader/Pods-MasonryTestsLoader.release.xcconfig @@ -1,5 +1,8 @@ GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Masonry" OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" -PODS_ROOT = ${SRCROOT}/../Pods \ No newline at end of file +PODS_BUILD_DIR = $BUILD_DIR +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) +PODS_ROOT = ${SRCROOT}/../Pods diff --git a/Tests/Masonry Tests.xcodeproj/project.pbxproj b/Tests/Masonry Tests.xcodeproj/project.pbxproj index b27cfd0..73bdb29 100644 --- a/Tests/Masonry Tests.xcodeproj/project.pbxproj +++ b/Tests/Masonry Tests.xcodeproj/project.pbxproj @@ -63,7 +63,7 @@ <key>isa</key> <string>PBXShellScriptBuildPhase</string> <key>name</key> - <string>Check Pods Manifest.lock</string> + <string>[CP] Check Pods Manifest.lock</string> <key>outputPaths</key> <array/> <key>runOnlyForDeploymentPostprocessing</key> @@ -160,7 +160,7 @@ fi <key>isa</key> <string>PBXShellScriptBuildPhase</string> <key>name</key> - <string>Embed Pods Frameworks</string> + <string>[CP] Embed Pods Frameworks</string> <key>outputPaths</key> <array/> <key>runOnlyForDeploymentPostprocessing</key> @@ -184,7 +184,7 @@ fi <key>isa</key> <string>PBXShellScriptBuildPhase</string> <key>name</key> - <string>Embed Pods Frameworks</string> + <string>[CP] Embed Pods Frameworks</string> <key>outputPaths</key> <array/> <key>runOnlyForDeploymentPostprocessing</key> @@ -208,7 +208,7 @@ fi <key>isa</key> <string>PBXShellScriptBuildPhase</string> <key>name</key> - <string>Check Pods Manifest.lock</string> + <string>[CP] Check Pods Manifest.lock</string> <key>outputPaths</key> <array/> <key>runOnlyForDeploymentPostprocessing</key> @@ -268,7 +268,7 @@ fi <key>isa</key> <string>PBXShellScriptBuildPhase</string> <key>name</key> - <string>Copy Pods Resources</string> + <string>[CP] Copy Pods Resources</string> <key>outputPaths</key> <array/> <key>runOnlyForDeploymentPostprocessing</key> @@ -292,7 +292,7 @@ fi <key>isa</key> <string>PBXShellScriptBuildPhase</string> <key>name</key> - <string>Copy Pods Resources</string> + <string>[CP] Copy Pods Resources</string> <key>outputPaths</key> <array/> <key>runOnlyForDeploymentPostprocessing</key>