Skip to content

Commit 258b98d

Browse files
authored
Modify Assertion (#9)
1 parent 54b2b8b commit 258b98d

File tree

3 files changed

+27
-24
lines changed

3 files changed

+27
-24
lines changed

Podfile.lock

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
PODS:
2-
- EasyPeasy (1.4.2)
3-
- Reveal-SDK (8)
2+
- EasyPeasy (1.8.0)
3+
- Reveal-SDK (20)
44

55
DEPENDENCIES:
66
- EasyPeasy
77
- Reveal-SDK
88

9+
SPEC REPOS:
10+
https://github.com/cocoapods/specs.git:
11+
- EasyPeasy
12+
- Reveal-SDK
13+
914
SPEC CHECKSUMS:
10-
EasyPeasy: 50e7130b61f495ce105796e438d4136e2c8d2cc0
11-
Reveal-SDK: 43be4e662864e937960d0d04d005135e29c4e53b
15+
EasyPeasy: bfffe5d47bbaaef3e32888c250a196768484b43a
16+
Reveal-SDK: 43206a57f575632fd304e85385cc259b5d359e32
1217

1318
PODFILE CHECKSUM: 801a5623355ad33f423fde4c805d2477d85eadb4
1419

15-
COCOAPODS: 1.2.1
20+
COCOAPODS: 1.6.0.beta.2

StackScrollView.xcodeproj/project.pbxproj

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@
234234
4B6C2DAD1D8DA68E003D3A46 /* Resources */,
235235
4BE8B6F11D8E5A9700A4DC33 /* Embed Frameworks */,
236236
24154DE9833A821AC3AEA6F2 /* [CP] Embed Pods Frameworks */,
237-
848C2C71D8E615BCE87525CC /* [CP] Copy Pods Resources */,
238237
);
239238
buildRules = (
240239
);
@@ -317,28 +316,18 @@
317316
files = (
318317
);
319318
inputPaths = (
319+
"${PODS_ROOT}/Target Support Files/Pods-StackScrollView-Demo/Pods-StackScrollView-Demo-frameworks.sh",
320+
"${BUILT_PRODUCTS_DIR}/EasyPeasy/EasyPeasy.framework",
321+
"${PODS_ROOT}/Reveal-SDK/RevealServer-20/iOS/RevealServer.framework",
320322
);
321323
name = "[CP] Embed Pods Frameworks";
322324
outputPaths = (
325+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/EasyPeasy.framework",
326+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
323327
);
324328
runOnlyForDeploymentPostprocessing = 0;
325329
shellPath = /bin/sh;
326-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-StackScrollView-Demo/Pods-StackScrollView-Demo-frameworks.sh\"\n";
327-
showEnvVarsInLog = 0;
328-
};
329-
848C2C71D8E615BCE87525CC /* [CP] Copy Pods Resources */ = {
330-
isa = PBXShellScriptBuildPhase;
331-
buildActionMask = 2147483647;
332-
files = (
333-
);
334-
inputPaths = (
335-
);
336-
name = "[CP] Copy Pods Resources";
337-
outputPaths = (
338-
);
339-
runOnlyForDeploymentPostprocessing = 0;
340-
shellPath = /bin/sh;
341-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-StackScrollView-Demo/Pods-StackScrollView-Demo-resources.sh\"\n";
330+
shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-StackScrollView-Demo/Pods-StackScrollView-Demo-frameworks.sh\"\n";
342331
showEnvVarsInLog = 0;
343332
};
344333
85921EDC7C6ECDDC05B65CD4 /* [CP] Check Pods Manifest.lock */ = {
@@ -347,13 +336,16 @@
347336
files = (
348337
);
349338
inputPaths = (
339+
"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
340+
"${PODS_ROOT}/Manifest.lock",
350341
);
351342
name = "[CP] Check Pods Manifest.lock";
352343
outputPaths = (
344+
"$(DERIVED_FILE_DIR)/Pods-StackScrollView-Demo-checkManifestLockResult.txt",
353345
);
354346
runOnlyForDeploymentPostprocessing = 0;
355347
shellPath = /bin/sh;
356-
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";
348+
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";
357349
showEnvVarsInLog = 0;
358350
};
359351
/* End PBXShellScriptBuildPhase section */

StackScrollView/StackScrollView.swift

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,13 @@ open class StackScrollView: UICollectionView, UICollectionViewDataSource, UIColl
283283

284284
let size = view.superview?.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize) ?? view.systemLayoutSizeFitting(UIView.layoutFittingCompressedSize)
285285

286-
assert(size.width == collectionView.bounds.width)
286+
if #available(iOS 11, *) {
287+
assert(
288+
size.width == collectionView.bounds.width,
289+
"Calculated width(\(size.width)) of view<\(view)> was different width(\(collectionView.bounds.width)) of CollectionView."
290+
)
291+
}
292+
287293
return size
288294

289295
}

0 commit comments

Comments
 (0)