Skip to content

Commit ba399aa

Browse files
committed
Run pod update in Mac demo
1 parent 44e199e commit ba399aa

File tree

2 files changed

+36
-14
lines changed

2 files changed

+36
-14
lines changed

Example/ImaginaryForMac/ImaginaryForMac.xcodeproj/project.pbxproj

Lines changed: 26 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121
isa = PBXProject;
122122
attributes = {
123123
LastSwiftUpdateCheck = 0730;
124-
LastUpgradeCheck = 0800;
124+
LastUpgradeCheck = 0900;
125125
ORGANIZATIONNAME = Hyper;
126126
TargetAttributes = {
127127
D28838F71D2113A3005FBFE8 = {
@@ -168,9 +168,16 @@
168168
files = (
169169
);
170170
inputPaths = (
171+
"${SRCROOT}/Pods/Target Support Files/Pods-ImaginaryForMac/Pods-ImaginaryForMac-frameworks.sh",
172+
"${BUILT_PRODUCTS_DIR}/Cache/Cache.framework",
173+
"${BUILT_PRODUCTS_DIR}/Imaginary/Imaginary.framework",
174+
"${BUILT_PRODUCTS_DIR}/SwiftHash/SwiftHash.framework",
171175
);
172176
name = "[CP] Embed Pods Frameworks";
173177
outputPaths = (
178+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Cache.framework",
179+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Imaginary.framework",
180+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SwiftHash.framework",
174181
);
175182
runOnlyForDeploymentPostprocessing = 0;
176183
shellPath = /bin/sh;
@@ -183,13 +190,16 @@
183190
files = (
184191
);
185192
inputPaths = (
193+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
194+
"${PODS_ROOT}/Manifest.lock",
186195
);
187196
name = "[CP] Check Pods Manifest.lock";
188197
outputPaths = (
198+
"$(DERIVED_FILE_DIR)/Pods-ImaginaryForMac-checkManifestLockResult.txt",
189199
);
190200
runOnlyForDeploymentPostprocessing = 0;
191201
shellPath = /bin/sh;
192-
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n";
202+
shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
193203
showEnvVarsInLog = 0;
194204
};
195205
D66AF2BE601A8F9708469D8F /* [CP] Copy Pods Resources */ = {
@@ -243,14 +253,20 @@
243253
CLANG_CXX_LIBRARY = "libc++";
244254
CLANG_ENABLE_MODULES = YES;
245255
CLANG_ENABLE_OBJC_ARC = YES;
256+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
246257
CLANG_WARN_BOOL_CONVERSION = YES;
258+
CLANG_WARN_COMMA = YES;
247259
CLANG_WARN_CONSTANT_CONVERSION = YES;
248260
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
249261
CLANG_WARN_EMPTY_BODY = YES;
250262
CLANG_WARN_ENUM_CONVERSION = YES;
251263
CLANG_WARN_INFINITE_RECURSION = YES;
252264
CLANG_WARN_INT_CONVERSION = YES;
265+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
266+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
253267
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
268+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
269+
CLANG_WARN_STRICT_PROTOTYPES = YES;
254270
CLANG_WARN_SUSPICIOUS_MOVE = YES;
255271
CLANG_WARN_UNREACHABLE_CODE = YES;
256272
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -278,6 +294,7 @@
278294
ONLY_ACTIVE_ARCH = YES;
279295
SDKROOT = macosx;
280296
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
297+
SWIFT_VERSION = 4.0;
281298
};
282299
name = Debug;
283300
};
@@ -290,14 +307,20 @@
290307
CLANG_CXX_LIBRARY = "libc++";
291308
CLANG_ENABLE_MODULES = YES;
292309
CLANG_ENABLE_OBJC_ARC = YES;
310+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
293311
CLANG_WARN_BOOL_CONVERSION = YES;
312+
CLANG_WARN_COMMA = YES;
294313
CLANG_WARN_CONSTANT_CONVERSION = YES;
295314
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
296315
CLANG_WARN_EMPTY_BODY = YES;
297316
CLANG_WARN_ENUM_CONVERSION = YES;
298317
CLANG_WARN_INFINITE_RECURSION = YES;
299318
CLANG_WARN_INT_CONVERSION = YES;
319+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
320+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
300321
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
322+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
323+
CLANG_WARN_STRICT_PROTOTYPES = YES;
301324
CLANG_WARN_SUSPICIOUS_MOVE = YES;
302325
CLANG_WARN_UNREACHABLE_CODE = YES;
303326
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
@@ -318,6 +341,7 @@
318341
MTL_ENABLE_DEBUG_INFO = NO;
319342
SDKROOT = macosx;
320343
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
344+
SWIFT_VERSION = 4.0;
321345
};
322346
name = Release;
323347
};
@@ -332,7 +356,6 @@
332356
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
333357
PRODUCT_BUNDLE_IDENTIFIER = "no.hyperoslo.Imaginary-Mac.ImaginaryForMac";
334358
PRODUCT_NAME = "$(TARGET_NAME)";
335-
SWIFT_VERSION = 3.0;
336359
};
337360
name = Debug;
338361
};
@@ -347,7 +370,6 @@
347370
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
348371
PRODUCT_BUNDLE_IDENTIFIER = "no.hyperoslo.Imaginary-Mac.ImaginaryForMac";
349372
PRODUCT_NAME = "$(TARGET_NAME)";
350-
SWIFT_VERSION = 3.0;
351373
};
352374
name = Release;
353375
};
Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
PODS:
2-
- Cache (3.1.0):
3-
- SwiftHash (~> 1.4.0)
4-
- Imaginary (1.0.2):
5-
- Cache (~> 3.0)
6-
- SwiftHash (1.4.0)
2+
- Cache (4.0.0):
3+
- SwiftHash (~> 2.0.0)
4+
- Imaginary (3.0.0):
5+
- Cache (~> 4.0)
6+
- SwiftHash (2.0.0)
77

88
DEPENDENCIES:
99
- Imaginary (from `../../`)
1010

1111
EXTERNAL SOURCES:
1212
Imaginary:
13-
:path: "../../"
13+
:path: ../../
1414

1515
SPEC CHECKSUMS:
16-
Cache: 6dea29625ee40c1cafb2ff6c48f3f7341a59cfb5
17-
Imaginary: 3135892ca46c5126cf94df3340e10e267066bd12
18-
SwiftHash: acf0f29032309a5c7a7f625595eade1aca97aca2
16+
Cache: e73353960c614ab79b0c6911b8c39da05b334470
17+
Imaginary: 61c53e76b1b6f84cb86e98b0b8d47b535af89204
18+
SwiftHash: d2e09b13495447178cdfb8e46e54a5c46f15f5a9
1919

2020
PODFILE CHECKSUM: 804905a0cfc064a8a0388d223095e41774bcee31
2121

22-
COCOAPODS: 1.2.1
22+
COCOAPODS: 1.3.1

0 commit comments

Comments
 (0)