Committed by
GitHub
Merge pull request #392 from fabb/xcode8
updated .travis.yml to use xcode 8
Showing
40 changed files
with
954 additions
and
859 deletions
1 | --- | 1 | --- |
2 | language: objective-c | 2 | language: objective-c |
3 | -osx_image: xcode7.3 | 3 | +osx_image: xcode8 |
4 | before_install: | 4 | before_install: |
5 | - sudo easy_install cpp-coveralls | 5 | - sudo easy_install cpp-coveralls |
6 | - gem install xcpretty -N | 6 | - gem install xcpretty -N |
@@ -8,7 +8,7 @@ before_install: | @@ -8,7 +8,7 @@ before_install: | ||
8 | 8 | ||
9 | script: | 9 | script: |
10 | - set -o pipefail | 10 | - set -o pipefail |
11 | - - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS Tests' -configuration Debug -sdk iphonesimulator clean test ARCHS=i386 VALID_ARCHS=i386 ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c | 11 | + - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS Tests' -configuration Debug -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 7,OS=10.0' clean test ARCHS=i386 VALID_ARCHS=i386 ONLY_ACTIVE_ARCH=NO GCC_INSTRUMENT_PROGRAM_FLOW_ARCS=YES GCC_GENERATE_TEST_COVERAGE_FILES=YES | xcpretty -c |
12 | - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS' -configuration Debug -sdk iphonesimulator clean build ARCHS=i386 VALID_ARCHS=i386 ONLY_ACTIVE_ARCH=NO | xcpretty -c | 12 | - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry iOS' -configuration Debug -sdk iphonesimulator clean build ARCHS=i386 VALID_ARCHS=i386 ONLY_ACTIVE_ARCH=NO | xcpretty -c |
13 | - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry OSX' -configuration Debug clean build | xcpretty -c | 13 | - xcodebuild -workspace 'Masonry.xcworkspace' -scheme 'Masonry OSX' -configuration Debug clean build | xcpretty -c |
14 | 14 |
@@ -252,7 +252,7 @@ | @@ -252,7 +252,7 @@ | ||
252 | <key>isa</key> | 252 | <key>isa</key> |
253 | <string>PBXShellScriptBuildPhase</string> | 253 | <string>PBXShellScriptBuildPhase</string> |
254 | <key>name</key> | 254 | <key>name</key> |
255 | - <string>Copy Pods Resources</string> | 255 | + <string>[CP] Copy Pods Resources</string> |
256 | <key>outputPaths</key> | 256 | <key>outputPaths</key> |
257 | <array/> | 257 | <array/> |
258 | <key>runOnlyForDeploymentPostprocessing</key> | 258 | <key>runOnlyForDeploymentPostprocessing</key> |
@@ -276,7 +276,7 @@ | @@ -276,7 +276,7 @@ | ||
276 | <key>isa</key> | 276 | <key>isa</key> |
277 | <string>PBXShellScriptBuildPhase</string> | 277 | <string>PBXShellScriptBuildPhase</string> |
278 | <key>name</key> | 278 | <key>name</key> |
279 | - <string>Check Pods Manifest.lock</string> | 279 | + <string>[CP] Check Pods Manifest.lock</string> |
280 | <key>outputPaths</key> | 280 | <key>outputPaths</key> |
281 | <array/> | 281 | <array/> |
282 | <key>runOnlyForDeploymentPostprocessing</key> | 282 | <key>runOnlyForDeploymentPostprocessing</key> |
@@ -313,7 +313,7 @@ fi | @@ -313,7 +313,7 @@ fi | ||
313 | <key>isa</key> | 313 | <key>isa</key> |
314 | <string>PBXShellScriptBuildPhase</string> | 314 | <string>PBXShellScriptBuildPhase</string> |
315 | <key>name</key> | 315 | <key>name</key> |
316 | - <string>Embed Pods Frameworks</string> | 316 | + <string>[CP] Embed Pods Frameworks</string> |
317 | <key>outputPaths</key> | 317 | <key>outputPaths</key> |
318 | <array/> | 318 | <array/> |
319 | <key>runOnlyForDeploymentPostprocessing</key> | 319 | <key>runOnlyForDeploymentPostprocessing</key> |
1 | PODS: | 1 | PODS: |
2 | - - Expecta (1.0.0) | ||
3 | - - Masonry (1.0.0) | 2 | + - Expecta (1.0.5) |
3 | + - Masonry (1.0.2) | ||
4 | 4 | ||
5 | DEPENDENCIES: | 5 | DEPENDENCIES: |
6 | - Expecta | 6 | - Expecta |
@@ -11,7 +11,9 @@ EXTERNAL SOURCES: | @@ -11,7 +11,9 @@ EXTERNAL SOURCES: | ||
11 | :path: "./" | 11 | :path: "./" |
12 | 12 | ||
13 | SPEC CHECKSUMS: | 13 | SPEC CHECKSUMS: |
14 | - Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024 | ||
15 | - Masonry: b529bb169217897b6354d4b56b1fada6d475b13d | 14 | + Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe |
15 | + Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e | ||
16 | 16 | ||
17 | -COCOAPODS: 0.39.0 | 17 | +PODFILE CHECKSUM: a30c350a250a8af6afde1caabae52ede1d76714b |
18 | + | ||
19 | +COCOAPODS: 1.0.1 |
1 | #import "EXPDoubleTuple.h" | 1 | #import "EXPDoubleTuple.h" |
2 | 2 | ||
3 | +#pragma clang diagnostic push | ||
4 | +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" | ||
3 | @implementation EXPDoubleTuple | 5 | @implementation EXPDoubleTuple |
6 | +#pragma clang diagnostic pop | ||
4 | 7 | ||
5 | @synthesize values = _values, size = _size; | 8 | @synthesize values = _values, size = _size; |
6 | 9 |
@@ -6,7 +6,10 @@ | @@ -6,7 +6,10 @@ | ||
6 | #import "EXPBlockDefinedMatcher.h" | 6 | #import "EXPBlockDefinedMatcher.h" |
7 | #import <libkern/OSAtomic.h> | 7 | #import <libkern/OSAtomic.h> |
8 | 8 | ||
9 | +#pragma clang diagnostic push | ||
10 | +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" | ||
9 | @implementation EXPExpect | 11 | @implementation EXPExpect |
12 | +#pragma clang diagnostic pop | ||
10 | 13 | ||
11 | @dynamic | 14 | @dynamic |
12 | actual, | 15 | actual, |
@@ -42,6 +45,7 @@ | @@ -42,6 +45,7 @@ | ||
42 | 45 | ||
43 | - (void)dealloc | 46 | - (void)dealloc |
44 | { | 47 | { |
48 | + [_actualBlock release]; | ||
45 | _actualBlock = nil; | 49 | _actualBlock = nil; |
46 | [super dealloc]; | 50 | [super dealloc]; |
47 | } | 51 | } |
@@ -176,7 +180,10 @@ | @@ -176,7 +180,10 @@ | ||
176 | 180 | ||
177 | @end | 181 | @end |
178 | 182 | ||
183 | +#pragma clang diagnostic push | ||
184 | +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" | ||
179 | @implementation EXPDynamicPredicateMatcher | 185 | @implementation EXPDynamicPredicateMatcher |
186 | +#pragma clang diagnostic pop | ||
180 | 187 | ||
181 | - (instancetype)initWithExpectation:(EXPExpect *)expectation selector:(SEL)selector | 188 | - (instancetype)initWithExpectation:(EXPExpect *)expectation selector:(SEL)selector |
182 | { | 189 | { |
1 | #import "EXPFloatTuple.h" | 1 | #import "EXPFloatTuple.h" |
2 | 2 | ||
3 | +#pragma clang diagnostic push | ||
4 | +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" | ||
3 | @implementation EXPFloatTuple | 5 | @implementation EXPFloatTuple |
6 | +#pragma clang diagnostic pop | ||
4 | 7 | ||
5 | @synthesize values = _values, size = _size; | 8 | @synthesize values = _values, size = _size; |
6 | 9 |
1 | #import "EXPUnsupportedObject.h" | 1 | #import "EXPUnsupportedObject.h" |
2 | 2 | ||
3 | +#pragma clang diagnostic push | ||
4 | +#pragma clang diagnostic ignored "-Wobjc-designated-initializers" | ||
3 | @implementation EXPUnsupportedObject | 5 | @implementation EXPUnsupportedObject |
6 | +#pragma clang diagnostic pop | ||
4 | 7 | ||
5 | @synthesize type=_type; | 8 | @synthesize type=_type; |
6 | 9 |
@@ -12,4 +12,4 @@ FOUNDATION_EXPORT const unsigned char ExpectaVersionString[]; | @@ -12,4 +12,4 @@ FOUNDATION_EXPORT const unsigned char ExpectaVersionString[]; | ||
12 | 12 | ||
13 | // Enable shorthand by default | 13 | // Enable shorthand by default |
14 | #define expect(...) EXP_expect((__VA_ARGS__)) | 14 | #define expect(...) EXP_expect((__VA_ARGS__)) |
15 | -#define failure(...) EXP_failure((__VA_ARGS__)) | ||
15 | +#define failure(...) EXP_failure((__VA_ARGS__)) |
1 | #import <Foundation/Foundation.h> | 1 | #import <Foundation/Foundation.h> |
2 | 2 | ||
3 | #define EXPObjectify(value) _EXPObjectify(@encode(__typeof__((value))), (value)) | 3 | #define EXPObjectify(value) _EXPObjectify(@encode(__typeof__((value))), (value)) |
4 | -#define EXP_expect(actual) _EXP_expect(self, __LINE__, __FILE__, ^id{ return EXPObjectify((actual)); }) | 4 | +#define EXP_expect(actual) _EXP_expect(self, __LINE__, __FILE__, ^id{ __typeof__((actual)) strongActual = (actual); return EXPObjectify(strongActual); }) |
5 | #define EXPMatcherInterface(matcherName, matcherArguments) _EXPMatcherInterface(matcherName, matcherArguments) | 5 | #define EXPMatcherInterface(matcherName, matcherArguments) _EXPMatcherInterface(matcherName, matcherArguments) |
6 | #define EXPMatcherImplementationBegin(matcherName, matcherArguments) _EXPMatcherImplementationBegin(matcherName, matcherArguments) | 6 | #define EXPMatcherImplementationBegin(matcherName, matcherArguments) _EXPMatcherImplementationBegin(matcherName, matcherArguments) |
7 | #define EXPMatcherImplementationEnd _EXPMatcherImplementationEnd | 7 | #define EXPMatcherImplementationEnd _EXPMatcherImplementationEnd |
@@ -53,6 +53,7 @@ EXPFixCategoriesBug(EXPMatcher##matcherName##Matcher); \ | @@ -53,6 +53,7 @@ EXPFixCategoriesBug(EXPMatcher##matcherName##Matcher); \ | ||
53 | #define _EXPMatcherImplementationEnd \ | 53 | #define _EXPMatcherImplementationEnd \ |
54 | } \ | 54 | } \ |
55 | [self applyMatcher:matcher to:&actual]; \ | 55 | [self applyMatcher:matcher to:&actual]; \ |
56 | + [[[NSThread currentThread] threadDictionary] removeObjectForKey:@"EXP_currentMatcher"]; \ | ||
56 | } copy]; \ | 57 | } copy]; \ |
57 | _EXP_release(matcher); \ | 58 | _EXP_release(matcher); \ |
58 | return _EXP_autorelease(matcherBlock); \ | 59 | return _EXP_autorelease(matcherBlock); \ |
@@ -21,7 +21,14 @@ EXPMatcherImplementationBegin(_equal, (id expected)) { | @@ -21,7 +21,14 @@ EXPMatcherImplementationBegin(_equal, (id expected)) { | ||
21 | }); | 21 | }); |
22 | 22 | ||
23 | failureMessageForTo(^NSString *{ | 23 | failureMessageForTo(^NSString *{ |
24 | - return [NSString stringWithFormat:@"expected: %@, got: %@", EXPDescribeObject(expected), EXPDescribeObject(actual)]; | 24 | + NSString *expectedDescription = EXPDescribeObject(expected); |
25 | + NSString *actualDescription = EXPDescribeObject(actual); | ||
26 | + | ||
27 | + if (![expectedDescription isEqualToString:actualDescription]) { | ||
28 | + return [NSString stringWithFormat:@"expected: %@, got: %@", EXPDescribeObject(expected), EXPDescribeObject(actual)]; | ||
29 | + } else { | ||
30 | + return [NSString stringWithFormat:@"expected (%@): %@, got (%@): %@", NSStringFromClass([expected class]), EXPDescribeObject(expected), NSStringFromClass([actual class]), EXPDescribeObject(actual)]; | ||
31 | + } | ||
25 | }); | 32 | }); |
26 | 33 | ||
27 | failureMessageForNotTo(^NSString *{ | 34 | failureMessageForNotTo(^NSString *{ |
@@ -21,7 +21,7 @@ expect(baz).to.equal(3.14159); | @@ -21,7 +21,7 @@ expect(baz).to.equal(3.14159); | ||
21 | Expecta is framework-agnostic: it works well with XCTest and XCTest-compatible test frameworks such as [Specta](http://github.com/petejkim/specta/). | 21 | Expecta is framework-agnostic: it works well with XCTest and XCTest-compatible test frameworks such as [Specta](http://github.com/petejkim/specta/). |
22 | 22 | ||
23 | 23 | ||
24 | -## Setup | 24 | +## Installation |
25 | 25 | ||
26 | You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [CocoaPods](http://github.com/CocoaPods/CocoaPods) or [completely manually](#setting-up-manually). | 26 | You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [CocoaPods](http://github.com/CocoaPods/CocoaPods) or [completely manually](#setting-up-manually). |
27 | 27 | ||
@@ -46,10 +46,10 @@ You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [C | @@ -46,10 +46,10 @@ You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [C | ||
46 | end | 46 | end |
47 | 47 | ||
48 | target :MyAppTests do | 48 | target :MyAppTests do |
49 | - pod 'Expecta', '~> 0.2.4' | 49 | + pod 'Expecta', '~> 1.0.0' |
50 | end | 50 | end |
51 | ``` | 51 | ``` |
52 | - | 52 | + |
53 | 2. Run `pod update` or `pod install` in your project directory. | 53 | 2. Run `pod update` or `pod install` in your project directory. |
54 | 54 | ||
55 | ### Setting Up Manually | 55 | ### Setting Up Manually |
@@ -60,17 +60,17 @@ You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [C | @@ -60,17 +60,17 @@ You can setup Expecta using [Carthage](https://github.com/Carthage/Carthage), [C | ||
60 | 4. For **OS X projects**, copy and add `Expecta.framework` in the `Products/osx` folder to your project's test target. | 60 | 4. For **OS X projects**, copy and add `Expecta.framework` in the `Products/osx` folder to your project's test target. |
61 | 61 | ||
62 | For **iOS projects**, copy and add `Expecta.framework` in the `Products/ios` folder to your project's test target. | 62 | For **iOS projects**, copy and add `Expecta.framework` in the `Products/ios` folder to your project's test target. |
63 | - | 63 | + |
64 | You can also use `libExpecta.a` if you prefer to link Expecta as a static library — iOS 7.x and below require this. | 64 | You can also use `libExpecta.a` if you prefer to link Expecta as a static library — iOS 7.x and below require this. |
65 | - | 65 | + |
66 | 6. Add `-ObjC` and `-all_load` to the **Other Linker Flags** build setting for the test target in your Xcode project. | 66 | 6. Add `-ObjC` and `-all_load` to the **Other Linker Flags** build setting for the test target in your Xcode project. |
67 | 7. You can now use Expecta in your test classes by adding the following import: | 67 | 7. You can now use Expecta in your test classes by adding the following import: |
68 | 68 | ||
69 | ```objective-c | 69 | ```objective-c |
70 | @import Expecta; // If you're using Expecta.framework | 70 | @import Expecta; // If you're using Expecta.framework |
71 | - | 71 | + |
72 | // OR | 72 | // OR |
73 | - | 73 | + |
74 | #import <Expecta/Expecta.h> // If you're using the static library, or the framework | 74 | #import <Expecta/Expecta.h> // If you're using the static library, or the framework |
75 | ``` | 75 | ``` |
76 | 76 |
1 | { | 1 | { |
2 | "name": "Masonry", | 2 | "name": "Masonry", |
3 | - "version": "1.0.0", | 3 | + "version": "1.0.2", |
4 | "license": "MIT", | 4 | "license": "MIT", |
5 | "summary": "Harness the power of Auto Layout NSLayoutConstraints with a simplified, chainable and expressive syntax.", | 5 | "summary": "Harness the power of Auto Layout NSLayoutConstraints with a simplified, chainable and expressive syntax.", |
6 | "homepage": "https://github.com/cloudkite/Masonry", | 6 | "homepage": "https://github.com/cloudkite/Masonry", |
@@ -10,7 +10,7 @@ | @@ -10,7 +10,7 @@ | ||
10 | "social_media_url": "http://twitter.com/cloudkite", | 10 | "social_media_url": "http://twitter.com/cloudkite", |
11 | "source": { | 11 | "source": { |
12 | "git": "https://github.com/cloudkite/Masonry.git", | 12 | "git": "https://github.com/cloudkite/Masonry.git", |
13 | - "tag": "v1.0.0" | 13 | + "tag": "v1.0.2" |
14 | }, | 14 | }, |
15 | "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.", | 15 | "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.", |
16 | "source_files": "Masonry/*.{h,m}", | 16 | "source_files": "Masonry/*.{h,m}", |
1 | PODS: | 1 | PODS: |
2 | - - Expecta (1.0.0) | ||
3 | - - Masonry (1.0.0) | 2 | + - Expecta (1.0.5) |
3 | + - Masonry (1.0.2) | ||
4 | 4 | ||
5 | DEPENDENCIES: | 5 | DEPENDENCIES: |
6 | - Expecta | 6 | - Expecta |
@@ -11,7 +11,9 @@ EXTERNAL SOURCES: | @@ -11,7 +11,9 @@ EXTERNAL SOURCES: | ||
11 | :path: "./" | 11 | :path: "./" |
12 | 12 | ||
13 | SPEC CHECKSUMS: | 13 | SPEC CHECKSUMS: |
14 | - Expecta: 32604574add2c46a36f8d2f716b6c5736eb75024 | ||
15 | - Masonry: b529bb169217897b6354d4b56b1fada6d475b13d | 14 | + Expecta: e1c022fcd33910b6be89c291d2775b3fe27a89fe |
15 | + Masonry: 7c429b56da9d4ee0bbb3ed77a5ea710d6a5df39e | ||
16 | 16 | ||
17 | -COCOAPODS: 0.39.0 | 17 | +PODFILE CHECKSUM: a30c350a250a8af6afde1caabae52ede1d76714b |
18 | + | ||
19 | +COCOAPODS: 1.0.1 |
Pods/ObjectiveC.gcda
deleted
100644 → 0
No preview for this file type
Pods/ObjectiveC.gcno
deleted
100644 → 0
No preview for this file type
@@ -10,6 +10,19 @@ | @@ -10,6 +10,19 @@ | ||
10 | <string>46</string> | 10 | <string>46</string> |
11 | <key>objects</key> | 11 | <key>objects</key> |
12 | <dict> | 12 | <dict> |
13 | + <key>008A5F43350B1984916B33BCAFD01149</key> | ||
14 | + <dict> | ||
15 | + <key>isa</key> | ||
16 | + <string>PBXFileReference</string> | ||
17 | + <key>lastKnownFileType</key> | ||
18 | + <string>wrapper.framework</string> | ||
19 | + <key>name</key> | ||
20 | + <string>UIKit.framework</string> | ||
21 | + <key>path</key> | ||
22 | + <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/UIKit.framework</string> | ||
23 | + <key>sourceTree</key> | ||
24 | + <string>DEVELOPER_DIR</string> | ||
25 | + </dict> | ||
13 | <key>01B7B1098F825865196B739BF9E36C04</key> | 26 | <key>01B7B1098F825865196B739BF9E36C04</key> |
14 | <dict> | 27 | <dict> |
15 | <key>includeInIndex</key> | 28 | <key>includeInIndex</key> |
@@ -106,14 +119,20 @@ | @@ -106,14 +119,20 @@ | ||
106 | <key>sourceTree</key> | 119 | <key>sourceTree</key> |
107 | <string><group></string> | 120 | <string><group></string> |
108 | </dict> | 121 | </dict> |
109 | - <key>03795746783FEB7886DA78C3914F0B16</key> | 122 | + <key>04FB5395AFAF6DDF1ED7B654D1FC5237</key> |
110 | <dict> | 123 | <dict> |
111 | <key>baseConfigurationReference</key> | 124 | <key>baseConfigurationReference</key> |
112 | <string>EF1B79566A439B7A68A81F499EBFDDE1</string> | 125 | <string>EF1B79566A439B7A68A81F499EBFDDE1</string> |
113 | <key>buildSettings</key> | 126 | <key>buildSettings</key> |
114 | <dict> | 127 | <dict> |
128 | + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> | ||
129 | + <string>iPhone Developer</string> | ||
130 | + <key>DEBUG_INFORMATION_FORMAT</key> | ||
131 | + <string>dwarf</string> | ||
115 | <key>ENABLE_STRICT_OBJC_MSGSEND</key> | 132 | <key>ENABLE_STRICT_OBJC_MSGSEND</key> |
116 | <string>YES</string> | 133 | <string>YES</string> |
134 | + <key>GCC_NO_COMMON_BLOCKS</key> | ||
135 | + <string>YES</string> | ||
117 | <key>IPHONEOS_DEPLOYMENT_TARGET</key> | 136 | <key>IPHONEOS_DEPLOYMENT_TARGET</key> |
118 | <string>8.0</string> | 137 | <string>8.0</string> |
119 | <key>MACH_O_TYPE</key> | 138 | <key>MACH_O_TYPE</key> |
@@ -126,6 +145,8 @@ | @@ -126,6 +145,8 @@ | ||
126 | <string></string> | 145 | <string></string> |
127 | <key>PODS_ROOT</key> | 146 | <key>PODS_ROOT</key> |
128 | <string>$(SRCROOT)</string> | 147 | <string>$(SRCROOT)</string> |
148 | + <key>PRODUCT_BUNDLE_IDENTIFIER</key> | ||
149 | + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> | ||
129 | <key>PRODUCT_NAME</key> | 150 | <key>PRODUCT_NAME</key> |
130 | <string>$(TARGET_NAME)</string> | 151 | <string>$(TARGET_NAME)</string> |
131 | <key>SDKROOT</key> | 152 | <key>SDKROOT</key> |
@@ -153,13 +174,6 @@ | @@ -153,13 +174,6 @@ | ||
153 | <key>sourceTree</key> | 174 | <key>sourceTree</key> |
154 | <string><group></string> | 175 | <string><group></string> |
155 | </dict> | 176 | </dict> |
156 | - <key>072295001E57DD17A014E75544C5CC3E</key> | ||
157 | - <dict> | ||
158 | - <key>fileRef</key> | ||
159 | - <string>A09A7E81E94D5275573AF19B08C7093C</string> | ||
160 | - <key>isa</key> | ||
161 | - <string>PBXBuildFile</string> | ||
162 | - </dict> | ||
163 | <key>07282695806D1DFBF187BFA004D80641</key> | 177 | <key>07282695806D1DFBF187BFA004D80641</key> |
164 | <dict> | 178 | <dict> |
165 | <key>fileRef</key> | 179 | <key>fileRef</key> |
@@ -227,6 +241,21 @@ | @@ -227,6 +241,21 @@ | ||
227 | </array> | 241 | </array> |
228 | </dict> | 242 | </dict> |
229 | </dict> | 243 | </dict> |
244 | + <key>08EF1010060E25B5CD5BA885B03DB0EA</key> | ||
245 | + <dict> | ||
246 | + <key>children</key> | ||
247 | + <array> | ||
248 | + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> | ||
249 | + <string>008A5F43350B1984916B33BCAFD01149</string> | ||
250 | + <string>44E91E6A6263B0D61B049B648F6271E7</string> | ||
251 | + </array> | ||
252 | + <key>isa</key> | ||
253 | + <string>PBXGroup</string> | ||
254 | + <key>name</key> | ||
255 | + <string>iOS</string> | ||
256 | + <key>sourceTree</key> | ||
257 | + <string><group></string> | ||
258 | + </dict> | ||
230 | <key>0A28546AD6B1C73C384E28625120AED5</key> | 259 | <key>0A28546AD6B1C73C384E28625120AED5</key> |
231 | <dict> | 260 | <dict> |
232 | <key>includeInIndex</key> | 261 | <key>includeInIndex</key> |
@@ -255,6 +284,13 @@ | @@ -255,6 +284,13 @@ | ||
255 | <key>sourceTree</key> | 284 | <key>sourceTree</key> |
256 | <string><group></string> | 285 | <string><group></string> |
257 | </dict> | 286 | </dict> |
287 | + <key>0A834D048C2A012491E25113117D56A0</key> | ||
288 | + <dict> | ||
289 | + <key>fileRef</key> | ||
290 | + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> | ||
291 | + <key>isa</key> | ||
292 | + <string>PBXBuildFile</string> | ||
293 | + </dict> | ||
258 | <key>0AAF8809A7BBA8A694825848A7EF07D2</key> | 294 | <key>0AAF8809A7BBA8A694825848A7EF07D2</key> |
259 | <dict> | 295 | <dict> |
260 | <key>includeInIndex</key> | 296 | <key>includeInIndex</key> |
@@ -283,6 +319,13 @@ | @@ -283,6 +319,13 @@ | ||
283 | <key>sourceTree</key> | 319 | <key>sourceTree</key> |
284 | <string><group></string> | 320 | <string><group></string> |
285 | </dict> | 321 | </dict> |
322 | + <key>0DF7EB35BC5CF15C74582F7026DA8FAC</key> | ||
323 | + <dict> | ||
324 | + <key>fileRef</key> | ||
325 | + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> | ||
326 | + <key>isa</key> | ||
327 | + <string>PBXBuildFile</string> | ||
328 | + </dict> | ||
286 | <key>0F2DF08BADAA0D595D88E9A5F2F4AE8F</key> | 329 | <key>0F2DF08BADAA0D595D88E9A5F2F4AE8F</key> |
287 | <dict> | 330 | <dict> |
288 | <key>includeInIndex</key> | 331 | <key>includeInIndex</key> |
@@ -406,7 +449,7 @@ | @@ -406,7 +449,7 @@ | ||
406 | <dict> | 449 | <dict> |
407 | <key>children</key> | 450 | <key>children</key> |
408 | <array> | 451 | <array> |
409 | - <string>DECD63C15EA4A6A5E09172088586BA30</string> | 452 | + <string>08EF1010060E25B5CD5BA885B03DB0EA</string> |
410 | </array> | 453 | </array> |
411 | <key>isa</key> | 454 | <key>isa</key> |
412 | <string>PBXGroup</string> | 455 | <string>PBXGroup</string> |
@@ -599,8 +642,8 @@ | @@ -599,8 +642,8 @@ | ||
599 | <string>2147483647</string> | 642 | <string>2147483647</string> |
600 | <key>files</key> | 643 | <key>files</key> |
601 | <array> | 644 | <array> |
602 | - <string>66081D3480D1FA028C4DE2344BF616D4</string> | ||
603 | - <string>69363A59A4E2FF95D6A62AA88641A20A</string> | 645 | + <string>7C8990F70B3DFACC64C905887ECE29A7</string> |
646 | + <string>F415F451C67C56BD2821DFDC2802FE6C</string> | ||
604 | </array> | 647 | </array> |
605 | <key>isa</key> | 648 | <key>isa</key> |
606 | <string>PBXFrameworksBuildPhase</string> | 649 | <string>PBXFrameworksBuildPhase</string> |
@@ -611,8 +654,8 @@ | @@ -611,8 +654,8 @@ | ||
611 | <dict> | 654 | <dict> |
612 | <key>buildConfigurations</key> | 655 | <key>buildConfigurations</key> |
613 | <array> | 656 | <array> |
614 | - <string>1D72FB8E3585AC8DF5186144CB58A821</string> | ||
615 | - <string>A9D74DD3D4F98043508191259AF0C28D</string> | 657 | + <string>8EF03F0376BCC789614FBDADB0ECCD0B</string> |
658 | + <string>DFB95B1AA7E6CB668B2326B1E4E78683</string> | ||
616 | </array> | 659 | </array> |
617 | <key>defaultConfigurationIsVisible</key> | 660 | <key>defaultConfigurationIsVisible</key> |
618 | <string>0</string> | 661 | <string>0</string> |
@@ -634,40 +677,6 @@ | @@ -634,40 +677,6 @@ | ||
634 | <key>sourceTree</key> | 677 | <key>sourceTree</key> |
635 | <string><group></string> | 678 | <string><group></string> |
636 | </dict> | 679 | </dict> |
637 | - <key>1BC29259D6F9F1A79B534F2B8B4D8363</key> | ||
638 | - <dict> | ||
639 | - <key>baseConfigurationReference</key> | ||
640 | - <string>489F09523F5700F4F414FA98E0BDEEE4</string> | ||
641 | - <key>buildSettings</key> | ||
642 | - <dict> | ||
643 | - <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
644 | - <string>YES</string> | ||
645 | - <key>GCC_PREFIX_HEADER</key> | ||
646 | - <string>Target Support Files/Expecta/Expecta-prefix.pch</string> | ||
647 | - <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
648 | - <string>8.0</string> | ||
649 | - <key>MTL_ENABLE_DEBUG_INFO</key> | ||
650 | - <string>YES</string> | ||
651 | - <key>OTHER_LDFLAGS</key> | ||
652 | - <string></string> | ||
653 | - <key>OTHER_LIBTOOLFLAGS</key> | ||
654 | - <string></string> | ||
655 | - <key>PRIVATE_HEADERS_FOLDER_PATH</key> | ||
656 | - <string></string> | ||
657 | - <key>PRODUCT_NAME</key> | ||
658 | - <string>$(TARGET_NAME)</string> | ||
659 | - <key>PUBLIC_HEADERS_FOLDER_PATH</key> | ||
660 | - <string></string> | ||
661 | - <key>SDKROOT</key> | ||
662 | - <string>iphoneos</string> | ||
663 | - <key>SKIP_INSTALL</key> | ||
664 | - <string>YES</string> | ||
665 | - </dict> | ||
666 | - <key>isa</key> | ||
667 | - <string>XCBuildConfiguration</string> | ||
668 | - <key>name</key> | ||
669 | - <string>Debug</string> | ||
670 | - </dict> | ||
671 | <key>1C060BC1E7116BC87FA94B45087D771B</key> | 680 | <key>1C060BC1E7116BC87FA94B45087D771B</key> |
672 | <dict> | 681 | <dict> |
673 | <key>includeInIndex</key> | 682 | <key>includeInIndex</key> |
@@ -696,43 +705,36 @@ | @@ -696,43 +705,36 @@ | ||
696 | <key>sourceTree</key> | 705 | <key>sourceTree</key> |
697 | <string><group></string> | 706 | <string><group></string> |
698 | </dict> | 707 | </dict> |
699 | - <key>1D20E91754698E478D6D3E468D5EC2C8</key> | ||
700 | - <dict> | ||
701 | - <key>includeInIndex</key> | ||
702 | - <string>1</string> | ||
703 | - <key>isa</key> | ||
704 | - <string>PBXFileReference</string> | ||
705 | - <key>lastKnownFileType</key> | ||
706 | - <string>sourcecode.c.h</string> | ||
707 | - <key>name</key> | ||
708 | - <string>EXPMatchers+beNil.h</string> | ||
709 | - <key>path</key> | ||
710 | - <string>Expecta/Matchers/EXPMatchers+beNil.h</string> | ||
711 | - <key>sourceTree</key> | ||
712 | - <string><group></string> | ||
713 | - </dict> | ||
714 | - <key>1D72FB8E3585AC8DF5186144CB58A821</key> | 708 | + <key>1C4E4899BE01820151368B07EB14F4A0</key> |
715 | <dict> | 709 | <dict> |
716 | <key>baseConfigurationReference</key> | 710 | <key>baseConfigurationReference</key> |
717 | - <string>C5ABB1C6CB3F9F99597CCF6727731A7B</string> | 711 | + <string>489F09523F5700F4F414FA98E0BDEEE4</string> |
718 | <key>buildSettings</key> | 712 | <key>buildSettings</key> |
719 | <dict> | 713 | <dict> |
714 | + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> | ||
715 | + <string>iPhone Developer</string> | ||
716 | + <key>DEBUG_INFORMATION_FORMAT</key> | ||
717 | + <string>dwarf-with-dsym</string> | ||
720 | <key>ENABLE_STRICT_OBJC_MSGSEND</key> | 718 | <key>ENABLE_STRICT_OBJC_MSGSEND</key> |
721 | <string>YES</string> | 719 | <string>YES</string> |
720 | + <key>GCC_NO_COMMON_BLOCKS</key> | ||
721 | + <string>YES</string> | ||
722 | + <key>GCC_PREFIX_HEADER</key> | ||
723 | + <string>Target Support Files/Expecta/Expecta-prefix.pch</string> | ||
722 | <key>IPHONEOS_DEPLOYMENT_TARGET</key> | 724 | <key>IPHONEOS_DEPLOYMENT_TARGET</key> |
723 | - <string>8.0</string> | ||
724 | - <key>MACH_O_TYPE</key> | ||
725 | - <string>staticlib</string> | 725 | + <string>5.1.1</string> |
726 | <key>MTL_ENABLE_DEBUG_INFO</key> | 726 | <key>MTL_ENABLE_DEBUG_INFO</key> |
727 | - <string>YES</string> | 727 | + <string>NO</string> |
728 | <key>OTHER_LDFLAGS</key> | 728 | <key>OTHER_LDFLAGS</key> |
729 | <string></string> | 729 | <string></string> |
730 | <key>OTHER_LIBTOOLFLAGS</key> | 730 | <key>OTHER_LIBTOOLFLAGS</key> |
731 | <string></string> | 731 | <string></string> |
732 | - <key>PODS_ROOT</key> | ||
733 | - <string>$(SRCROOT)</string> | 732 | + <key>PRIVATE_HEADERS_FOLDER_PATH</key> |
733 | + <string></string> | ||
734 | <key>PRODUCT_NAME</key> | 734 | <key>PRODUCT_NAME</key> |
735 | <string>$(TARGET_NAME)</string> | 735 | <string>$(TARGET_NAME)</string> |
736 | + <key>PUBLIC_HEADERS_FOLDER_PATH</key> | ||
737 | + <string></string> | ||
736 | <key>SDKROOT</key> | 738 | <key>SDKROOT</key> |
737 | <string>iphoneos</string> | 739 | <string>iphoneos</string> |
738 | <key>SKIP_INSTALL</key> | 740 | <key>SKIP_INSTALL</key> |
@@ -741,7 +743,22 @@ | @@ -741,7 +743,22 @@ | ||
741 | <key>isa</key> | 743 | <key>isa</key> |
742 | <string>XCBuildConfiguration</string> | 744 | <string>XCBuildConfiguration</string> |
743 | <key>name</key> | 745 | <key>name</key> |
744 | - <string>Debug</string> | 746 | + <string>Release</string> |
747 | + </dict> | ||
748 | + <key>1D20E91754698E478D6D3E468D5EC2C8</key> | ||
749 | + <dict> | ||
750 | + <key>includeInIndex</key> | ||
751 | + <string>1</string> | ||
752 | + <key>isa</key> | ||
753 | + <string>PBXFileReference</string> | ||
754 | + <key>lastKnownFileType</key> | ||
755 | + <string>sourcecode.c.h</string> | ||
756 | + <key>name</key> | ||
757 | + <string>EXPMatchers+beNil.h</string> | ||
758 | + <key>path</key> | ||
759 | + <string>Expecta/Matchers/EXPMatchers+beNil.h</string> | ||
760 | + <key>sourceTree</key> | ||
761 | + <string><group></string> | ||
745 | </dict> | 762 | </dict> |
746 | <key>1F04D682D92E0B2B40FCE8BE214BDA61</key> | 763 | <key>1F04D682D92E0B2B40FCE8BE214BDA61</key> |
747 | <dict> | 764 | <dict> |
@@ -929,13 +946,6 @@ | @@ -929,13 +946,6 @@ | ||
929 | </array> | 946 | </array> |
930 | </dict> | 947 | </dict> |
931 | </dict> | 948 | </dict> |
932 | - <key>28C4BD9F8680B3B22D8E0A7A85F1BAA2</key> | ||
933 | - <dict> | ||
934 | - <key>fileRef</key> | ||
935 | - <string>A09A7E81E94D5275573AF19B08C7093C</string> | ||
936 | - <key>isa</key> | ||
937 | - <string>PBXBuildFile</string> | ||
938 | - </dict> | ||
939 | <key>2945FAA75C956DD6A541EB51E42E6899</key> | 949 | <key>2945FAA75C956DD6A541EB51E42E6899</key> |
940 | <dict> | 950 | <dict> |
941 | <key>fileRef</key> | 951 | <key>fileRef</key> |
@@ -1048,19 +1058,12 @@ | @@ -1048,19 +1058,12 @@ | ||
1048 | <key>sourceTree</key> | 1058 | <key>sourceTree</key> |
1049 | <string><group></string> | 1059 | <string><group></string> |
1050 | </dict> | 1060 | </dict> |
1051 | - <key>2CE1968601928518466CC3211E3C6E0D</key> | ||
1052 | - <dict> | ||
1053 | - <key>fileRef</key> | ||
1054 | - <string>A09A7E81E94D5275573AF19B08C7093C</string> | ||
1055 | - <key>isa</key> | ||
1056 | - <string>PBXBuildFile</string> | ||
1057 | - </dict> | ||
1058 | <key>2D8E8EC45A3A1A1D94AE762CB5028504</key> | 1061 | <key>2D8E8EC45A3A1A1D94AE762CB5028504</key> |
1059 | <dict> | 1062 | <dict> |
1060 | <key>buildConfigurations</key> | 1063 | <key>buildConfigurations</key> |
1061 | <array> | 1064 | <array> |
1062 | - <string>A70CDAD61F90AC503C7D04CC22DA2923</string> | ||
1063 | - <string>FB45FFD90572718D82AB9092B750F0CA</string> | 1065 | + <string>47BEF9D903506B003EA5C2B249729489</string> |
1066 | + <string>AAF678CED40D3499169D10F63CA0719E</string> | ||
1064 | </array> | 1067 | </array> |
1065 | <key>defaultConfigurationIsVisible</key> | 1068 | <key>defaultConfigurationIsVisible</key> |
1066 | <string>0</string> | 1069 | <string>0</string> |
@@ -1069,6 +1072,46 @@ | @@ -1069,6 +1072,46 @@ | ||
1069 | <key>isa</key> | 1072 | <key>isa</key> |
1070 | <string>XCConfigurationList</string> | 1073 | <string>XCConfigurationList</string> |
1071 | </dict> | 1074 | </dict> |
1075 | + <key>2DAE732D13CB652A1ECC83370B3C00E5</key> | ||
1076 | + <dict> | ||
1077 | + <key>baseConfigurationReference</key> | ||
1078 | + <string>D17CA42B2DBD2AB2BBA3CBB7E2205968</string> | ||
1079 | + <key>buildSettings</key> | ||
1080 | + <dict> | ||
1081 | + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> | ||
1082 | + <string>iPhone Developer</string> | ||
1083 | + <key>DEBUG_INFORMATION_FORMAT</key> | ||
1084 | + <string>dwarf</string> | ||
1085 | + <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
1086 | + <string>YES</string> | ||
1087 | + <key>GCC_NO_COMMON_BLOCKS</key> | ||
1088 | + <string>YES</string> | ||
1089 | + <key>GCC_PREFIX_HEADER</key> | ||
1090 | + <string>Target Support Files/Masonry/Masonry-prefix.pch</string> | ||
1091 | + <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
1092 | + <string>6.0</string> | ||
1093 | + <key>MTL_ENABLE_DEBUG_INFO</key> | ||
1094 | + <string>YES</string> | ||
1095 | + <key>OTHER_LDFLAGS</key> | ||
1096 | + <string></string> | ||
1097 | + <key>OTHER_LIBTOOLFLAGS</key> | ||
1098 | + <string></string> | ||
1099 | + <key>PRIVATE_HEADERS_FOLDER_PATH</key> | ||
1100 | + <string></string> | ||
1101 | + <key>PRODUCT_NAME</key> | ||
1102 | + <string>$(TARGET_NAME)</string> | ||
1103 | + <key>PUBLIC_HEADERS_FOLDER_PATH</key> | ||
1104 | + <string></string> | ||
1105 | + <key>SDKROOT</key> | ||
1106 | + <string>iphoneos</string> | ||
1107 | + <key>SKIP_INSTALL</key> | ||
1108 | + <string>YES</string> | ||
1109 | + </dict> | ||
1110 | + <key>isa</key> | ||
1111 | + <string>XCBuildConfiguration</string> | ||
1112 | + <key>name</key> | ||
1113 | + <string>Debug</string> | ||
1114 | + </dict> | ||
1072 | <key>2EEEDC3E550D01C56D447F03D0A68EFA</key> | 1115 | <key>2EEEDC3E550D01C56D447F03D0A68EFA</key> |
1073 | <dict> | 1116 | <dict> |
1074 | <key>buildActionMask</key> | 1117 | <key>buildActionMask</key> |
@@ -1132,13 +1175,6 @@ | @@ -1132,13 +1175,6 @@ | ||
1132 | <key>productType</key> | 1175 | <key>productType</key> |
1133 | <string>com.apple.product-type.library.static</string> | 1176 | <string>com.apple.product-type.library.static</string> |
1134 | </dict> | 1177 | </dict> |
1135 | - <key>2F85D170E76C661AB0D9E9A8B206C78D</key> | ||
1136 | - <dict> | ||
1137 | - <key>fileRef</key> | ||
1138 | - <string>A09A7E81E94D5275573AF19B08C7093C</string> | ||
1139 | - <key>isa</key> | ||
1140 | - <string>PBXBuildFile</string> | ||
1141 | - </dict> | ||
1142 | <key>2F9D3747596E4E074C3B776949091047</key> | 1178 | <key>2F9D3747596E4E074C3B776949091047</key> |
1143 | <dict> | 1179 | <dict> |
1144 | <key>fileRef</key> | 1180 | <key>fileRef</key> |
@@ -1322,49 +1358,13 @@ | @@ -1322,49 +1358,13 @@ | ||
1322 | <key>runOnlyForDeploymentPostprocessing</key> | 1358 | <key>runOnlyForDeploymentPostprocessing</key> |
1323 | <string>0</string> | 1359 | <string>0</string> |
1324 | </dict> | 1360 | </dict> |
1325 | - <key>3E9ED5F264BDA4E96E5C47300AF9B75E</key> | ||
1326 | - <dict> | ||
1327 | - <key>baseConfigurationReference</key> | ||
1328 | - <string>AD6D89D8C414349AAD70BD448A0EB42D</string> | ||
1329 | - <key>buildSettings</key> | ||
1330 | - <dict> | ||
1331 | - <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
1332 | - <string>YES</string> | ||
1333 | - <key>GCC_GENERATE_TEST_COVERAGE_FILES</key> | ||
1334 | - <string>YES</string> | ||
1335 | - <key>GCC_INSTRUMENT_PROGRAM_FLOW_ARCS</key> | ||
1336 | - <string>YES</string> | ||
1337 | - <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
1338 | - <string>8.0</string> | ||
1339 | - <key>MACH_O_TYPE</key> | ||
1340 | - <string>staticlib</string> | ||
1341 | - <key>MTL_ENABLE_DEBUG_INFO</key> | ||
1342 | - <string>NO</string> | ||
1343 | - <key>OTHER_LDFLAGS</key> | ||
1344 | - <string></string> | ||
1345 | - <key>OTHER_LIBTOOLFLAGS</key> | ||
1346 | - <string></string> | ||
1347 | - <key>PODS_ROOT</key> | ||
1348 | - <string>$(SRCROOT)</string> | ||
1349 | - <key>PRODUCT_NAME</key> | ||
1350 | - <string>$(TARGET_NAME)</string> | ||
1351 | - <key>SDKROOT</key> | ||
1352 | - <string>iphoneos</string> | ||
1353 | - <key>SKIP_INSTALL</key> | ||
1354 | - <string>YES</string> | ||
1355 | - </dict> | ||
1356 | - <key>isa</key> | ||
1357 | - <string>XCBuildConfiguration</string> | ||
1358 | - <key>name</key> | ||
1359 | - <string>Release</string> | ||
1360 | - </dict> | ||
1361 | <key>3FDF286F5F8FD72B4098D5CE557A32A7</key> | 1361 | <key>3FDF286F5F8FD72B4098D5CE557A32A7</key> |
1362 | <dict> | 1362 | <dict> |
1363 | <key>buildActionMask</key> | 1363 | <key>buildActionMask</key> |
1364 | <string>2147483647</string> | 1364 | <string>2147483647</string> |
1365 | <key>files</key> | 1365 | <key>files</key> |
1366 | <array> | 1366 | <array> |
1367 | - <string>28C4BD9F8680B3B22D8E0A7A85F1BAA2</string> | 1367 | + <string>0DF7EB35BC5CF15C74582F7026DA8FAC</string> |
1368 | </array> | 1368 | </array> |
1369 | <key>isa</key> | 1369 | <key>isa</key> |
1370 | <string>PBXFrameworksBuildPhase</string> | 1370 | <string>PBXFrameworksBuildPhase</string> |
@@ -1437,6 +1437,13 @@ | @@ -1437,6 +1437,13 @@ | ||
1437 | </array> | 1437 | </array> |
1438 | </dict> | 1438 | </dict> |
1439 | </dict> | 1439 | </dict> |
1440 | + <key>42691DA8C339FD65A967DAB502CA4079</key> | ||
1441 | + <dict> | ||
1442 | + <key>fileRef</key> | ||
1443 | + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> | ||
1444 | + <key>isa</key> | ||
1445 | + <string>PBXBuildFile</string> | ||
1446 | + </dict> | ||
1440 | <key>430CE433DB59FE090A8CC6AFCFA43337</key> | 1447 | <key>430CE433DB59FE090A8CC6AFCFA43337</key> |
1441 | <dict> | 1448 | <dict> |
1442 | <key>fileRef</key> | 1449 | <key>fileRef</key> |
@@ -1490,6 +1497,19 @@ | @@ -1490,6 +1497,19 @@ | ||
1490 | <key>sourceTree</key> | 1497 | <key>sourceTree</key> |
1491 | <string><group></string> | 1498 | <string><group></string> |
1492 | </dict> | 1499 | </dict> |
1500 | + <key>44E91E6A6263B0D61B049B648F6271E7</key> | ||
1501 | + <dict> | ||
1502 | + <key>isa</key> | ||
1503 | + <string>PBXFileReference</string> | ||
1504 | + <key>lastKnownFileType</key> | ||
1505 | + <string>wrapper.framework</string> | ||
1506 | + <key>name</key> | ||
1507 | + <string>XCTest.framework</string> | ||
1508 | + <key>path</key> | ||
1509 | + <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/XCTest.framework</string> | ||
1510 | + <key>sourceTree</key> | ||
1511 | + <string>DEVELOPER_DIR</string> | ||
1512 | + </dict> | ||
1493 | <key>46F312CBB94BAE62B58D3D7AE28E8DBD</key> | 1513 | <key>46F312CBB94BAE62B58D3D7AE28E8DBD</key> |
1494 | <dict> | 1514 | <dict> |
1495 | <key>fileRef</key> | 1515 | <key>fileRef</key> |
@@ -1543,45 +1563,123 @@ | @@ -1543,45 +1563,123 @@ | ||
1543 | <key>productType</key> | 1563 | <key>productType</key> |
1544 | <string>com.apple.product-type.library.static</string> | 1564 | <string>com.apple.product-type.library.static</string> |
1545 | </dict> | 1565 | </dict> |
1546 | - <key>481E644C11C98774BE98309BA0A2CB6C</key> | ||
1547 | - <dict> | ||
1548 | - <key>includeInIndex</key> | ||
1549 | - <string>1</string> | ||
1550 | - <key>isa</key> | ||
1551 | - <string>PBXFileReference</string> | ||
1552 | - <key>lastKnownFileType</key> | ||
1553 | - <string>sourcecode.c.h</string> | ||
1554 | - <key>name</key> | ||
1555 | - <string>EXPMatchers+beFalsy.h</string> | ||
1556 | - <key>path</key> | ||
1557 | - <string>Expecta/Matchers/EXPMatchers+beFalsy.h</string> | ||
1558 | - <key>sourceTree</key> | ||
1559 | - <string><group></string> | ||
1560 | - </dict> | ||
1561 | - <key>487899F028C39C1A518547A1AB2F625A</key> | 1566 | + <key>47BEF9D903506B003EA5C2B249729489</key> |
1562 | <dict> | 1567 | <dict> |
1563 | - <key>fileRef</key> | ||
1564 | - <string>7EBF9BAD2F54920E12BA8D79EB3EE01C</string> | ||
1565 | - <key>isa</key> | ||
1566 | - <string>PBXBuildFile</string> | ||
1567 | - <key>settings</key> | 1568 | + <key>buildSettings</key> |
1568 | <dict> | 1569 | <dict> |
1569 | - <key>COMPILER_FLAGS</key> | ||
1570 | - <string>-fno-objc-arc</string> | ||
1571 | - </dict> | ||
1572 | - </dict> | ||
1573 | - <key>489F09523F5700F4F414FA98E0BDEEE4</key> | ||
1574 | - <dict> | ||
1575 | - <key>includeInIndex</key> | ||
1576 | - <string>1</string> | ||
1577 | - <key>isa</key> | ||
1578 | - <string>PBXFileReference</string> | ||
1579 | - <key>lastKnownFileType</key> | ||
1580 | - <string>text.xcconfig</string> | ||
1581 | - <key>path</key> | ||
1582 | - <string>Expecta.xcconfig</string> | ||
1583 | - <key>sourceTree</key> | ||
1584 | - <string><group></string> | 1570 | + <key>ALWAYS_SEARCH_USER_PATHS</key> |
1571 | + <string>NO</string> | ||
1572 | + <key>CLANG_ANALYZER_NONNULL</key> | ||
1573 | + <string>YES</string> | ||
1574 | + <key>CLANG_CXX_LANGUAGE_STANDARD</key> | ||
1575 | + <string>gnu++0x</string> | ||
1576 | + <key>CLANG_CXX_LIBRARY</key> | ||
1577 | + <string>libc++</string> | ||
1578 | + <key>CLANG_ENABLE_MODULES</key> | ||
1579 | + <string>YES</string> | ||
1580 | + <key>CLANG_ENABLE_OBJC_ARC</key> | ||
1581 | + <string>YES</string> | ||
1582 | + <key>CLANG_WARN_BOOL_CONVERSION</key> | ||
1583 | + <string>YES</string> | ||
1584 | + <key>CLANG_WARN_CONSTANT_CONVERSION</key> | ||
1585 | + <string>YES</string> | ||
1586 | + <key>CLANG_WARN_DIRECT_OBJC_ISA_USAGE</key> | ||
1587 | + <string>YES</string> | ||
1588 | + <key>CLANG_WARN_EMPTY_BODY</key> | ||
1589 | + <string>YES</string> | ||
1590 | + <key>CLANG_WARN_ENUM_CONVERSION</key> | ||
1591 | + <string>YES</string> | ||
1592 | + <key>CLANG_WARN_INT_CONVERSION</key> | ||
1593 | + <string>YES</string> | ||
1594 | + <key>CLANG_WARN_OBJC_ROOT_CLASS</key> | ||
1595 | + <string>YES</string> | ||
1596 | + <key>CLANG_WARN_UNREACHABLE_CODE</key> | ||
1597 | + <string>YES</string> | ||
1598 | + <key>CLANG_WARN__DUPLICATE_METHOD_MATCH</key> | ||
1599 | + <string>YES</string> | ||
1600 | + <key>COPY_PHASE_STRIP</key> | ||
1601 | + <string>NO</string> | ||
1602 | + <key>ENABLE_TESTABILITY</key> | ||
1603 | + <string>YES</string> | ||
1604 | + <key>GCC_C_LANGUAGE_STANDARD</key> | ||
1605 | + <string>gnu99</string> | ||
1606 | + <key>GCC_DYNAMIC_NO_PIC</key> | ||
1607 | + <string>NO</string> | ||
1608 | + <key>GCC_OPTIMIZATION_LEVEL</key> | ||
1609 | + <string>0</string> | ||
1610 | + <key>GCC_PREPROCESSOR_DEFINITIONS</key> | ||
1611 | + <array> | ||
1612 | + <string>POD_CONFIGURATION_DEBUG=1</string> | ||
1613 | + <string>DEBUG=1</string> | ||
1614 | + <string>$(inherited)</string> | ||
1615 | + </array> | ||
1616 | + <key>GCC_SYMBOLS_PRIVATE_EXTERN</key> | ||
1617 | + <string>NO</string> | ||
1618 | + <key>GCC_WARN_64_TO_32_BIT_CONVERSION</key> | ||
1619 | + <string>YES</string> | ||
1620 | + <key>GCC_WARN_ABOUT_RETURN_TYPE</key> | ||
1621 | + <string>YES</string> | ||
1622 | + <key>GCC_WARN_UNDECLARED_SELECTOR</key> | ||
1623 | + <string>YES</string> | ||
1624 | + <key>GCC_WARN_UNINITIALIZED_AUTOS</key> | ||
1625 | + <string>YES</string> | ||
1626 | + <key>GCC_WARN_UNUSED_FUNCTION</key> | ||
1627 | + <string>YES</string> | ||
1628 | + <key>GCC_WARN_UNUSED_VARIABLE</key> | ||
1629 | + <string>YES</string> | ||
1630 | + <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
1631 | + <string>8.0</string> | ||
1632 | + <key>ONLY_ACTIVE_ARCH</key> | ||
1633 | + <string>YES</string> | ||
1634 | + <key>STRIP_INSTALLED_PRODUCT</key> | ||
1635 | + <string>NO</string> | ||
1636 | + <key>SYMROOT</key> | ||
1637 | + <string>${SRCROOT}/../build</string> | ||
1638 | + </dict> | ||
1639 | + <key>isa</key> | ||
1640 | + <string>XCBuildConfiguration</string> | ||
1641 | + <key>name</key> | ||
1642 | + <string>Debug</string> | ||
1643 | + </dict> | ||
1644 | + <key>481E644C11C98774BE98309BA0A2CB6C</key> | ||
1645 | + <dict> | ||
1646 | + <key>includeInIndex</key> | ||
1647 | + <string>1</string> | ||
1648 | + <key>isa</key> | ||
1649 | + <string>PBXFileReference</string> | ||
1650 | + <key>lastKnownFileType</key> | ||
1651 | + <string>sourcecode.c.h</string> | ||
1652 | + <key>name</key> | ||
1653 | + <string>EXPMatchers+beFalsy.h</string> | ||
1654 | + <key>path</key> | ||
1655 | + <string>Expecta/Matchers/EXPMatchers+beFalsy.h</string> | ||
1656 | + <key>sourceTree</key> | ||
1657 | + <string><group></string> | ||
1658 | + </dict> | ||
1659 | + <key>487899F028C39C1A518547A1AB2F625A</key> | ||
1660 | + <dict> | ||
1661 | + <key>fileRef</key> | ||
1662 | + <string>7EBF9BAD2F54920E12BA8D79EB3EE01C</string> | ||
1663 | + <key>isa</key> | ||
1664 | + <string>PBXBuildFile</string> | ||
1665 | + <key>settings</key> | ||
1666 | + <dict> | ||
1667 | + <key>COMPILER_FLAGS</key> | ||
1668 | + <string>-fno-objc-arc</string> | ||
1669 | + </dict> | ||
1670 | + </dict> | ||
1671 | + <key>489F09523F5700F4F414FA98E0BDEEE4</key> | ||
1672 | + <dict> | ||
1673 | + <key>includeInIndex</key> | ||
1674 | + <string>1</string> | ||
1675 | + <key>isa</key> | ||
1676 | + <string>PBXFileReference</string> | ||
1677 | + <key>lastKnownFileType</key> | ||
1678 | + <string>text.xcconfig</string> | ||
1679 | + <key>path</key> | ||
1680 | + <string>Expecta.xcconfig</string> | ||
1681 | + <key>sourceTree</key> | ||
1682 | + <string><group></string> | ||
1585 | </dict> | 1683 | </dict> |
1586 | <key>48FB054B1F997F66CA0E17DB3B26223C</key> | 1684 | <key>48FB054B1F997F66CA0E17DB3B26223C</key> |
1587 | <dict> | 1685 | <dict> |
@@ -1731,7 +1829,7 @@ | @@ -1731,7 +1829,7 @@ | ||
1731 | <string>2147483647</string> | 1829 | <string>2147483647</string> |
1732 | <key>files</key> | 1830 | <key>files</key> |
1733 | <array> | 1831 | <array> |
1734 | - <string>072295001E57DD17A014E75544C5CC3E</string> | 1832 | + <string>0A834D048C2A012491E25113117D56A0</string> |
1735 | </array> | 1833 | </array> |
1736 | <key>isa</key> | 1834 | <key>isa</key> |
1737 | <string>PBXFrameworksBuildPhase</string> | 1835 | <string>PBXFrameworksBuildPhase</string> |
@@ -1797,8 +1895,8 @@ | @@ -1797,8 +1895,8 @@ | ||
1797 | <dict> | 1895 | <dict> |
1798 | <key>buildConfigurations</key> | 1896 | <key>buildConfigurations</key> |
1799 | <array> | 1897 | <array> |
1800 | - <string>1BC29259D6F9F1A79B534F2B8B4D8363</string> | ||
1801 | - <string>6E073A0D16A8DFAEE80519C2A1D9553C</string> | 1898 | + <string>FBCEC5C8B899A450BBC3A217E518522C</string> |
1899 | + <string>1C4E4899BE01820151368B07EB14F4A0</string> | ||
1802 | </array> | 1900 | </array> |
1803 | <key>defaultConfigurationIsVisible</key> | 1901 | <key>defaultConfigurationIsVisible</key> |
1804 | <string>0</string> | 1902 | <string>0</string> |
@@ -2027,19 +2125,6 @@ | @@ -2027,19 +2125,6 @@ | ||
2027 | <key>sourceTree</key> | 2125 | <key>sourceTree</key> |
2028 | <string><group></string> | 2126 | <string><group></string> |
2029 | </dict> | 2127 | </dict> |
2030 | - <key>622164B4107630D654F8782C72483711</key> | ||
2031 | - <dict> | ||
2032 | - <key>isa</key> | ||
2033 | - <string>PBXFileReference</string> | ||
2034 | - <key>lastKnownFileType</key> | ||
2035 | - <string>wrapper.framework</string> | ||
2036 | - <key>name</key> | ||
2037 | - <string>UIKit.framework</string> | ||
2038 | - <key>path</key> | ||
2039 | - <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/UIKit.framework</string> | ||
2040 | - <key>sourceTree</key> | ||
2041 | - <string>DEVELOPER_DIR</string> | ||
2042 | - </dict> | ||
2043 | <key>639FB58CFFC214FCCF32C06B0ACC9B5B</key> | 2128 | <key>639FB58CFFC214FCCF32C06B0ACC9B5B</key> |
2044 | <dict> | 2129 | <dict> |
2045 | <key>includeInIndex</key> | 2130 | <key>includeInIndex</key> |
@@ -2080,13 +2165,6 @@ | @@ -2080,13 +2165,6 @@ | ||
2080 | <string>-fno-objc-arc</string> | 2165 | <string>-fno-objc-arc</string> |
2081 | </dict> | 2166 | </dict> |
2082 | </dict> | 2167 | </dict> |
2083 | - <key>66081D3480D1FA028C4DE2344BF616D4</key> | ||
2084 | - <dict> | ||
2085 | - <key>fileRef</key> | ||
2086 | - <string>A09A7E81E94D5275573AF19B08C7093C</string> | ||
2087 | - <key>isa</key> | ||
2088 | - <string>PBXBuildFile</string> | ||
2089 | - </dict> | ||
2090 | <key>663B481626C7E7C19A7A42120FFC0E77</key> | 2168 | <key>663B481626C7E7C19A7A42120FFC0E77</key> |
2091 | <dict> | 2169 | <dict> |
2092 | <key>includeInIndex</key> | 2170 | <key>includeInIndex</key> |
@@ -2144,13 +2222,6 @@ | @@ -2144,13 +2222,6 @@ | ||
2144 | </array> | 2222 | </array> |
2145 | </dict> | 2223 | </dict> |
2146 | </dict> | 2224 | </dict> |
2147 | - <key>69363A59A4E2FF95D6A62AA88641A20A</key> | ||
2148 | - <dict> | ||
2149 | - <key>fileRef</key> | ||
2150 | - <string>F19621A55D90116B728D6C61C1B25EB8</string> | ||
2151 | - <key>isa</key> | ||
2152 | - <string>PBXBuildFile</string> | ||
2153 | - </dict> | ||
2154 | <key>69EBB956302554EA37775F4D806BC4DD</key> | 2225 | <key>69EBB956302554EA37775F4D806BC4DD</key> |
2155 | <dict> | 2226 | <dict> |
2156 | <key>fileRef</key> | 2227 | <key>fileRef</key> |
@@ -2219,40 +2290,6 @@ | @@ -2219,40 +2290,6 @@ | ||
2219 | <string>-fno-objc-arc</string> | 2290 | <string>-fno-objc-arc</string> |
2220 | </dict> | 2291 | </dict> |
2221 | </dict> | 2292 | </dict> |
2222 | - <key>6E073A0D16A8DFAEE80519C2A1D9553C</key> | ||
2223 | - <dict> | ||
2224 | - <key>baseConfigurationReference</key> | ||
2225 | - <string>489F09523F5700F4F414FA98E0BDEEE4</string> | ||
2226 | - <key>buildSettings</key> | ||
2227 | - <dict> | ||
2228 | - <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
2229 | - <string>YES</string> | ||
2230 | - <key>GCC_PREFIX_HEADER</key> | ||
2231 | - <string>Target Support Files/Expecta/Expecta-prefix.pch</string> | ||
2232 | - <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
2233 | - <string>8.0</string> | ||
2234 | - <key>MTL_ENABLE_DEBUG_INFO</key> | ||
2235 | - <string>NO</string> | ||
2236 | - <key>OTHER_LDFLAGS</key> | ||
2237 | - <string></string> | ||
2238 | - <key>OTHER_LIBTOOLFLAGS</key> | ||
2239 | - <string></string> | ||
2240 | - <key>PRIVATE_HEADERS_FOLDER_PATH</key> | ||
2241 | - <string></string> | ||
2242 | - <key>PRODUCT_NAME</key> | ||
2243 | - <string>$(TARGET_NAME)</string> | ||
2244 | - <key>PUBLIC_HEADERS_FOLDER_PATH</key> | ||
2245 | - <string></string> | ||
2246 | - <key>SDKROOT</key> | ||
2247 | - <string>iphoneos</string> | ||
2248 | - <key>SKIP_INSTALL</key> | ||
2249 | - <string>YES</string> | ||
2250 | - </dict> | ||
2251 | - <key>isa</key> | ||
2252 | - <string>XCBuildConfiguration</string> | ||
2253 | - <key>name</key> | ||
2254 | - <string>Release</string> | ||
2255 | - </dict> | ||
2256 | <key>6EB2498C2AFB1DF8555CB7C1EF89CA5C</key> | 2293 | <key>6EB2498C2AFB1DF8555CB7C1EF89CA5C</key> |
2257 | <dict> | 2294 | <dict> |
2258 | <key>fileRef</key> | 2295 | <key>fileRef</key> |
@@ -2308,42 +2345,6 @@ | @@ -2308,42 +2345,6 @@ | ||
2308 | </array> | 2345 | </array> |
2309 | </dict> | 2346 | </dict> |
2310 | </dict> | 2347 | </dict> |
2311 | - <key>718A7D4B90C40E4B8522A192471996B6</key> | ||
2312 | - <dict> | ||
2313 | - <key>baseConfigurationReference</key> | ||
2314 | - <string>41073685DCEF4DD54806A297165DB39F</string> | ||
2315 | - <key>buildSettings</key> | ||
2316 | - <dict> | ||
2317 | - <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
2318 | - <string>YES</string> | ||
2319 | - <key>GCC_GENERATE_TEST_COVERAGE_FILES</key> | ||
2320 | - <string>YES</string> | ||
2321 | - <key>GCC_INSTRUMENT_PROGRAM_FLOW_ARCS</key> | ||
2322 | - <string>YES</string> | ||
2323 | - <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
2324 | - <string>8.0</string> | ||
2325 | - <key>MACH_O_TYPE</key> | ||
2326 | - <string>staticlib</string> | ||
2327 | - <key>MTL_ENABLE_DEBUG_INFO</key> | ||
2328 | - <string>YES</string> | ||
2329 | - <key>OTHER_LDFLAGS</key> | ||
2330 | - <string></string> | ||
2331 | - <key>OTHER_LIBTOOLFLAGS</key> | ||
2332 | - <string></string> | ||
2333 | - <key>PODS_ROOT</key> | ||
2334 | - <string>$(SRCROOT)</string> | ||
2335 | - <key>PRODUCT_NAME</key> | ||
2336 | - <string>$(TARGET_NAME)</string> | ||
2337 | - <key>SDKROOT</key> | ||
2338 | - <string>iphoneos</string> | ||
2339 | - <key>SKIP_INSTALL</key> | ||
2340 | - <string>YES</string> | ||
2341 | - </dict> | ||
2342 | - <key>isa</key> | ||
2343 | - <string>XCBuildConfiguration</string> | ||
2344 | - <key>name</key> | ||
2345 | - <string>Debug</string> | ||
2346 | - </dict> | ||
2347 | <key>72BBF7DE3688F93C88C5736A9BCD98AE</key> | 2348 | <key>72BBF7DE3688F93C88C5736A9BCD98AE</key> |
2348 | <dict> | 2349 | <dict> |
2349 | <key>fileRef</key> | 2350 | <key>fileRef</key> |
@@ -2384,6 +2385,50 @@ | @@ -2384,6 +2385,50 @@ | ||
2384 | </array> | 2385 | </array> |
2385 | </dict> | 2386 | </dict> |
2386 | </dict> | 2387 | </dict> |
2388 | + <key>753F7C0B8DFE76832111E1E02E10D991</key> | ||
2389 | + <dict> | ||
2390 | + <key>baseConfigurationReference</key> | ||
2391 | + <string>41073685DCEF4DD54806A297165DB39F</string> | ||
2392 | + <key>buildSettings</key> | ||
2393 | + <dict> | ||
2394 | + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> | ||
2395 | + <string>iPhone Developer</string> | ||
2396 | + <key>DEBUG_INFORMATION_FORMAT</key> | ||
2397 | + <string>dwarf</string> | ||
2398 | + <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
2399 | + <string>YES</string> | ||
2400 | + <key>GCC_GENERATE_TEST_COVERAGE_FILES</key> | ||
2401 | + <string>YES</string> | ||
2402 | + <key>GCC_INSTRUMENT_PROGRAM_FLOW_ARCS</key> | ||
2403 | + <string>YES</string> | ||
2404 | + <key>GCC_NO_COMMON_BLOCKS</key> | ||
2405 | + <string>YES</string> | ||
2406 | + <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
2407 | + <string>8.0</string> | ||
2408 | + <key>MACH_O_TYPE</key> | ||
2409 | + <string>staticlib</string> | ||
2410 | + <key>MTL_ENABLE_DEBUG_INFO</key> | ||
2411 | + <string>YES</string> | ||
2412 | + <key>OTHER_LDFLAGS</key> | ||
2413 | + <string></string> | ||
2414 | + <key>OTHER_LIBTOOLFLAGS</key> | ||
2415 | + <string></string> | ||
2416 | + <key>PODS_ROOT</key> | ||
2417 | + <string>$(SRCROOT)</string> | ||
2418 | + <key>PRODUCT_BUNDLE_IDENTIFIER</key> | ||
2419 | + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> | ||
2420 | + <key>PRODUCT_NAME</key> | ||
2421 | + <string>$(TARGET_NAME)</string> | ||
2422 | + <key>SDKROOT</key> | ||
2423 | + <string>iphoneos</string> | ||
2424 | + <key>SKIP_INSTALL</key> | ||
2425 | + <string>YES</string> | ||
2426 | + </dict> | ||
2427 | + <key>isa</key> | ||
2428 | + <string>XCBuildConfiguration</string> | ||
2429 | + <key>name</key> | ||
2430 | + <string>Debug</string> | ||
2431 | + </dict> | ||
2387 | <key>7559C19053134AD8CF9C91D122AC2090</key> | 2432 | <key>7559C19053134AD8CF9C91D122AC2090</key> |
2388 | <dict> | 2433 | <dict> |
2389 | <key>includeInIndex</key> | 2434 | <key>includeInIndex</key> |
@@ -2537,6 +2582,13 @@ | @@ -2537,6 +2582,13 @@ | ||
2537 | <key>sourceTree</key> | 2582 | <key>sourceTree</key> |
2538 | <string><group></string> | 2583 | <string><group></string> |
2539 | </dict> | 2584 | </dict> |
2585 | + <key>7C8990F70B3DFACC64C905887ECE29A7</key> | ||
2586 | + <dict> | ||
2587 | + <key>fileRef</key> | ||
2588 | + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> | ||
2589 | + <key>isa</key> | ||
2590 | + <string>PBXBuildFile</string> | ||
2591 | + </dict> | ||
2540 | <key>7C9A0D7E24E5DCE2B938FC4C4901B353</key> | 2592 | <key>7C9A0D7E24E5DCE2B938FC4C4901B353</key> |
2541 | <dict> | 2593 | <dict> |
2542 | <key>includeInIndex</key> | 2594 | <key>includeInIndex</key> |
@@ -2556,7 +2608,7 @@ | @@ -2556,7 +2608,7 @@ | ||
2556 | <dict> | 2608 | <dict> |
2557 | <key>children</key> | 2609 | <key>children</key> |
2558 | <array> | 2610 | <array> |
2559 | - <string>BA6428E9F66FD5A23C0A2E06ED26CD2F</string> | 2611 | + <string>93A4A3777CF96A4AAC1D13BA6DCCEA73</string> |
2560 | <string>0DA9AF80DA7ECA5B4D31C526D9F57DB2</string> | 2612 | <string>0DA9AF80DA7ECA5B4D31C526D9F57DB2</string> |
2561 | <string>122DA2E5084A4393C29BE363C764795C</string> | 2613 | <string>122DA2E5084A4393C29BE363C764795C</string> |
2562 | <string>2C212CDC4B22CF51422FF7C8D4BF9E56</string> | 2614 | <string>2C212CDC4B22CF51422FF7C8D4BF9E56</string> |
@@ -2707,45 +2759,13 @@ | @@ -2707,45 +2759,13 @@ | ||
2707 | <key>sourceTree</key> | 2759 | <key>sourceTree</key> |
2708 | <string><group></string> | 2760 | <string><group></string> |
2709 | </dict> | 2761 | </dict> |
2710 | - <key>861FA3D46E14DDFA0DF00DD281D574B0</key> | 2762 | + <key>872948DAF79618AD725E0BF364E5DDD4</key> |
2711 | <dict> | 2763 | <dict> |
2712 | - <key>baseConfigurationReference</key> | ||
2713 | - <string>590084C07434815AE5BEC2E76CD54154</string> | ||
2714 | - <key>buildSettings</key> | ||
2715 | - <dict> | ||
2716 | - <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
2717 | - <string>YES</string> | ||
2718 | - <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
2719 | - <string>8.0</string> | ||
2720 | - <key>MACH_O_TYPE</key> | ||
2721 | - <string>staticlib</string> | ||
2722 | - <key>MTL_ENABLE_DEBUG_INFO</key> | ||
2723 | - <string>NO</string> | ||
2724 | - <key>OTHER_LDFLAGS</key> | ||
2725 | - <string></string> | ||
2726 | - <key>OTHER_LIBTOOLFLAGS</key> | ||
2727 | - <string></string> | ||
2728 | - <key>PODS_ROOT</key> | ||
2729 | - <string>$(SRCROOT)</string> | ||
2730 | - <key>PRODUCT_NAME</key> | ||
2731 | - <string>$(TARGET_NAME)</string> | ||
2732 | - <key>SDKROOT</key> | ||
2733 | - <string>iphoneos</string> | ||
2734 | - <key>SKIP_INSTALL</key> | ||
2735 | - <string>YES</string> | ||
2736 | - </dict> | ||
2737 | - <key>isa</key> | ||
2738 | - <string>XCBuildConfiguration</string> | ||
2739 | - <key>name</key> | ||
2740 | - <string>Release</string> | ||
2741 | - </dict> | ||
2742 | - <key>872948DAF79618AD725E0BF364E5DDD4</key> | ||
2743 | - <dict> | ||
2744 | - <key>fileRef</key> | ||
2745 | - <string>ADBF0443B4181A4D41268AB9F62AA73C</string> | ||
2746 | - <key>isa</key> | ||
2747 | - <string>PBXBuildFile</string> | ||
2748 | - <key>settings</key> | 2764 | + <key>fileRef</key> |
2765 | + <string>ADBF0443B4181A4D41268AB9F62AA73C</string> | ||
2766 | + <key>isa</key> | ||
2767 | + <string>PBXBuildFile</string> | ||
2768 | + <key>settings</key> | ||
2749 | <dict> | 2769 | <dict> |
2750 | <key>COMPILER_FLAGS</key> | 2770 | <key>COMPILER_FLAGS</key> |
2751 | <string>-fno-objc-arc</string> | 2771 | <string>-fno-objc-arc</string> |
@@ -2828,6 +2848,46 @@ | @@ -2828,6 +2848,46 @@ | ||
2828 | </array> | 2848 | </array> |
2829 | </dict> | 2849 | </dict> |
2830 | </dict> | 2850 | </dict> |
2851 | + <key>8EF03F0376BCC789614FBDADB0ECCD0B</key> | ||
2852 | + <dict> | ||
2853 | + <key>baseConfigurationReference</key> | ||
2854 | + <string>C5ABB1C6CB3F9F99597CCF6727731A7B</string> | ||
2855 | + <key>buildSettings</key> | ||
2856 | + <dict> | ||
2857 | + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> | ||
2858 | + <string>iPhone Developer</string> | ||
2859 | + <key>DEBUG_INFORMATION_FORMAT</key> | ||
2860 | + <string>dwarf</string> | ||
2861 | + <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
2862 | + <string>YES</string> | ||
2863 | + <key>GCC_NO_COMMON_BLOCKS</key> | ||
2864 | + <string>YES</string> | ||
2865 | + <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
2866 | + <string>8.0</string> | ||
2867 | + <key>MACH_O_TYPE</key> | ||
2868 | + <string>staticlib</string> | ||
2869 | + <key>MTL_ENABLE_DEBUG_INFO</key> | ||
2870 | + <string>YES</string> | ||
2871 | + <key>OTHER_LDFLAGS</key> | ||
2872 | + <string></string> | ||
2873 | + <key>OTHER_LIBTOOLFLAGS</key> | ||
2874 | + <string></string> | ||
2875 | + <key>PODS_ROOT</key> | ||
2876 | + <string>$(SRCROOT)</string> | ||
2877 | + <key>PRODUCT_BUNDLE_IDENTIFIER</key> | ||
2878 | + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> | ||
2879 | + <key>PRODUCT_NAME</key> | ||
2880 | + <string>$(TARGET_NAME)</string> | ||
2881 | + <key>SDKROOT</key> | ||
2882 | + <string>iphoneos</string> | ||
2883 | + <key>SKIP_INSTALL</key> | ||
2884 | + <string>YES</string> | ||
2885 | + </dict> | ||
2886 | + <key>isa</key> | ||
2887 | + <string>XCBuildConfiguration</string> | ||
2888 | + <key>name</key> | ||
2889 | + <string>Debug</string> | ||
2890 | + </dict> | ||
2831 | <key>8F3B66464C8F4DC1EDFFEA58A98F9B5C</key> | 2891 | <key>8F3B66464C8F4DC1EDFFEA58A98F9B5C</key> |
2832 | <dict> | 2892 | <dict> |
2833 | <key>includeInIndex</key> | 2893 | <key>includeInIndex</key> |
@@ -2871,6 +2931,46 @@ | @@ -2871,6 +2931,46 @@ | ||
2871 | </array> | 2931 | </array> |
2872 | </dict> | 2932 | </dict> |
2873 | </dict> | 2933 | </dict> |
2934 | + <key>903FBF203C5658B140DF3CBEF5D2090D</key> | ||
2935 | + <dict> | ||
2936 | + <key>baseConfigurationReference</key> | ||
2937 | + <string>D17CA42B2DBD2AB2BBA3CBB7E2205968</string> | ||
2938 | + <key>buildSettings</key> | ||
2939 | + <dict> | ||
2940 | + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> | ||
2941 | + <string>iPhone Developer</string> | ||
2942 | + <key>DEBUG_INFORMATION_FORMAT</key> | ||
2943 | + <string>dwarf-with-dsym</string> | ||
2944 | + <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
2945 | + <string>YES</string> | ||
2946 | + <key>GCC_NO_COMMON_BLOCKS</key> | ||
2947 | + <string>YES</string> | ||
2948 | + <key>GCC_PREFIX_HEADER</key> | ||
2949 | + <string>Target Support Files/Masonry/Masonry-prefix.pch</string> | ||
2950 | + <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
2951 | + <string>6.0</string> | ||
2952 | + <key>MTL_ENABLE_DEBUG_INFO</key> | ||
2953 | + <string>NO</string> | ||
2954 | + <key>OTHER_LDFLAGS</key> | ||
2955 | + <string></string> | ||
2956 | + <key>OTHER_LIBTOOLFLAGS</key> | ||
2957 | + <string></string> | ||
2958 | + <key>PRIVATE_HEADERS_FOLDER_PATH</key> | ||
2959 | + <string></string> | ||
2960 | + <key>PRODUCT_NAME</key> | ||
2961 | + <string>$(TARGET_NAME)</string> | ||
2962 | + <key>PUBLIC_HEADERS_FOLDER_PATH</key> | ||
2963 | + <string></string> | ||
2964 | + <key>SDKROOT</key> | ||
2965 | + <string>iphoneos</string> | ||
2966 | + <key>SKIP_INSTALL</key> | ||
2967 | + <string>YES</string> | ||
2968 | + </dict> | ||
2969 | + <key>isa</key> | ||
2970 | + <string>XCBuildConfiguration</string> | ||
2971 | + <key>name</key> | ||
2972 | + <string>Release</string> | ||
2973 | + </dict> | ||
2874 | <key>913C17684F33A4694BD4B40BBDEFFCC5</key> | 2974 | <key>913C17684F33A4694BD4B40BBDEFFCC5</key> |
2875 | <dict> | 2975 | <dict> |
2876 | <key>fileRef</key> | 2976 | <key>fileRef</key> |
@@ -2920,6 +3020,25 @@ | @@ -2920,6 +3020,25 @@ | ||
2920 | </array> | 3020 | </array> |
2921 | </dict> | 3021 | </dict> |
2922 | </dict> | 3022 | </dict> |
3023 | + <key>93A4A3777CF96A4AAC1D13BA6DCCEA73</key> | ||
3024 | + <dict> | ||
3025 | + <key>explicitFileType</key> | ||
3026 | + <string>text.script.ruby</string> | ||
3027 | + <key>includeInIndex</key> | ||
3028 | + <string>1</string> | ||
3029 | + <key>isa</key> | ||
3030 | + <string>PBXFileReference</string> | ||
3031 | + <key>lastKnownFileType</key> | ||
3032 | + <string>text</string> | ||
3033 | + <key>name</key> | ||
3034 | + <string>Podfile</string> | ||
3035 | + <key>path</key> | ||
3036 | + <string>../Podfile</string> | ||
3037 | + <key>sourceTree</key> | ||
3038 | + <string>SOURCE_ROOT</string> | ||
3039 | + <key>xcLanguageSpecificationIdentifier</key> | ||
3040 | + <string>xcode.lang.ruby</string> | ||
3041 | + </dict> | ||
2923 | <key>9419623067B9E86BA21AAA6E91E4B66D</key> | 3042 | <key>9419623067B9E86BA21AAA6E91E4B66D</key> |
2924 | <dict> | 3043 | <dict> |
2925 | <key>buildActionMask</key> | 3044 | <key>buildActionMask</key> |
@@ -2947,40 +3066,6 @@ | @@ -2947,40 +3066,6 @@ | ||
2947 | </array> | 3066 | </array> |
2948 | </dict> | 3067 | </dict> |
2949 | </dict> | 3068 | </dict> |
2950 | - <key>95AE3FB211FA06239C7330FF540873D7</key> | ||
2951 | - <dict> | ||
2952 | - <key>baseConfigurationReference</key> | ||
2953 | - <string>D17CA42B2DBD2AB2BBA3CBB7E2205968</string> | ||
2954 | - <key>buildSettings</key> | ||
2955 | - <dict> | ||
2956 | - <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
2957 | - <string>YES</string> | ||
2958 | - <key>GCC_PREFIX_HEADER</key> | ||
2959 | - <string>Target Support Files/Masonry/Masonry-prefix.pch</string> | ||
2960 | - <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
2961 | - <string>8.0</string> | ||
2962 | - <key>MTL_ENABLE_DEBUG_INFO</key> | ||
2963 | - <string>YES</string> | ||
2964 | - <key>OTHER_LDFLAGS</key> | ||
2965 | - <string></string> | ||
2966 | - <key>OTHER_LIBTOOLFLAGS</key> | ||
2967 | - <string></string> | ||
2968 | - <key>PRIVATE_HEADERS_FOLDER_PATH</key> | ||
2969 | - <string></string> | ||
2970 | - <key>PRODUCT_NAME</key> | ||
2971 | - <string>$(TARGET_NAME)</string> | ||
2972 | - <key>PUBLIC_HEADERS_FOLDER_PATH</key> | ||
2973 | - <string></string> | ||
2974 | - <key>SDKROOT</key> | ||
2975 | - <string>iphoneos</string> | ||
2976 | - <key>SKIP_INSTALL</key> | ||
2977 | - <string>YES</string> | ||
2978 | - </dict> | ||
2979 | - <key>isa</key> | ||
2980 | - <string>XCBuildConfiguration</string> | ||
2981 | - <key>name</key> | ||
2982 | - <string>Debug</string> | ||
2983 | - </dict> | ||
2984 | <key>9616A699420336DD8F227A5C41E36432</key> | 3069 | <key>9616A699420336DD8F227A5C41E36432</key> |
2985 | <dict> | 3070 | <dict> |
2986 | <key>includeInIndex</key> | 3071 | <key>includeInIndex</key> |
@@ -3025,13 +3110,6 @@ | @@ -3025,13 +3110,6 @@ | ||
3025 | <key>sourceTree</key> | 3110 | <key>sourceTree</key> |
3026 | <string><group></string> | 3111 | <string><group></string> |
3027 | </dict> | 3112 | </dict> |
3028 | - <key>9A6AE1EF2E94AEB6912BE845583E7D57</key> | ||
3029 | - <dict> | ||
3030 | - <key>fileRef</key> | ||
3031 | - <string>622164B4107630D654F8782C72483711</string> | ||
3032 | - <key>isa</key> | ||
3033 | - <string>PBXBuildFile</string> | ||
3034 | - </dict> | ||
3035 | <key>9B546D0F895D9B5A8316B948CEE95C77</key> | 3113 | <key>9B546D0F895D9B5A8316B948CEE95C77</key> |
3036 | <dict> | 3114 | <dict> |
3037 | <key>fileRef</key> | 3115 | <key>fileRef</key> |
@@ -3081,19 +3159,6 @@ | @@ -3081,19 +3159,6 @@ | ||
3081 | <key>sourceTree</key> | 3159 | <key>sourceTree</key> |
3082 | <string><group></string> | 3160 | <string><group></string> |
3083 | </dict> | 3161 | </dict> |
3084 | - <key>A09A7E81E94D5275573AF19B08C7093C</key> | ||
3085 | - <dict> | ||
3086 | - <key>isa</key> | ||
3087 | - <string>PBXFileReference</string> | ||
3088 | - <key>lastKnownFileType</key> | ||
3089 | - <string>wrapper.framework</string> | ||
3090 | - <key>name</key> | ||
3091 | - <string>Foundation.framework</string> | ||
3092 | - <key>path</key> | ||
3093 | - <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/Foundation.framework</string> | ||
3094 | - <key>sourceTree</key> | ||
3095 | - <string>DEVELOPER_DIR</string> | ||
3096 | - </dict> | ||
3097 | <key>A26F992E8831118311F3DB7CB830595A</key> | 3162 | <key>A26F992E8831118311F3DB7CB830595A</key> |
3098 | <dict> | 3163 | <dict> |
3099 | <key>fileRef</key> | 3164 | <key>fileRef</key> |
@@ -3132,79 +3197,6 @@ | @@ -3132,79 +3197,6 @@ | ||
3132 | </array> | 3197 | </array> |
3133 | </dict> | 3198 | </dict> |
3134 | </dict> | 3199 | </dict> |
3135 | - <key>A70CDAD61F90AC503C7D04CC22DA2923</key> | ||
3136 | - <dict> | ||
3137 | - <key>buildSettings</key> | ||
3138 | - <dict> | ||
3139 | - <key>ALWAYS_SEARCH_USER_PATHS</key> | ||
3140 | - <string>NO</string> | ||
3141 | - <key>CLANG_CXX_LANGUAGE_STANDARD</key> | ||
3142 | - <string>gnu++0x</string> | ||
3143 | - <key>CLANG_CXX_LIBRARY</key> | ||
3144 | - <string>libc++</string> | ||
3145 | - <key>CLANG_ENABLE_MODULES</key> | ||
3146 | - <string>YES</string> | ||
3147 | - <key>CLANG_ENABLE_OBJC_ARC</key> | ||
3148 | - <string>YES</string> | ||
3149 | - <key>CLANG_WARN_BOOL_CONVERSION</key> | ||
3150 | - <string>YES</string> | ||
3151 | - <key>CLANG_WARN_CONSTANT_CONVERSION</key> | ||
3152 | - <string>YES</string> | ||
3153 | - <key>CLANG_WARN_DIRECT_OBJC_ISA_USAGE</key> | ||
3154 | - <string>YES</string> | ||
3155 | - <key>CLANG_WARN_EMPTY_BODY</key> | ||
3156 | - <string>YES</string> | ||
3157 | - <key>CLANG_WARN_ENUM_CONVERSION</key> | ||
3158 | - <string>YES</string> | ||
3159 | - <key>CLANG_WARN_INT_CONVERSION</key> | ||
3160 | - <string>YES</string> | ||
3161 | - <key>CLANG_WARN_OBJC_ROOT_CLASS</key> | ||
3162 | - <string>YES</string> | ||
3163 | - <key>CLANG_WARN_UNREACHABLE_CODE</key> | ||
3164 | - <string>YES</string> | ||
3165 | - <key>CLANG_WARN__DUPLICATE_METHOD_MATCH</key> | ||
3166 | - <string>YES</string> | ||
3167 | - <key>COPY_PHASE_STRIP</key> | ||
3168 | - <string>NO</string> | ||
3169 | - <key>GCC_C_LANGUAGE_STANDARD</key> | ||
3170 | - <string>gnu99</string> | ||
3171 | - <key>GCC_DYNAMIC_NO_PIC</key> | ||
3172 | - <string>NO</string> | ||
3173 | - <key>GCC_OPTIMIZATION_LEVEL</key> | ||
3174 | - <string>0</string> | ||
3175 | - <key>GCC_PREPROCESSOR_DEFINITIONS</key> | ||
3176 | - <array> | ||
3177 | - <string>DEBUG=1</string> | ||
3178 | - <string>$(inherited)</string> | ||
3179 | - </array> | ||
3180 | - <key>GCC_SYMBOLS_PRIVATE_EXTERN</key> | ||
3181 | - <string>NO</string> | ||
3182 | - <key>GCC_WARN_64_TO_32_BIT_CONVERSION</key> | ||
3183 | - <string>YES</string> | ||
3184 | - <key>GCC_WARN_ABOUT_RETURN_TYPE</key> | ||
3185 | - <string>YES</string> | ||
3186 | - <key>GCC_WARN_UNDECLARED_SELECTOR</key> | ||
3187 | - <string>YES</string> | ||
3188 | - <key>GCC_WARN_UNINITIALIZED_AUTOS</key> | ||
3189 | - <string>YES</string> | ||
3190 | - <key>GCC_WARN_UNUSED_FUNCTION</key> | ||
3191 | - <string>YES</string> | ||
3192 | - <key>GCC_WARN_UNUSED_VARIABLE</key> | ||
3193 | - <string>YES</string> | ||
3194 | - <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
3195 | - <string>8.0</string> | ||
3196 | - <key>ONLY_ACTIVE_ARCH</key> | ||
3197 | - <string>YES</string> | ||
3198 | - <key>STRIP_INSTALLED_PRODUCT</key> | ||
3199 | - <string>NO</string> | ||
3200 | - <key>SYMROOT</key> | ||
3201 | - <string>${SRCROOT}/../build</string> | ||
3202 | - </dict> | ||
3203 | - <key>isa</key> | ||
3204 | - <string>XCBuildConfiguration</string> | ||
3205 | - <key>name</key> | ||
3206 | - <string>Debug</string> | ||
3207 | - </dict> | ||
3208 | <key>A7141BC83638F4B38D4D312BAE3BDAC4</key> | 3200 | <key>A7141BC83638F4B38D4D312BAE3BDAC4</key> |
3209 | <dict> | 3201 | <dict> |
3210 | <key>fileRef</key> | 3202 | <key>fileRef</key> |
@@ -3224,6 +3216,19 @@ | @@ -3224,6 +3216,19 @@ | ||
3224 | <key>isa</key> | 3216 | <key>isa</key> |
3225 | <string>PBXBuildFile</string> | 3217 | <string>PBXBuildFile</string> |
3226 | </dict> | 3218 | </dict> |
3219 | + <key>A71B6C19E4D0C8A4D14A6EF1AB8728EB</key> | ||
3220 | + <dict> | ||
3221 | + <key>isa</key> | ||
3222 | + <string>PBXFileReference</string> | ||
3223 | + <key>lastKnownFileType</key> | ||
3224 | + <string>wrapper.framework</string> | ||
3225 | + <key>name</key> | ||
3226 | + <string>Foundation.framework</string> | ||
3227 | + <key>path</key> | ||
3228 | + <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.3.sdk/System/Library/Frameworks/Foundation.framework</string> | ||
3229 | + <key>sourceTree</key> | ||
3230 | + <string>DEVELOPER_DIR</string> | ||
3231 | + </dict> | ||
3227 | <key>A76F61E04DD2544A99CC2967B86C5809</key> | 3232 | <key>A76F61E04DD2544A99CC2967B86C5809</key> |
3228 | <dict> | 3233 | <dict> |
3229 | <key>fileRef</key> | 3234 | <key>fileRef</key> |
@@ -3252,38 +3257,6 @@ | @@ -3252,38 +3257,6 @@ | ||
3252 | </array> | 3257 | </array> |
3253 | </dict> | 3258 | </dict> |
3254 | </dict> | 3259 | </dict> |
3255 | - <key>A9D74DD3D4F98043508191259AF0C28D</key> | ||
3256 | - <dict> | ||
3257 | - <key>baseConfigurationReference</key> | ||
3258 | - <string>1B998D4CCC665C40E8A45CF07DFD7ABC</string> | ||
3259 | - <key>buildSettings</key> | ||
3260 | - <dict> | ||
3261 | - <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
3262 | - <string>YES</string> | ||
3263 | - <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
3264 | - <string>8.0</string> | ||
3265 | - <key>MACH_O_TYPE</key> | ||
3266 | - <string>staticlib</string> | ||
3267 | - <key>MTL_ENABLE_DEBUG_INFO</key> | ||
3268 | - <string>NO</string> | ||
3269 | - <key>OTHER_LDFLAGS</key> | ||
3270 | - <string></string> | ||
3271 | - <key>OTHER_LIBTOOLFLAGS</key> | ||
3272 | - <string></string> | ||
3273 | - <key>PODS_ROOT</key> | ||
3274 | - <string>$(SRCROOT)</string> | ||
3275 | - <key>PRODUCT_NAME</key> | ||
3276 | - <string>$(TARGET_NAME)</string> | ||
3277 | - <key>SDKROOT</key> | ||
3278 | - <string>iphoneos</string> | ||
3279 | - <key>SKIP_INSTALL</key> | ||
3280 | - <string>YES</string> | ||
3281 | - </dict> | ||
3282 | - <key>isa</key> | ||
3283 | - <string>XCBuildConfiguration</string> | ||
3284 | - <key>name</key> | ||
3285 | - <string>Release</string> | ||
3286 | - </dict> | ||
3287 | <key>AA7B402D31D86AE5E3DD083408311FF1</key> | 3260 | <key>AA7B402D31D86AE5E3DD083408311FF1</key> |
3288 | <dict> | 3261 | <dict> |
3289 | <key>fileRef</key> | 3262 | <key>fileRef</key> |
@@ -3312,6 +3285,77 @@ | @@ -3312,6 +3285,77 @@ | ||
3312 | </array> | 3285 | </array> |
3313 | </dict> | 3286 | </dict> |
3314 | </dict> | 3287 | </dict> |
3288 | + <key>AAF678CED40D3499169D10F63CA0719E</key> | ||
3289 | + <dict> | ||
3290 | + <key>buildSettings</key> | ||
3291 | + <dict> | ||
3292 | + <key>ALWAYS_SEARCH_USER_PATHS</key> | ||
3293 | + <string>NO</string> | ||
3294 | + <key>CLANG_ANALYZER_NONNULL</key> | ||
3295 | + <string>YES</string> | ||
3296 | + <key>CLANG_CXX_LANGUAGE_STANDARD</key> | ||
3297 | + <string>gnu++0x</string> | ||
3298 | + <key>CLANG_CXX_LIBRARY</key> | ||
3299 | + <string>libc++</string> | ||
3300 | + <key>CLANG_ENABLE_MODULES</key> | ||
3301 | + <string>YES</string> | ||
3302 | + <key>CLANG_ENABLE_OBJC_ARC</key> | ||
3303 | + <string>YES</string> | ||
3304 | + <key>CLANG_WARN_BOOL_CONVERSION</key> | ||
3305 | + <string>YES</string> | ||
3306 | + <key>CLANG_WARN_CONSTANT_CONVERSION</key> | ||
3307 | + <string>YES</string> | ||
3308 | + <key>CLANG_WARN_DIRECT_OBJC_ISA_USAGE</key> | ||
3309 | + <string>YES</string> | ||
3310 | + <key>CLANG_WARN_EMPTY_BODY</key> | ||
3311 | + <string>YES</string> | ||
3312 | + <key>CLANG_WARN_ENUM_CONVERSION</key> | ||
3313 | + <string>YES</string> | ||
3314 | + <key>CLANG_WARN_INT_CONVERSION</key> | ||
3315 | + <string>YES</string> | ||
3316 | + <key>CLANG_WARN_OBJC_ROOT_CLASS</key> | ||
3317 | + <string>YES</string> | ||
3318 | + <key>CLANG_WARN_UNREACHABLE_CODE</key> | ||
3319 | + <string>YES</string> | ||
3320 | + <key>CLANG_WARN__DUPLICATE_METHOD_MATCH</key> | ||
3321 | + <string>YES</string> | ||
3322 | + <key>COPY_PHASE_STRIP</key> | ||
3323 | + <string>YES</string> | ||
3324 | + <key>ENABLE_NS_ASSERTIONS</key> | ||
3325 | + <string>NO</string> | ||
3326 | + <key>GCC_C_LANGUAGE_STANDARD</key> | ||
3327 | + <string>gnu99</string> | ||
3328 | + <key>GCC_PREPROCESSOR_DEFINITIONS</key> | ||
3329 | + <array> | ||
3330 | + <string>POD_CONFIGURATION_RELEASE=1</string> | ||
3331 | + <string>$(inherited)</string> | ||
3332 | + </array> | ||
3333 | + <key>GCC_WARN_64_TO_32_BIT_CONVERSION</key> | ||
3334 | + <string>YES</string> | ||
3335 | + <key>GCC_WARN_ABOUT_RETURN_TYPE</key> | ||
3336 | + <string>YES</string> | ||
3337 | + <key>GCC_WARN_UNDECLARED_SELECTOR</key> | ||
3338 | + <string>YES</string> | ||
3339 | + <key>GCC_WARN_UNINITIALIZED_AUTOS</key> | ||
3340 | + <string>YES</string> | ||
3341 | + <key>GCC_WARN_UNUSED_FUNCTION</key> | ||
3342 | + <string>YES</string> | ||
3343 | + <key>GCC_WARN_UNUSED_VARIABLE</key> | ||
3344 | + <string>YES</string> | ||
3345 | + <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
3346 | + <string>8.0</string> | ||
3347 | + <key>STRIP_INSTALLED_PRODUCT</key> | ||
3348 | + <string>NO</string> | ||
3349 | + <key>SYMROOT</key> | ||
3350 | + <string>${SRCROOT}/../build</string> | ||
3351 | + <key>VALIDATE_PRODUCT</key> | ||
3352 | + <string>YES</string> | ||
3353 | + </dict> | ||
3354 | + <key>isa</key> | ||
3355 | + <string>XCBuildConfiguration</string> | ||
3356 | + <key>name</key> | ||
3357 | + <string>Release</string> | ||
3358 | + </dict> | ||
3315 | <key>AB1D6408D48F6ECF3FCE553BE73961F5</key> | 3359 | <key>AB1D6408D48F6ECF3FCE553BE73961F5</key> |
3316 | <dict> | 3360 | <dict> |
3317 | <key>fileRef</key> | 3361 | <key>fileRef</key> |
@@ -3421,6 +3465,13 @@ | @@ -3421,6 +3465,13 @@ | ||
3421 | <key>sourceTree</key> | 3465 | <key>sourceTree</key> |
3422 | <string><group></string> | 3466 | <string><group></string> |
3423 | </dict> | 3467 | </dict> |
3468 | + <key>AF4E7187E09A5AF3A0758991203153DC</key> | ||
3469 | + <dict> | ||
3470 | + <key>fileRef</key> | ||
3471 | + <string>008A5F43350B1984916B33BCAFD01149</string> | ||
3472 | + <key>isa</key> | ||
3473 | + <string>PBXBuildFile</string> | ||
3474 | + </dict> | ||
3424 | <key>B18DDF0B1F1819021C6B4FD309475D1B</key> | 3475 | <key>B18DDF0B1F1819021C6B4FD309475D1B</key> |
3425 | <dict> | 3476 | <dict> |
3426 | <key>fileRef</key> | 3477 | <key>fileRef</key> |
@@ -3481,8 +3532,8 @@ | @@ -3481,8 +3532,8 @@ | ||
3481 | <dict> | 3532 | <dict> |
3482 | <key>buildConfigurations</key> | 3533 | <key>buildConfigurations</key> |
3483 | <array> | 3534 | <array> |
3484 | - <string>95AE3FB211FA06239C7330FF540873D7</string> | ||
3485 | - <string>FCB543E03B40FD44221FE9A409AE51EA</string> | 3535 | + <string>2DAE732D13CB652A1ECC83370B3C00E5</string> |
3536 | + <string>903FBF203C5658B140DF3CBEF5D2090D</string> | ||
3486 | </array> | 3537 | </array> |
3487 | <key>defaultConfigurationIsVisible</key> | 3538 | <key>defaultConfigurationIsVisible</key> |
3488 | <string>0</string> | 3539 | <string>0</string> |
@@ -3491,23 +3542,6 @@ | @@ -3491,23 +3542,6 @@ | ||
3491 | <key>isa</key> | 3542 | <key>isa</key> |
3492 | <string>XCConfigurationList</string> | 3543 | <string>XCConfigurationList</string> |
3493 | </dict> | 3544 | </dict> |
3494 | - <key>BA6428E9F66FD5A23C0A2E06ED26CD2F</key> | ||
3495 | - <dict> | ||
3496 | - <key>includeInIndex</key> | ||
3497 | - <string>1</string> | ||
3498 | - <key>isa</key> | ||
3499 | - <string>PBXFileReference</string> | ||
3500 | - <key>lastKnownFileType</key> | ||
3501 | - <string>text</string> | ||
3502 | - <key>name</key> | ||
3503 | - <string>Podfile</string> | ||
3504 | - <key>path</key> | ||
3505 | - <string>../Podfile</string> | ||
3506 | - <key>sourceTree</key> | ||
3507 | - <string>SOURCE_ROOT</string> | ||
3508 | - <key>xcLanguageSpecificationIdentifier</key> | ||
3509 | - <string>xcode.lang.ruby</string> | ||
3510 | - </dict> | ||
3511 | <key>BB267133DB0AAEF96D19D2085B85E06D</key> | 3545 | <key>BB267133DB0AAEF96D19D2085B85E06D</key> |
3512 | <dict> | 3546 | <dict> |
3513 | <key>includeInIndex</key> | 3547 | <key>includeInIndex</key> |
@@ -3778,6 +3812,46 @@ | @@ -3778,6 +3812,46 @@ | ||
3778 | <key>sourceTree</key> | 3812 | <key>sourceTree</key> |
3779 | <string><group></string> | 3813 | <string><group></string> |
3780 | </dict> | 3814 | </dict> |
3815 | + <key>C81070C7C06BA1A0C412F073110F269D</key> | ||
3816 | + <dict> | ||
3817 | + <key>baseConfigurationReference</key> | ||
3818 | + <string>590084C07434815AE5BEC2E76CD54154</string> | ||
3819 | + <key>buildSettings</key> | ||
3820 | + <dict> | ||
3821 | + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> | ||
3822 | + <string>iPhone Developer</string> | ||
3823 | + <key>DEBUG_INFORMATION_FORMAT</key> | ||
3824 | + <string>dwarf-with-dsym</string> | ||
3825 | + <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
3826 | + <string>YES</string> | ||
3827 | + <key>GCC_NO_COMMON_BLOCKS</key> | ||
3828 | + <string>YES</string> | ||
3829 | + <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
3830 | + <string>8.0</string> | ||
3831 | + <key>MACH_O_TYPE</key> | ||
3832 | + <string>staticlib</string> | ||
3833 | + <key>MTL_ENABLE_DEBUG_INFO</key> | ||
3834 | + <string>NO</string> | ||
3835 | + <key>OTHER_LDFLAGS</key> | ||
3836 | + <string></string> | ||
3837 | + <key>OTHER_LIBTOOLFLAGS</key> | ||
3838 | + <string></string> | ||
3839 | + <key>PODS_ROOT</key> | ||
3840 | + <string>$(SRCROOT)</string> | ||
3841 | + <key>PRODUCT_BUNDLE_IDENTIFIER</key> | ||
3842 | + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> | ||
3843 | + <key>PRODUCT_NAME</key> | ||
3844 | + <string>$(TARGET_NAME)</string> | ||
3845 | + <key>SDKROOT</key> | ||
3846 | + <string>iphoneos</string> | ||
3847 | + <key>SKIP_INSTALL</key> | ||
3848 | + <string>YES</string> | ||
3849 | + </dict> | ||
3850 | + <key>isa</key> | ||
3851 | + <string>XCBuildConfiguration</string> | ||
3852 | + <key>name</key> | ||
3853 | + <string>Release</string> | ||
3854 | + </dict> | ||
3781 | <key>C934D5D64F7FA6AE026CB137FBAD29E5</key> | 3855 | <key>C934D5D64F7FA6AE026CB137FBAD29E5</key> |
3782 | <dict> | 3856 | <dict> |
3783 | <key>children</key> | 3857 | <key>children</key> |
@@ -3973,7 +4047,7 @@ | @@ -3973,7 +4047,7 @@ | ||
3973 | <key>attributes</key> | 4047 | <key>attributes</key> |
3974 | <dict> | 4048 | <dict> |
3975 | <key>LastSwiftUpdateCheck</key> | 4049 | <key>LastSwiftUpdateCheck</key> |
3976 | - <string>0700</string> | 4050 | + <string>0730</string> |
3977 | <key>LastUpgradeCheck</key> | 4051 | <key>LastUpgradeCheck</key> |
3978 | <string>0700</string> | 4052 | <string>0700</string> |
3979 | </dict> | 4053 | </dict> |
@@ -4204,20 +4278,52 @@ | @@ -4204,20 +4278,52 @@ | ||
4204 | <key>sourceTree</key> | 4278 | <key>sourceTree</key> |
4205 | <string><group></string> | 4279 | <string><group></string> |
4206 | </dict> | 4280 | </dict> |
4207 | - <key>DECD63C15EA4A6A5E09172088586BA30</key> | 4281 | + <key>DE31B168D9197213CEB7B90E3ADEB4CC</key> |
4208 | <dict> | 4282 | <dict> |
4209 | - <key>children</key> | ||
4210 | - <array> | ||
4211 | - <string>A09A7E81E94D5275573AF19B08C7093C</string> | ||
4212 | - <string>622164B4107630D654F8782C72483711</string> | ||
4213 | - <string>F19621A55D90116B728D6C61C1B25EB8</string> | ||
4214 | - </array> | 4283 | + <key>fileRef</key> |
4284 | + <string>A71B6C19E4D0C8A4D14A6EF1AB8728EB</string> | ||
4215 | <key>isa</key> | 4285 | <key>isa</key> |
4216 | - <string>PBXGroup</string> | 4286 | + <string>PBXBuildFile</string> |
4287 | + </dict> | ||
4288 | + <key>DFB95B1AA7E6CB668B2326B1E4E78683</key> | ||
4289 | + <dict> | ||
4290 | + <key>baseConfigurationReference</key> | ||
4291 | + <string>1B998D4CCC665C40E8A45CF07DFD7ABC</string> | ||
4292 | + <key>buildSettings</key> | ||
4293 | + <dict> | ||
4294 | + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> | ||
4295 | + <string>iPhone Developer</string> | ||
4296 | + <key>DEBUG_INFORMATION_FORMAT</key> | ||
4297 | + <string>dwarf-with-dsym</string> | ||
4298 | + <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
4299 | + <string>YES</string> | ||
4300 | + <key>GCC_NO_COMMON_BLOCKS</key> | ||
4301 | + <string>YES</string> | ||
4302 | + <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
4303 | + <string>8.0</string> | ||
4304 | + <key>MACH_O_TYPE</key> | ||
4305 | + <string>staticlib</string> | ||
4306 | + <key>MTL_ENABLE_DEBUG_INFO</key> | ||
4307 | + <string>NO</string> | ||
4308 | + <key>OTHER_LDFLAGS</key> | ||
4309 | + <string></string> | ||
4310 | + <key>OTHER_LIBTOOLFLAGS</key> | ||
4311 | + <string></string> | ||
4312 | + <key>PODS_ROOT</key> | ||
4313 | + <string>$(SRCROOT)</string> | ||
4314 | + <key>PRODUCT_BUNDLE_IDENTIFIER</key> | ||
4315 | + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> | ||
4316 | + <key>PRODUCT_NAME</key> | ||
4317 | + <string>$(TARGET_NAME)</string> | ||
4318 | + <key>SDKROOT</key> | ||
4319 | + <string>iphoneos</string> | ||
4320 | + <key>SKIP_INSTALL</key> | ||
4321 | + <string>YES</string> | ||
4322 | + </dict> | ||
4323 | + <key>isa</key> | ||
4324 | + <string>XCBuildConfiguration</string> | ||
4217 | <key>name</key> | 4325 | <key>name</key> |
4218 | - <string>iOS</string> | ||
4219 | - <key>sourceTree</key> | ||
4220 | - <string><group></string> | 4326 | + <string>Release</string> |
4221 | </dict> | 4327 | </dict> |
4222 | <key>DFF580AE359407E841BA8D8DDCE6E299</key> | 4328 | <key>DFF580AE359407E841BA8D8DDCE6E299</key> |
4223 | <dict> | 4329 | <dict> |
@@ -4328,6 +4434,50 @@ | @@ -4328,6 +4434,50 @@ | ||
4328 | <key>sourceTree</key> | 4434 | <key>sourceTree</key> |
4329 | <string><group></string> | 4435 | <string><group></string> |
4330 | </dict> | 4436 | </dict> |
4437 | + <key>E76DCF132766EC63E76B9D0818ADA5CC</key> | ||
4438 | + <dict> | ||
4439 | + <key>baseConfigurationReference</key> | ||
4440 | + <string>AD6D89D8C414349AAD70BD448A0EB42D</string> | ||
4441 | + <key>buildSettings</key> | ||
4442 | + <dict> | ||
4443 | + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> | ||
4444 | + <string>iPhone Developer</string> | ||
4445 | + <key>DEBUG_INFORMATION_FORMAT</key> | ||
4446 | + <string>dwarf-with-dsym</string> | ||
4447 | + <key>ENABLE_STRICT_OBJC_MSGSEND</key> | ||
4448 | + <string>YES</string> | ||
4449 | + <key>GCC_GENERATE_TEST_COVERAGE_FILES</key> | ||
4450 | + <string>YES</string> | ||
4451 | + <key>GCC_INSTRUMENT_PROGRAM_FLOW_ARCS</key> | ||
4452 | + <string>YES</string> | ||
4453 | + <key>GCC_NO_COMMON_BLOCKS</key> | ||
4454 | + <string>YES</string> | ||
4455 | + <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
4456 | + <string>8.0</string> | ||
4457 | + <key>MACH_O_TYPE</key> | ||
4458 | + <string>staticlib</string> | ||
4459 | + <key>MTL_ENABLE_DEBUG_INFO</key> | ||
4460 | + <string>NO</string> | ||
4461 | + <key>OTHER_LDFLAGS</key> | ||
4462 | + <string></string> | ||
4463 | + <key>OTHER_LIBTOOLFLAGS</key> | ||
4464 | + <string></string> | ||
4465 | + <key>PODS_ROOT</key> | ||
4466 | + <string>$(SRCROOT)</string> | ||
4467 | + <key>PRODUCT_BUNDLE_IDENTIFIER</key> | ||
4468 | + <string>org.cocoapods.${PRODUCT_NAME:rfc1034identifier}</string> | ||
4469 | + <key>PRODUCT_NAME</key> | ||
4470 | + <string>$(TARGET_NAME)</string> | ||
4471 | + <key>SDKROOT</key> | ||
4472 | + <string>iphoneos</string> | ||
4473 | + <key>SKIP_INSTALL</key> | ||
4474 | + <string>YES</string> | ||
4475 | + </dict> | ||
4476 | + <key>isa</key> | ||
4477 | + <string>XCBuildConfiguration</string> | ||
4478 | + <key>name</key> | ||
4479 | + <string>Release</string> | ||
4480 | + </dict> | ||
4331 | <key>E867CBF850D20C314BF4BD790432455D</key> | 4481 | <key>E867CBF850D20C314BF4BD790432455D</key> |
4332 | <dict> | 4482 | <dict> |
4333 | <key>fileRef</key> | 4483 | <key>fileRef</key> |
@@ -4359,8 +4509,8 @@ | @@ -4359,8 +4509,8 @@ | ||
4359 | <dict> | 4509 | <dict> |
4360 | <key>buildConfigurations</key> | 4510 | <key>buildConfigurations</key> |
4361 | <array> | 4511 | <array> |
4362 | - <string>03795746783FEB7886DA78C3914F0B16</string> | ||
4363 | - <string>861FA3D46E14DDFA0DF00DD281D574B0</string> | 4512 | + <string>04FB5395AFAF6DDF1ED7B654D1FC5237</string> |
4513 | + <string>C81070C7C06BA1A0C412F073110F269D</string> | ||
4364 | </array> | 4514 | </array> |
4365 | <key>defaultConfigurationIsVisible</key> | 4515 | <key>defaultConfigurationIsVisible</key> |
4366 | <string>0</string> | 4516 | <string>0</string> |
@@ -4396,19 +4546,6 @@ | @@ -4396,19 +4546,6 @@ | ||
4396 | <key>sourceTree</key> | 4546 | <key>sourceTree</key> |
4397 | <string><group></string> | 4547 | <string><group></string> |
4398 | </dict> | 4548 | </dict> |
4399 | - <key>F19621A55D90116B728D6C61C1B25EB8</key> | ||
4400 | - <dict> | ||
4401 | - <key>isa</key> | ||
4402 | - <string>PBXFileReference</string> | ||
4403 | - <key>lastKnownFileType</key> | ||
4404 | - <string>wrapper.framework</string> | ||
4405 | - <key>name</key> | ||
4406 | - <string>XCTest.framework</string> | ||
4407 | - <key>path</key> | ||
4408 | - <string>Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS9.0.sdk/System/Library/Frameworks/XCTest.framework</string> | ||
4409 | - <key>sourceTree</key> | ||
4410 | - <string>DEVELOPER_DIR</string> | ||
4411 | - </dict> | ||
4412 | <key>F1F4E65611F5567A86AF797EAC3E225B</key> | 4549 | <key>F1F4E65611F5567A86AF797EAC3E225B</key> |
4413 | <dict> | 4550 | <dict> |
4414 | <key>fileRef</key> | 4551 | <key>fileRef</key> |
@@ -4435,6 +4572,13 @@ | @@ -4435,6 +4572,13 @@ | ||
4435 | </array> | 4572 | </array> |
4436 | </dict> | 4573 | </dict> |
4437 | </dict> | 4574 | </dict> |
4575 | + <key>F415F451C67C56BD2821DFDC2802FE6C</key> | ||
4576 | + <dict> | ||
4577 | + <key>fileRef</key> | ||
4578 | + <string>44E91E6A6263B0D61B049B648F6271E7</string> | ||
4579 | + <key>isa</key> | ||
4580 | + <string>PBXBuildFile</string> | ||
4581 | + </dict> | ||
4438 | <key>F4CA468B5A9F8FF2A4DB8B236A8E71BF</key> | 4582 | <key>F4CA468B5A9F8FF2A4DB8B236A8E71BF</key> |
4439 | <dict> | 4583 | <dict> |
4440 | <key>fileRef</key> | 4584 | <key>fileRef</key> |
@@ -4466,8 +4610,8 @@ | @@ -4466,8 +4610,8 @@ | ||
4466 | <dict> | 4610 | <dict> |
4467 | <key>buildConfigurations</key> | 4611 | <key>buildConfigurations</key> |
4468 | <array> | 4612 | <array> |
4469 | - <string>718A7D4B90C40E4B8522A192471996B6</string> | ||
4470 | - <string>3E9ED5F264BDA4E96E5C47300AF9B75E</string> | 4613 | + <string>753F7C0B8DFE76832111E1E02E10D991</string> |
4614 | + <string>E76DCF132766EC63E76B9D0818ADA5CC</string> | ||
4471 | </array> | 4615 | </array> |
4472 | <key>defaultConfigurationIsVisible</key> | 4616 | <key>defaultConfigurationIsVisible</key> |
4473 | <string>0</string> | 4617 | <string>0</string> |
@@ -4496,109 +4640,34 @@ | @@ -4496,109 +4640,34 @@ | ||
4496 | <string>2147483647</string> | 4640 | <string>2147483647</string> |
4497 | <key>files</key> | 4641 | <key>files</key> |
4498 | <array> | 4642 | <array> |
4499 | - <string>2F85D170E76C661AB0D9E9A8B206C78D</string> | ||
4500 | - <string>9A6AE1EF2E94AEB6912BE845583E7D57</string> | 4643 | + <string>DE31B168D9197213CEB7B90E3ADEB4CC</string> |
4644 | + <string>AF4E7187E09A5AF3A0758991203153DC</string> | ||
4501 | </array> | 4645 | </array> |
4502 | <key>isa</key> | 4646 | <key>isa</key> |
4503 | <string>PBXFrameworksBuildPhase</string> | 4647 | <string>PBXFrameworksBuildPhase</string> |
4504 | <key>runOnlyForDeploymentPostprocessing</key> | 4648 | <key>runOnlyForDeploymentPostprocessing</key> |
4505 | <string>0</string> | 4649 | <string>0</string> |
4506 | </dict> | 4650 | </dict> |
4507 | - <key>FB45FFD90572718D82AB9092B750F0CA</key> | ||
4508 | - <dict> | ||
4509 | - <key>buildSettings</key> | ||
4510 | - <dict> | ||
4511 | - <key>ALWAYS_SEARCH_USER_PATHS</key> | ||
4512 | - <string>NO</string> | ||
4513 | - <key>CLANG_CXX_LANGUAGE_STANDARD</key> | ||
4514 | - <string>gnu++0x</string> | ||
4515 | - <key>CLANG_CXX_LIBRARY</key> | ||
4516 | - <string>libc++</string> | ||
4517 | - <key>CLANG_ENABLE_MODULES</key> | ||
4518 | - <string>YES</string> | ||
4519 | - <key>CLANG_ENABLE_OBJC_ARC</key> | ||
4520 | - <string>YES</string> | ||
4521 | - <key>CLANG_WARN_BOOL_CONVERSION</key> | ||
4522 | - <string>YES</string> | ||
4523 | - <key>CLANG_WARN_CONSTANT_CONVERSION</key> | ||
4524 | - <string>YES</string> | ||
4525 | - <key>CLANG_WARN_DIRECT_OBJC_ISA_USAGE</key> | ||
4526 | - <string>YES</string> | ||
4527 | - <key>CLANG_WARN_EMPTY_BODY</key> | ||
4528 | - <string>YES</string> | ||
4529 | - <key>CLANG_WARN_ENUM_CONVERSION</key> | ||
4530 | - <string>YES</string> | ||
4531 | - <key>CLANG_WARN_INT_CONVERSION</key> | ||
4532 | - <string>YES</string> | ||
4533 | - <key>CLANG_WARN_OBJC_ROOT_CLASS</key> | ||
4534 | - <string>YES</string> | ||
4535 | - <key>CLANG_WARN_UNREACHABLE_CODE</key> | ||
4536 | - <string>YES</string> | ||
4537 | - <key>CLANG_WARN__DUPLICATE_METHOD_MATCH</key> | ||
4538 | - <string>YES</string> | ||
4539 | - <key>COPY_PHASE_STRIP</key> | ||
4540 | - <string>YES</string> | ||
4541 | - <key>ENABLE_NS_ASSERTIONS</key> | ||
4542 | - <string>NO</string> | ||
4543 | - <key>GCC_C_LANGUAGE_STANDARD</key> | ||
4544 | - <string>gnu99</string> | ||
4545 | - <key>GCC_PREPROCESSOR_DEFINITIONS</key> | ||
4546 | - <array> | ||
4547 | - <string>RELEASE=1</string> | ||
4548 | - </array> | ||
4549 | - <key>GCC_WARN_64_TO_32_BIT_CONVERSION</key> | ||
4550 | - <string>YES</string> | ||
4551 | - <key>GCC_WARN_ABOUT_RETURN_TYPE</key> | ||
4552 | - <string>YES</string> | ||
4553 | - <key>GCC_WARN_UNDECLARED_SELECTOR</key> | ||
4554 | - <string>YES</string> | ||
4555 | - <key>GCC_WARN_UNINITIALIZED_AUTOS</key> | ||
4556 | - <string>YES</string> | ||
4557 | - <key>GCC_WARN_UNUSED_FUNCTION</key> | ||
4558 | - <string>YES</string> | ||
4559 | - <key>GCC_WARN_UNUSED_VARIABLE</key> | ||
4560 | - <string>YES</string> | ||
4561 | - <key>IPHONEOS_DEPLOYMENT_TARGET</key> | ||
4562 | - <string>8.0</string> | ||
4563 | - <key>STRIP_INSTALLED_PRODUCT</key> | ||
4564 | - <string>NO</string> | ||
4565 | - <key>SYMROOT</key> | ||
4566 | - <string>${SRCROOT}/../build</string> | ||
4567 | - <key>VALIDATE_PRODUCT</key> | ||
4568 | - <string>YES</string> | ||
4569 | - </dict> | ||
4570 | - <key>isa</key> | ||
4571 | - <string>XCBuildConfiguration</string> | ||
4572 | - <key>name</key> | ||
4573 | - <string>Release</string> | ||
4574 | - </dict> | ||
4575 | - <key>FC8A8F10966AF0D4BEF49EBF2CFF4C0C</key> | ||
4576 | - <dict> | ||
4577 | - <key>includeInIndex</key> | ||
4578 | - <string>1</string> | ||
4579 | - <key>isa</key> | ||
4580 | - <string>PBXFileReference</string> | ||
4581 | - <key>lastKnownFileType</key> | ||
4582 | - <string>sourcecode.c.h</string> | ||
4583 | - <key>path</key> | ||
4584 | - <string>Masonry.h</string> | ||
4585 | - <key>sourceTree</key> | ||
4586 | - <string><group></string> | ||
4587 | - </dict> | ||
4588 | - <key>FCB543E03B40FD44221FE9A409AE51EA</key> | 4651 | + <key>FBCEC5C8B899A450BBC3A217E518522C</key> |
4589 | <dict> | 4652 | <dict> |
4590 | <key>baseConfigurationReference</key> | 4653 | <key>baseConfigurationReference</key> |
4591 | - <string>D17CA42B2DBD2AB2BBA3CBB7E2205968</string> | 4654 | + <string>489F09523F5700F4F414FA98E0BDEEE4</string> |
4592 | <key>buildSettings</key> | 4655 | <key>buildSettings</key> |
4593 | <dict> | 4656 | <dict> |
4657 | + <key>CODE_SIGN_IDENTITY[sdk=iphoneos*]</key> | ||
4658 | + <string>iPhone Developer</string> | ||
4659 | + <key>DEBUG_INFORMATION_FORMAT</key> | ||
4660 | + <string>dwarf</string> | ||
4594 | <key>ENABLE_STRICT_OBJC_MSGSEND</key> | 4661 | <key>ENABLE_STRICT_OBJC_MSGSEND</key> |
4595 | <string>YES</string> | 4662 | <string>YES</string> |
4663 | + <key>GCC_NO_COMMON_BLOCKS</key> | ||
4664 | + <string>YES</string> | ||
4596 | <key>GCC_PREFIX_HEADER</key> | 4665 | <key>GCC_PREFIX_HEADER</key> |
4597 | - <string>Target Support Files/Masonry/Masonry-prefix.pch</string> | 4666 | + <string>Target Support Files/Expecta/Expecta-prefix.pch</string> |
4598 | <key>IPHONEOS_DEPLOYMENT_TARGET</key> | 4667 | <key>IPHONEOS_DEPLOYMENT_TARGET</key> |
4599 | - <string>8.0</string> | 4668 | + <string>5.1.1</string> |
4600 | <key>MTL_ENABLE_DEBUG_INFO</key> | 4669 | <key>MTL_ENABLE_DEBUG_INFO</key> |
4601 | - <string>NO</string> | 4670 | + <string>YES</string> |
4602 | <key>OTHER_LDFLAGS</key> | 4671 | <key>OTHER_LDFLAGS</key> |
4603 | <string></string> | 4672 | <string></string> |
4604 | <key>OTHER_LIBTOOLFLAGS</key> | 4673 | <key>OTHER_LIBTOOLFLAGS</key> |
@@ -4617,7 +4686,20 @@ | @@ -4617,7 +4686,20 @@ | ||
4617 | <key>isa</key> | 4686 | <key>isa</key> |
4618 | <string>XCBuildConfiguration</string> | 4687 | <string>XCBuildConfiguration</string> |
4619 | <key>name</key> | 4688 | <key>name</key> |
4620 | - <string>Release</string> | 4689 | + <string>Debug</string> |
4690 | + </dict> | ||
4691 | + <key>FC8A8F10966AF0D4BEF49EBF2CFF4C0C</key> | ||
4692 | + <dict> | ||
4693 | + <key>includeInIndex</key> | ||
4694 | + <string>1</string> | ||
4695 | + <key>isa</key> | ||
4696 | + <string>PBXFileReference</string> | ||
4697 | + <key>lastKnownFileType</key> | ||
4698 | + <string>sourcecode.c.h</string> | ||
4699 | + <key>path</key> | ||
4700 | + <string>Masonry.h</string> | ||
4701 | + <key>sourceTree</key> | ||
4702 | + <string><group></string> | ||
4621 | </dict> | 4703 | </dict> |
4622 | <key>FDD20DFD3F1DAF2BBE81558D91031534</key> | 4704 | <key>FDD20DFD3F1DAF2BBE81558D91031534</key> |
4623 | <dict> | 4705 | <dict> |
@@ -4646,7 +4728,7 @@ | @@ -4646,7 +4728,7 @@ | ||
4646 | <string>2147483647</string> | 4728 | <string>2147483647</string> |
4647 | <key>files</key> | 4729 | <key>files</key> |
4648 | <array> | 4730 | <array> |
4649 | - <string>2CE1968601928518466CC3211E3C6E0D</string> | 4731 | + <string>42691DA8C339FD65A967DAB502CA4079</string> |
4650 | </array> | 4732 | </array> |
4651 | <key>isa</key> | 4733 | <key>isa</key> |
4652 | <string>PBXFrameworksBuildPhase</string> | 4734 | <string>PBXFrameworksBuildPhase</string> |
1 | -<?xml version="1.0" encoding="UTF-8"?> | ||
2 | -<Scheme | ||
3 | - LastUpgradeVersion = "0700" | ||
4 | - version = "1.3"> | ||
5 | - <BuildAction | ||
6 | - parallelizeBuildables = "YES" | ||
7 | - buildImplicitDependencies = "YES"> | ||
8 | - <BuildActionEntries> | ||
9 | - <BuildActionEntry | ||
10 | - buildForTesting = "YES" | ||
11 | - buildForRunning = "YES" | ||
12 | - buildForProfiling = "YES" | ||
13 | - buildForArchiving = "YES" | ||
14 | - buildForAnalyzing = "YES"> | ||
15 | - <BuildableReference | ||
16 | - BuildableIdentifier = "primary" | ||
17 | - BlueprintIdentifier = "53480ED0BE09FF49E34B1702D485CAAB" | ||
18 | - BuildableName = "libMasonry.a" | ||
19 | - BlueprintName = "Masonry" | ||
20 | - ReferencedContainer = "container:Pods.xcodeproj"> | ||
21 | - </BuildableReference> | ||
22 | - </BuildActionEntry> | ||
23 | - </BuildActionEntries> | ||
24 | - </BuildAction> | ||
25 | - <TestAction | ||
26 | - buildConfiguration = "Debug" | ||
27 | - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
28 | - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
29 | - shouldUseLaunchSchemeArgsEnv = "YES"> | ||
30 | - <Testables> | ||
31 | - </Testables> | ||
32 | - <AdditionalOptions> | ||
33 | - </AdditionalOptions> | ||
34 | - </TestAction> | ||
35 | - <LaunchAction | ||
36 | - buildConfiguration = "Debug" | ||
37 | - selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" | ||
38 | - selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" | ||
39 | - launchStyle = "0" | ||
40 | - useCustomWorkingDirectory = "NO" | ||
41 | - ignoresPersistentStateOnLaunch = "NO" | ||
42 | - debugDocumentVersioning = "YES" | ||
43 | - debugServiceExtension = "internal" | ||
44 | - allowLocationSimulation = "YES"> | ||
45 | - <MacroExpansion> | ||
46 | - <BuildableReference | ||
47 | - BuildableIdentifier = "primary" | ||
48 | - BlueprintIdentifier = "53480ED0BE09FF49E34B1702D485CAAB" | ||
49 | - BuildableName = "libMasonry.a" | ||
50 | - BlueprintName = "Masonry" | ||
51 | - ReferencedContainer = "container:Pods.xcodeproj"> | ||
52 | - </BuildableReference> | ||
53 | - </MacroExpansion> | ||
54 | - <AdditionalOptions> | ||
55 | - </AdditionalOptions> | ||
56 | - </LaunchAction> | ||
57 | - <ProfileAction | ||
58 | - buildConfiguration = "Release" | ||
59 | - shouldUseLaunchSchemeArgsEnv = "YES" | ||
60 | - savedToolIdentifier = "" | ||
61 | - useCustomWorkingDirectory = "NO" | ||
62 | - debugDocumentVersioning = "YES"> | ||
63 | - </ProfileAction> | ||
64 | - <AnalyzeAction | ||
65 | - buildConfiguration = "Debug"> | ||
66 | - </AnalyzeAction> | ||
67 | - <ArchiveAction | ||
68 | - buildConfiguration = "Release" | ||
69 | - revealArchiveInOrganizer = "YES"> | ||
70 | - </ArchiveAction> | ||
71 | -</Scheme> |
1 | -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" | 1 | +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Expecta |
2 | +ENABLE_BITCODE = NO | ||
3 | +FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" | ||
2 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 | 4 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 |
3 | 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" | 5 | 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" |
4 | OTHER_LDFLAGS = -framework "Foundation" -framework "XCTest" | 6 | OTHER_LDFLAGS = -framework "Foundation" -framework "XCTest" |
7 | +PODS_BUILD_DIR = $BUILD_DIR | ||
8 | +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) | ||
5 | PODS_ROOT = ${SRCROOT} | 9 | PODS_ROOT = ${SRCROOT} |
6 | -SKIP_INSTALL = YES | ||
10 | +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} | ||
11 | +SKIP_INSTALL = YES |
1 | +CONFIGURATION_BUILD_DIR = $PODS_CONFIGURATION_BUILD_DIR/Masonry | ||
1 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 | 2 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 |
2 | 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" | 3 | 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" |
3 | OTHER_LDFLAGS = -framework "Foundation" -framework "UIKit" | 4 | OTHER_LDFLAGS = -framework "Foundation" -framework "UIKit" |
5 | +PODS_BUILD_DIR = $BUILD_DIR | ||
6 | +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) | ||
4 | PODS_ROOT = ${SRCROOT} | 7 | PODS_ROOT = ${SRCROOT} |
5 | -SKIP_INSTALL = YES | ||
8 | +PRODUCT_BUNDLE_IDENTIFIER = org.cocoapods.${PRODUCT_NAME:rfc1034identifier} | ||
9 | +SKIP_INSTALL = YES |
@@ -22,4 +22,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | @@ -22,4 +22,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
22 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | 22 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
23 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | 23 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
24 | THE SOFTWARE. | 24 | THE SOFTWARE. |
25 | -Generated by CocoaPods - http://cocoapods.org | 25 | +Generated by CocoaPods - https://cocoapods.org |
Pods/Target Support Files/Pods-Masonry iOS Examples/Pods-Masonry iOS Examples-acknowledgements.plist
@@ -40,7 +40,7 @@ THE SOFTWARE.</string> | @@ -40,7 +40,7 @@ THE SOFTWARE.</string> | ||
40 | </dict> | 40 | </dict> |
41 | <dict> | 41 | <dict> |
42 | <key>FooterText</key> | 42 | <key>FooterText</key> |
43 | - <string>Generated by CocoaPods - http://cocoapods.org</string> | 43 | + <string>Generated by CocoaPods - https://cocoapods.org</string> |
44 | <key>Title</key> | 44 | <key>Title</key> |
45 | <string></string> | 45 | <string></string> |
46 | <key>Type</key> | 46 | <key>Type</key> |
@@ -16,7 +16,7 @@ install_framework() | @@ -16,7 +16,7 @@ install_framework() | ||
16 | local source="$1" | 16 | local source="$1" |
17 | fi | 17 | fi |
18 | 18 | ||
19 | - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | 19 | + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" |
20 | 20 | ||
21 | if [ -L "${source}" ]; then | 21 | if [ -L "${source}" ]; then |
22 | echo "Symlinked..." | 22 | echo "Symlinked..." |
@@ -59,8 +59,8 @@ code_sign_if_enabled() { | @@ -59,8 +59,8 @@ code_sign_if_enabled() { | ||
59 | if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then | 59 | if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then |
60 | # Use the current code_sign_identitiy | 60 | # Use the current code_sign_identitiy |
61 | echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" | 61 | echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" |
62 | - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" | ||
63 | - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" | 62 | + echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" |
63 | + /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" | ||
64 | fi | 64 | fi |
65 | } | 65 | } |
66 | 66 |
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | set -e | 2 | set -e |
3 | 3 | ||
4 | -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 4 | +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" |
5 | 5 | ||
6 | RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt | 6 | RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt |
7 | > "$RESOURCES_TO_COPY" | 7 | > "$RESOURCES_TO_COPY" |
8 | 8 | ||
9 | XCASSET_FILES=() | 9 | XCASSET_FILES=() |
10 | 10 | ||
11 | +case "${TARGETED_DEVICE_FAMILY}" in | ||
12 | + 1,2) | ||
13 | + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" | ||
14 | + ;; | ||
15 | + 1) | ||
16 | + TARGET_DEVICE_ARGS="--target-device iphone" | ||
17 | + ;; | ||
18 | + 2) | ||
19 | + TARGET_DEVICE_ARGS="--target-device ipad" | ||
20 | + ;; | ||
21 | + *) | ||
22 | + TARGET_DEVICE_ARGS="--target-device mac" | ||
23 | + ;; | ||
24 | +esac | ||
25 | + | ||
11 | realpath() { | 26 | realpath() { |
12 | DIRECTORY="$(cd "${1%/*}" && pwd)" | 27 | DIRECTORY="$(cd "${1%/*}" && pwd)" |
13 | FILENAME="${1##*/}" | 28 | FILENAME="${1##*/}" |
@@ -16,50 +31,57 @@ realpath() { | @@ -16,50 +31,57 @@ realpath() { | ||
16 | 31 | ||
17 | install_resource() | 32 | install_resource() |
18 | { | 33 | { |
19 | - case $1 in | 34 | + if [[ "$1" = /* ]] ; then |
35 | + RESOURCE_PATH="$1" | ||
36 | + else | ||
37 | + RESOURCE_PATH="${PODS_ROOT}/$1" | ||
38 | + fi | ||
39 | + if [[ ! -e "$RESOURCE_PATH" ]] ; then | ||
40 | + cat << EOM | ||
41 | +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. | ||
42 | +EOM | ||
43 | + exit 1 | ||
44 | + fi | ||
45 | + case $RESOURCE_PATH in | ||
20 | *.storyboard) | 46 | *.storyboard) |
21 | - 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}" | ||
22 | - 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}" | 47 | + 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}" |
48 | + 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} | ||
23 | ;; | 49 | ;; |
24 | *.xib) | 50 | *.xib) |
25 | - 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}" | ||
26 | - 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}" | 51 | + 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}" |
52 | + 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} | ||
27 | ;; | 53 | ;; |
28 | *.framework) | 54 | *.framework) |
29 | - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
30 | - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
31 | - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
32 | - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | 55 | + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" |
56 | + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
57 | + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
58 | + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
33 | ;; | 59 | ;; |
34 | *.xcdatamodel) | 60 | *.xcdatamodel) |
35 | - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" | ||
36 | - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" | 61 | + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" |
62 | + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" | ||
37 | ;; | 63 | ;; |
38 | *.xcdatamodeld) | 64 | *.xcdatamodeld) |
39 | - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" | ||
40 | - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" | 65 | + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" |
66 | + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" | ||
41 | ;; | 67 | ;; |
42 | *.xcmappingmodel) | 68 | *.xcmappingmodel) |
43 | - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" | ||
44 | - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" | 69 | + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" |
70 | + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" | ||
45 | ;; | 71 | ;; |
46 | *.xcassets) | 72 | *.xcassets) |
47 | - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") | 73 | + ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") |
48 | XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") | 74 | XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") |
49 | ;; | 75 | ;; |
50 | - /*) | ||
51 | - echo "$1" | ||
52 | - echo "$1" >> "$RESOURCES_TO_COPY" | ||
53 | - ;; | ||
54 | *) | 76 | *) |
55 | - echo "${PODS_ROOT}/$1" | ||
56 | - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" | 77 | + echo "$RESOURCE_PATH" |
78 | + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" | ||
57 | ;; | 79 | ;; |
58 | esac | 80 | esac |
59 | } | 81 | } |
60 | 82 | ||
61 | -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | ||
62 | -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 83 | +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" |
84 | +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | ||
63 | if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then | 85 | if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then |
64 | mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 86 | mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" |
65 | rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 87 | 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" | @@ -68,21 +90,6 @@ rm -f "$RESOURCES_TO_COPY" | ||
68 | 90 | ||
69 | if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] | 91 | if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] |
70 | then | 92 | then |
71 | - case "${TARGETED_DEVICE_FAMILY}" in | ||
72 | - 1,2) | ||
73 | - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" | ||
74 | - ;; | ||
75 | - 1) | ||
76 | - TARGET_DEVICE_ARGS="--target-device iphone" | ||
77 | - ;; | ||
78 | - 2) | ||
79 | - TARGET_DEVICE_ARGS="--target-device ipad" | ||
80 | - ;; | ||
81 | - *) | ||
82 | - TARGET_DEVICE_ARGS="--target-device mac" | ||
83 | - ;; | ||
84 | - esac | ||
85 | - | ||
86 | # Find all other xcassets (this unfortunately includes those of path pods and other targets). | 93 | # Find all other xcassets (this unfortunately includes those of path pods and other targets). |
87 | OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) | 94 | OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) |
88 | while read line; do | 95 | while read line; do |
@@ -91,5 +98,5 @@ then | @@ -91,5 +98,5 @@ then | ||
91 | fi | 98 | fi |
92 | done <<<"$OTHER_XCASSETS" | 99 | done <<<"$OTHER_XCASSETS" |
93 | 100 | ||
94 | - 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}" | 101 | + 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}" |
95 | fi | 102 | fi |
1 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 | 1 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 |
2 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" | 2 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" |
3 | +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Masonry" | ||
3 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" | 4 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" |
4 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" | 5 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" |
5 | -PODS_ROOT = ${SRCROOT}/../Pods | ||
6 | +PODS_BUILD_DIR = $BUILD_DIR | ||
7 | +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) | ||
8 | +PODS_ROOT = ${SRCROOT}/../Pods |
1 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 | 1 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 |
2 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" | 2 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" |
3 | +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Masonry" | ||
3 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" | 4 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" |
4 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" | 5 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" |
5 | -PODS_ROOT = ${SRCROOT}/../Pods | ||
6 | +PODS_BUILD_DIR = $BUILD_DIR | ||
7 | +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) | ||
8 | +PODS_ROOT = ${SRCROOT}/../Pods |
@@ -23,4 +23,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | @@ -23,4 +23,4 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
23 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | 23 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
24 | THE SOFTWARE. | 24 | THE SOFTWARE. |
25 | 25 | ||
26 | -Generated by CocoaPods - http://cocoapods.org | 26 | +Generated by CocoaPods - https://cocoapods.org |
@@ -41,7 +41,7 @@ THE SOFTWARE. | @@ -41,7 +41,7 @@ THE SOFTWARE. | ||
41 | </dict> | 41 | </dict> |
42 | <dict> | 42 | <dict> |
43 | <key>FooterText</key> | 43 | <key>FooterText</key> |
44 | - <string>Generated by CocoaPods - http://cocoapods.org</string> | 44 | + <string>Generated by CocoaPods - https://cocoapods.org</string> |
45 | <key>Title</key> | 45 | <key>Title</key> |
46 | <string></string> | 46 | <string></string> |
47 | <key>Type</key> | 47 | <key>Type</key> |
@@ -16,7 +16,7 @@ install_framework() | @@ -16,7 +16,7 @@ install_framework() | ||
16 | local source="$1" | 16 | local source="$1" |
17 | fi | 17 | fi |
18 | 18 | ||
19 | - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | 19 | + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" |
20 | 20 | ||
21 | if [ -L "${source}" ]; then | 21 | if [ -L "${source}" ]; then |
22 | echo "Symlinked..." | 22 | echo "Symlinked..." |
@@ -59,8 +59,8 @@ code_sign_if_enabled() { | @@ -59,8 +59,8 @@ code_sign_if_enabled() { | ||
59 | if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then | 59 | if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then |
60 | # Use the current code_sign_identitiy | 60 | # Use the current code_sign_identitiy |
61 | echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" | 61 | echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" |
62 | - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" | ||
63 | - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" | 62 | + echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" |
63 | + /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" | ||
64 | fi | 64 | fi |
65 | } | 65 | } |
66 | 66 |
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | set -e | 2 | set -e |
3 | 3 | ||
4 | -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 4 | +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" |
5 | 5 | ||
6 | RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt | 6 | RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt |
7 | > "$RESOURCES_TO_COPY" | 7 | > "$RESOURCES_TO_COPY" |
8 | 8 | ||
9 | XCASSET_FILES=() | 9 | XCASSET_FILES=() |
10 | 10 | ||
11 | +case "${TARGETED_DEVICE_FAMILY}" in | ||
12 | + 1,2) | ||
13 | + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" | ||
14 | + ;; | ||
15 | + 1) | ||
16 | + TARGET_DEVICE_ARGS="--target-device iphone" | ||
17 | + ;; | ||
18 | + 2) | ||
19 | + TARGET_DEVICE_ARGS="--target-device ipad" | ||
20 | + ;; | ||
21 | + *) | ||
22 | + TARGET_DEVICE_ARGS="--target-device mac" | ||
23 | + ;; | ||
24 | +esac | ||
25 | + | ||
11 | realpath() { | 26 | realpath() { |
12 | DIRECTORY="$(cd "${1%/*}" && pwd)" | 27 | DIRECTORY="$(cd "${1%/*}" && pwd)" |
13 | FILENAME="${1##*/}" | 28 | FILENAME="${1##*/}" |
@@ -16,50 +31,57 @@ realpath() { | @@ -16,50 +31,57 @@ realpath() { | ||
16 | 31 | ||
17 | install_resource() | 32 | install_resource() |
18 | { | 33 | { |
19 | - case $1 in | 34 | + if [[ "$1" = /* ]] ; then |
35 | + RESOURCE_PATH="$1" | ||
36 | + else | ||
37 | + RESOURCE_PATH="${PODS_ROOT}/$1" | ||
38 | + fi | ||
39 | + if [[ ! -e "$RESOURCE_PATH" ]] ; then | ||
40 | + cat << EOM | ||
41 | +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. | ||
42 | +EOM | ||
43 | + exit 1 | ||
44 | + fi | ||
45 | + case $RESOURCE_PATH in | ||
20 | *.storyboard) | 46 | *.storyboard) |
21 | - 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}" | ||
22 | - 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}" | 47 | + 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}" |
48 | + 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} | ||
23 | ;; | 49 | ;; |
24 | *.xib) | 50 | *.xib) |
25 | - 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}" | ||
26 | - 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}" | 51 | + 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}" |
52 | + 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} | ||
27 | ;; | 53 | ;; |
28 | *.framework) | 54 | *.framework) |
29 | - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
30 | - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
31 | - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
32 | - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | 55 | + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" |
56 | + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
57 | + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
58 | + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
33 | ;; | 59 | ;; |
34 | *.xcdatamodel) | 60 | *.xcdatamodel) |
35 | - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" | ||
36 | - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" | 61 | + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" |
62 | + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" | ||
37 | ;; | 63 | ;; |
38 | *.xcdatamodeld) | 64 | *.xcdatamodeld) |
39 | - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" | ||
40 | - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" | 65 | + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" |
66 | + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" | ||
41 | ;; | 67 | ;; |
42 | *.xcmappingmodel) | 68 | *.xcmappingmodel) |
43 | - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" | ||
44 | - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" | 69 | + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" |
70 | + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" | ||
45 | ;; | 71 | ;; |
46 | *.xcassets) | 72 | *.xcassets) |
47 | - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") | 73 | + ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") |
48 | XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") | 74 | XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") |
49 | ;; | 75 | ;; |
50 | - /*) | ||
51 | - echo "$1" | ||
52 | - echo "$1" >> "$RESOURCES_TO_COPY" | ||
53 | - ;; | ||
54 | *) | 76 | *) |
55 | - echo "${PODS_ROOT}/$1" | ||
56 | - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" | 77 | + echo "$RESOURCE_PATH" |
78 | + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" | ||
57 | ;; | 79 | ;; |
58 | esac | 80 | esac |
59 | } | 81 | } |
60 | 82 | ||
61 | -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | ||
62 | -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 83 | +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" |
84 | +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | ||
63 | if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then | 85 | if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then |
64 | mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 86 | mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" |
65 | rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 87 | 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" | @@ -68,21 +90,6 @@ rm -f "$RESOURCES_TO_COPY" | ||
68 | 90 | ||
69 | if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] | 91 | if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] |
70 | then | 92 | then |
71 | - case "${TARGETED_DEVICE_FAMILY}" in | ||
72 | - 1,2) | ||
73 | - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" | ||
74 | - ;; | ||
75 | - 1) | ||
76 | - TARGET_DEVICE_ARGS="--target-device iphone" | ||
77 | - ;; | ||
78 | - 2) | ||
79 | - TARGET_DEVICE_ARGS="--target-device ipad" | ||
80 | - ;; | ||
81 | - *) | ||
82 | - TARGET_DEVICE_ARGS="--target-device mac" | ||
83 | - ;; | ||
84 | - esac | ||
85 | - | ||
86 | # Find all other xcassets (this unfortunately includes those of path pods and other targets). | 93 | # Find all other xcassets (this unfortunately includes those of path pods and other targets). |
87 | OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) | 94 | OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) |
88 | while read line; do | 95 | while read line; do |
@@ -91,5 +98,5 @@ then | @@ -91,5 +98,5 @@ then | ||
91 | fi | 98 | fi |
92 | done <<<"$OTHER_XCASSETS" | 99 | done <<<"$OTHER_XCASSETS" |
93 | 100 | ||
94 | - 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}" | 101 | + 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}" |
95 | fi | 102 | fi |
1 | -FRAMEWORK_SEARCH_PATHS = $(inherited) $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" | 1 | +FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" |
2 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 | 2 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 |
3 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" | 3 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" |
4 | +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Expecta" | ||
4 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" | 5 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" |
5 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Expecta" -framework "Foundation" -framework "XCTest" | 6 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Expecta" -framework "Foundation" -framework "XCTest" |
6 | -PODS_ROOT = ${SRCROOT}/../Pods | ||
7 | +PODS_BUILD_DIR = $BUILD_DIR | ||
8 | +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) | ||
9 | +PODS_ROOT = ${SRCROOT}/../Pods |
1 | -FRAMEWORK_SEARCH_PATHS = $(inherited) $(inherited) $(DEVELOPER_FRAMEWORKS_DIR) "$(PLATFORM_DIR)/Developer/Library/Frameworks" "$(DEVELOPER_DIR)/Platforms/iPhoneSimulator.platform/Developer/Library/Frameworks" | 1 | +FRAMEWORK_SEARCH_PATHS = $(inherited) "$(PLATFORM_DIR)/Developer/Library/Frameworks" |
2 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 | 2 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 |
3 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" | 3 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" |
4 | +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Expecta" | ||
4 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" | 5 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" |
5 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Expecta" -framework "Foundation" -framework "XCTest" | 6 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Expecta" -framework "Foundation" -framework "XCTest" |
6 | -PODS_ROOT = ${SRCROOT}/../Pods | ||
7 | +PODS_BUILD_DIR = $BUILD_DIR | ||
8 | +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) | ||
9 | +PODS_ROOT = ${SRCROOT}/../Pods |
@@ -22,4 +22,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | @@ -22,4 +22,4 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
22 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | 22 | LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, |
23 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | 23 | OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN |
24 | THE SOFTWARE. | 24 | THE SOFTWARE. |
25 | -Generated by CocoaPods - http://cocoapods.org | 25 | +Generated by CocoaPods - https://cocoapods.org |
@@ -40,7 +40,7 @@ THE SOFTWARE.</string> | @@ -40,7 +40,7 @@ THE SOFTWARE.</string> | ||
40 | </dict> | 40 | </dict> |
41 | <dict> | 41 | <dict> |
42 | <key>FooterText</key> | 42 | <key>FooterText</key> |
43 | - <string>Generated by CocoaPods - http://cocoapods.org</string> | 43 | + <string>Generated by CocoaPods - https://cocoapods.org</string> |
44 | <key>Title</key> | 44 | <key>Title</key> |
45 | <string></string> | 45 | <string></string> |
46 | <key>Type</key> | 46 | <key>Type</key> |
@@ -16,7 +16,7 @@ install_framework() | @@ -16,7 +16,7 @@ install_framework() | ||
16 | local source="$1" | 16 | local source="$1" |
17 | fi | 17 | fi |
18 | 18 | ||
19 | - local destination="${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | 19 | + local destination="${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" |
20 | 20 | ||
21 | if [ -L "${source}" ]; then | 21 | if [ -L "${source}" ]; then |
22 | echo "Symlinked..." | 22 | echo "Symlinked..." |
@@ -59,8 +59,8 @@ code_sign_if_enabled() { | @@ -59,8 +59,8 @@ code_sign_if_enabled() { | ||
59 | if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then | 59 | if [ -n "${EXPANDED_CODE_SIGN_IDENTITY}" -a "${CODE_SIGNING_REQUIRED}" != "NO" -a "${CODE_SIGNING_ALLOWED}" != "NO" ]; then |
60 | # Use the current code_sign_identitiy | 60 | # Use the current code_sign_identitiy |
61 | echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" | 61 | echo "Code Signing $1 with Identity ${EXPANDED_CODE_SIGN_IDENTITY_NAME}" |
62 | - echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements \"$1\"" | ||
63 | - /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} --preserve-metadata=identifier,entitlements "$1" | 62 | + echo "/usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements \"$1\"" |
63 | + /usr/bin/codesign --force --sign ${EXPANDED_CODE_SIGN_IDENTITY} ${OTHER_CODE_SIGN_FLAGS} --preserve-metadata=identifier,entitlements "$1" | ||
64 | fi | 64 | fi |
65 | } | 65 | } |
66 | 66 |
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | set -e | 2 | set -e |
3 | 3 | ||
4 | -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 4 | +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" |
5 | 5 | ||
6 | RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt | 6 | RESOURCES_TO_COPY=${PODS_ROOT}/resources-to-copy-${TARGETNAME}.txt |
7 | > "$RESOURCES_TO_COPY" | 7 | > "$RESOURCES_TO_COPY" |
8 | 8 | ||
9 | XCASSET_FILES=() | 9 | XCASSET_FILES=() |
10 | 10 | ||
11 | +case "${TARGETED_DEVICE_FAMILY}" in | ||
12 | + 1,2) | ||
13 | + TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" | ||
14 | + ;; | ||
15 | + 1) | ||
16 | + TARGET_DEVICE_ARGS="--target-device iphone" | ||
17 | + ;; | ||
18 | + 2) | ||
19 | + TARGET_DEVICE_ARGS="--target-device ipad" | ||
20 | + ;; | ||
21 | + *) | ||
22 | + TARGET_DEVICE_ARGS="--target-device mac" | ||
23 | + ;; | ||
24 | +esac | ||
25 | + | ||
11 | realpath() { | 26 | realpath() { |
12 | DIRECTORY="$(cd "${1%/*}" && pwd)" | 27 | DIRECTORY="$(cd "${1%/*}" && pwd)" |
13 | FILENAME="${1##*/}" | 28 | FILENAME="${1##*/}" |
@@ -16,50 +31,57 @@ realpath() { | @@ -16,50 +31,57 @@ realpath() { | ||
16 | 31 | ||
17 | install_resource() | 32 | install_resource() |
18 | { | 33 | { |
19 | - case $1 in | 34 | + if [[ "$1" = /* ]] ; then |
35 | + RESOURCE_PATH="$1" | ||
36 | + else | ||
37 | + RESOURCE_PATH="${PODS_ROOT}/$1" | ||
38 | + fi | ||
39 | + if [[ ! -e "$RESOURCE_PATH" ]] ; then | ||
40 | + cat << EOM | ||
41 | +error: Resource "$RESOURCE_PATH" not found. Run 'pod install' to update the copy resources script. | ||
42 | +EOM | ||
43 | + exit 1 | ||
44 | + fi | ||
45 | + case $RESOURCE_PATH in | ||
20 | *.storyboard) | 46 | *.storyboard) |
21 | - 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}" | ||
22 | - 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}" | 47 | + 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}" |
48 | + 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} | ||
23 | ;; | 49 | ;; |
24 | *.xib) | 50 | *.xib) |
25 | - 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}" | ||
26 | - 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}" | 51 | + 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}" |
52 | + 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} | ||
27 | ;; | 53 | ;; |
28 | *.framework) | 54 | *.framework) |
29 | - echo "mkdir -p ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
30 | - mkdir -p "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
31 | - echo "rsync -av ${PODS_ROOT}/$1 ${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
32 | - rsync -av "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | 55 | + echo "mkdir -p ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" |
56 | + mkdir -p "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
57 | + echo "rsync -av $RESOURCE_PATH ${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
58 | + rsync -av "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}" | ||
33 | ;; | 59 | ;; |
34 | *.xcdatamodel) | 60 | *.xcdatamodel) |
35 | - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1"`.mom\"" | ||
36 | - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodel`.mom" | 61 | + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH"`.mom\"" |
62 | + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodel`.mom" | ||
37 | ;; | 63 | ;; |
38 | *.xcdatamodeld) | 64 | *.xcdatamodeld) |
39 | - echo "xcrun momc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd\"" | ||
40 | - xcrun momc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcdatamodeld`.momd" | 65 | + echo "xcrun momc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd\"" |
66 | + xcrun momc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcdatamodeld`.momd" | ||
41 | ;; | 67 | ;; |
42 | *.xcmappingmodel) | 68 | *.xcmappingmodel) |
43 | - echo "xcrun mapc \"${PODS_ROOT}/$1\" \"${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm\"" | ||
44 | - xcrun mapc "${PODS_ROOT}/$1" "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$1" .xcmappingmodel`.cdm" | 69 | + echo "xcrun mapc \"$RESOURCE_PATH\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm\"" |
70 | + xcrun mapc "$RESOURCE_PATH" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/`basename "$RESOURCE_PATH" .xcmappingmodel`.cdm" | ||
45 | ;; | 71 | ;; |
46 | *.xcassets) | 72 | *.xcassets) |
47 | - ABSOLUTE_XCASSET_FILE=$(realpath "${PODS_ROOT}/$1") | 73 | + ABSOLUTE_XCASSET_FILE=$(realpath "$RESOURCE_PATH") |
48 | XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") | 74 | XCASSET_FILES+=("$ABSOLUTE_XCASSET_FILE") |
49 | ;; | 75 | ;; |
50 | - /*) | ||
51 | - echo "$1" | ||
52 | - echo "$1" >> "$RESOURCES_TO_COPY" | ||
53 | - ;; | ||
54 | *) | 76 | *) |
55 | - echo "${PODS_ROOT}/$1" | ||
56 | - echo "${PODS_ROOT}/$1" >> "$RESOURCES_TO_COPY" | 77 | + echo "$RESOURCE_PATH" |
78 | + echo "$RESOURCE_PATH" >> "$RESOURCES_TO_COPY" | ||
57 | ;; | 79 | ;; |
58 | esac | 80 | esac |
59 | } | 81 | } |
60 | 82 | ||
61 | -mkdir -p "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | ||
62 | -rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${CONFIGURATION_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 83 | +mkdir -p "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" |
84 | +rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | ||
63 | if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then | 85 | if [[ "${ACTION}" == "install" ]] && [[ "${SKIP_INSTALL}" == "NO" ]]; then |
64 | mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 86 | mkdir -p "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" |
65 | rsync -avr --copy-links --no-relative --exclude '*/.svn/*' --files-from="$RESOURCES_TO_COPY" / "${INSTALL_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}" | 87 | 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" | @@ -68,21 +90,6 @@ rm -f "$RESOURCES_TO_COPY" | ||
68 | 90 | ||
69 | if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] | 91 | if [[ -n "${WRAPPER_EXTENSION}" ]] && [ "`xcrun --find actool`" ] && [ -n "$XCASSET_FILES" ] |
70 | then | 92 | then |
71 | - case "${TARGETED_DEVICE_FAMILY}" in | ||
72 | - 1,2) | ||
73 | - TARGET_DEVICE_ARGS="--target-device ipad --target-device iphone" | ||
74 | - ;; | ||
75 | - 1) | ||
76 | - TARGET_DEVICE_ARGS="--target-device iphone" | ||
77 | - ;; | ||
78 | - 2) | ||
79 | - TARGET_DEVICE_ARGS="--target-device ipad" | ||
80 | - ;; | ||
81 | - *) | ||
82 | - TARGET_DEVICE_ARGS="--target-device mac" | ||
83 | - ;; | ||
84 | - esac | ||
85 | - | ||
86 | # Find all other xcassets (this unfortunately includes those of path pods and other targets). | 93 | # Find all other xcassets (this unfortunately includes those of path pods and other targets). |
87 | OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) | 94 | OTHER_XCASSETS=$(find "$PWD" -iname "*.xcassets" -type d) |
88 | while read line; do | 95 | while read line; do |
@@ -91,5 +98,5 @@ then | @@ -91,5 +98,5 @@ then | ||
91 | fi | 98 | fi |
92 | done <<<"$OTHER_XCASSETS" | 99 | done <<<"$OTHER_XCASSETS" |
93 | 100 | ||
94 | - 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}" | 101 | + 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}" |
95 | fi | 102 | fi |
1 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 | 1 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 |
2 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" | 2 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" |
3 | +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Masonry" | ||
3 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" | 4 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" |
4 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" | 5 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" |
5 | -PODS_ROOT = ${SRCROOT}/../Pods | ||
6 | +PODS_BUILD_DIR = $BUILD_DIR | ||
7 | +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) | ||
8 | +PODS_ROOT = ${SRCROOT}/../Pods |
1 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 | 1 | GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 |
2 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" | 2 | HEADER_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/Headers/Public" "${PODS_ROOT}/Headers/Public/Expecta" "${PODS_ROOT}/Headers/Public/Masonry" |
3 | +LIBRARY_SEARCH_PATHS = $(inherited) "$PODS_CONFIGURATION_BUILD_DIR/Masonry" | ||
3 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" | 4 | OTHER_CFLAGS = $(inherited) -isystem "${PODS_ROOT}/Headers/Public" -isystem "${PODS_ROOT}/Headers/Public/Expecta" -isystem "${PODS_ROOT}/Headers/Public/Masonry" |
4 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" | 5 | OTHER_LDFLAGS = $(inherited) -ObjC -l"Masonry" -framework "Foundation" -framework "UIKit" |
5 | -PODS_ROOT = ${SRCROOT}/../Pods | ||
6 | +PODS_BUILD_DIR = $BUILD_DIR | ||
7 | +PODS_CONFIGURATION_BUILD_DIR = $PODS_BUILD_DIR/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) | ||
8 | +PODS_ROOT = ${SRCROOT}/../Pods |
@@ -63,7 +63,7 @@ | @@ -63,7 +63,7 @@ | ||
63 | <key>isa</key> | 63 | <key>isa</key> |
64 | <string>PBXShellScriptBuildPhase</string> | 64 | <string>PBXShellScriptBuildPhase</string> |
65 | <key>name</key> | 65 | <key>name</key> |
66 | - <string>Check Pods Manifest.lock</string> | 66 | + <string>[CP] Check Pods Manifest.lock</string> |
67 | <key>outputPaths</key> | 67 | <key>outputPaths</key> |
68 | <array/> | 68 | <array/> |
69 | <key>runOnlyForDeploymentPostprocessing</key> | 69 | <key>runOnlyForDeploymentPostprocessing</key> |
@@ -160,7 +160,7 @@ fi | @@ -160,7 +160,7 @@ fi | ||
160 | <key>isa</key> | 160 | <key>isa</key> |
161 | <string>PBXShellScriptBuildPhase</string> | 161 | <string>PBXShellScriptBuildPhase</string> |
162 | <key>name</key> | 162 | <key>name</key> |
163 | - <string>Embed Pods Frameworks</string> | 163 | + <string>[CP] Embed Pods Frameworks</string> |
164 | <key>outputPaths</key> | 164 | <key>outputPaths</key> |
165 | <array/> | 165 | <array/> |
166 | <key>runOnlyForDeploymentPostprocessing</key> | 166 | <key>runOnlyForDeploymentPostprocessing</key> |
@@ -184,7 +184,7 @@ fi | @@ -184,7 +184,7 @@ fi | ||
184 | <key>isa</key> | 184 | <key>isa</key> |
185 | <string>PBXShellScriptBuildPhase</string> | 185 | <string>PBXShellScriptBuildPhase</string> |
186 | <key>name</key> | 186 | <key>name</key> |
187 | - <string>Embed Pods Frameworks</string> | 187 | + <string>[CP] Embed Pods Frameworks</string> |
188 | <key>outputPaths</key> | 188 | <key>outputPaths</key> |
189 | <array/> | 189 | <array/> |
190 | <key>runOnlyForDeploymentPostprocessing</key> | 190 | <key>runOnlyForDeploymentPostprocessing</key> |
@@ -208,7 +208,7 @@ fi | @@ -208,7 +208,7 @@ fi | ||
208 | <key>isa</key> | 208 | <key>isa</key> |
209 | <string>PBXShellScriptBuildPhase</string> | 209 | <string>PBXShellScriptBuildPhase</string> |
210 | <key>name</key> | 210 | <key>name</key> |
211 | - <string>Check Pods Manifest.lock</string> | 211 | + <string>[CP] Check Pods Manifest.lock</string> |
212 | <key>outputPaths</key> | 212 | <key>outputPaths</key> |
213 | <array/> | 213 | <array/> |
214 | <key>runOnlyForDeploymentPostprocessing</key> | 214 | <key>runOnlyForDeploymentPostprocessing</key> |
@@ -268,7 +268,7 @@ fi | @@ -268,7 +268,7 @@ fi | ||
268 | <key>isa</key> | 268 | <key>isa</key> |
269 | <string>PBXShellScriptBuildPhase</string> | 269 | <string>PBXShellScriptBuildPhase</string> |
270 | <key>name</key> | 270 | <key>name</key> |
271 | - <string>Copy Pods Resources</string> | 271 | + <string>[CP] Copy Pods Resources</string> |
272 | <key>outputPaths</key> | 272 | <key>outputPaths</key> |
273 | <array/> | 273 | <array/> |
274 | <key>runOnlyForDeploymentPostprocessing</key> | 274 | <key>runOnlyForDeploymentPostprocessing</key> |
@@ -292,7 +292,7 @@ fi | @@ -292,7 +292,7 @@ fi | ||
292 | <key>isa</key> | 292 | <key>isa</key> |
293 | <string>PBXShellScriptBuildPhase</string> | 293 | <string>PBXShellScriptBuildPhase</string> |
294 | <key>name</key> | 294 | <key>name</key> |
295 | - <string>Copy Pods Resources</string> | 295 | + <string>[CP] Copy Pods Resources</string> |
296 | <key>outputPaths</key> | 296 | <key>outputPaths</key> |
297 | <array/> | 297 | <array/> |
298 | <key>runOnlyForDeploymentPostprocessing</key> | 298 | <key>runOnlyForDeploymentPostprocessing</key> |
@@ -11,8 +11,16 @@ | @@ -11,8 +11,16 @@ | ||
11 | @implementation CASAppDelegate | 11 | @implementation CASAppDelegate |
12 | 12 | ||
13 | + (void)initialize { | 13 | + (void)initialize { |
14 | - [[NSUserDefaults standardUserDefaults] setValue:@"XCTestLog,GcovTestObserver" | ||
15 | - forKey:@"XCTestObserverClass"]; | 14 | + // https://github.com/fastlane/fastlane/issues/3886#issuecomment-224884332 |
15 | + // XCode 7.3 introduced a bug where early registration of a test observer prevented | ||
16 | + // default XCTest test observer from being registered. That caused no logs being printed | ||
17 | + // onto console, which in result broke several tools that relied on this. | ||
18 | + // In order to go around the issue we're deferring registration to allow default | ||
19 | + // test observer to register first. | ||
20 | + dispatch_async(dispatch_get_main_queue(), ^{ | ||
21 | + [[NSUserDefaults standardUserDefaults] setValue:@"XCTestLog,GcovTestObserver" | ||
22 | + forKey:@"XCTestObserverClass"]; | ||
23 | + }); | ||
16 | } | 24 | } |
17 | 25 | ||
18 | - (void)applicationWillTerminate:(UIApplication *)application { | 26 | - (void)applicationWillTerminate:(UIApplication *)application { |
-
Please register or login to post a comment