Skip to content

Commit 5ad2565

Browse files
authored
Merge pull request #14 from layoutBox/update_pinlayout
Update PinLayout to version 1.7.9
2 parents 471d4d5 + 8092100 commit 5ad2565

File tree

8 files changed

+14
-9
lines changed

8 files changed

+14
-9
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
language: objective-c
2-
osx_image: xcode9.2
2+
osx_image: xcode9.4
33

44
before_install:
55
- gem install xcpretty-travis-formatter;
66
- gem install cocoapods --no-document --quiet;
77
- pod install --repo-update;
88

99
script:
10-
- set -o pipefail && xcodebuild -workspace LayoutFrameworkBenchmark.xcworkspace -scheme LayoutFrameworkBenchmark -sdk iphonesimulator11.2 -destination 'platform=iOS Simulator,name=iPhone 6' build | xcpretty -f `xcpretty-travis-formatter`
10+
- set -o pipefail && xcodebuild -workspace LayoutFrameworkBenchmark.xcworkspace -scheme LayoutFrameworkBenchmark -sdk iphonesimulator11.4 -destination 'platform=iOS Simulator,name=iPhone 8' build | xcpretty -f `xcpretty-travis-formatter`

LayoutFrameworkBenchmark.xcodeproj/project.pbxproj

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@
225225
isa = PBXProject;
226226
attributes = {
227227
LastSwiftUpdateCheck = 0830;
228-
LastUpgradeCheck = 0920;
228+
LastUpgradeCheck = 0940;
229229
TargetAttributes = {
230230
24661CFB1F4EFFF5002CB883 = {
231231
CreatedOnToolsVersion = 8.3.2;
@@ -363,13 +363,15 @@
363363
CLANG_WARN_BOOL_CONVERSION = YES;
364364
CLANG_WARN_COMMA = YES;
365365
CLANG_WARN_CONSTANT_CONVERSION = YES;
366+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
366367
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
367368
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
368369
CLANG_WARN_EMPTY_BODY = YES;
369370
CLANG_WARN_ENUM_CONVERSION = YES;
370371
CLANG_WARN_INFINITE_RECURSION = YES;
371372
CLANG_WARN_INT_CONVERSION = YES;
372373
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
374+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
373375
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
374376
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
375377
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
@@ -420,13 +422,15 @@
420422
CLANG_WARN_BOOL_CONVERSION = YES;
421423
CLANG_WARN_COMMA = YES;
422424
CLANG_WARN_CONSTANT_CONVERSION = YES;
425+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
423426
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
424427
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
425428
CLANG_WARN_EMPTY_BODY = YES;
426429
CLANG_WARN_ENUM_CONVERSION = YES;
427430
CLANG_WARN_INFINITE_RECURSION = YES;
428431
CLANG_WARN_INT_CONVERSION = YES;
429432
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
433+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
430434
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
431435
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
432436
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;

LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "0920"
3+
LastUpgradeVersion = "0940"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

LayoutFrameworkBenchmark/Assets.xcassets/AppIcon.appiconset/Contents.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,9 @@
9191
"scale" : "2x"
9292
},
9393
{
94-
"idiom" : "ios-marketing",
9594
"size" : "1024x1024",
95+
"idiom" : "ios-marketing",
96+
"filename" : "Icon-1024.png",
9697
"scale" : "1x"
9798
}
9899
],
133 KB
Loading

LayoutFrameworkBenchmark/Benchmarks/CollectionViewController.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class CollectionViewController<ContentViewType: UIView>: UICollectionViewControl
6262
}
6363

6464
override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
65-
let cell: CellType = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath) as! CellType
65+
let cell = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath) as! CellType
6666
cell.setData(data[indexPath.row])
6767
return cell
6868
}

LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ class FeedItemPinLayoutView: UIView, DataBinder {
158158

159159
posterCommentLabel.pin.below(of: posterTimeLabel).left(hMargin).right(hMargin).marginTop(vMargin).sizeToFit(.width)
160160

161-
contentImageView.pin.below(of: posterCommentLabel, aligned: .left).right().marginRight(hMargin)
161+
contentImageView.pin.below(of: posterCommentLabel, aligned: .left).right().marginTop(vMargin).marginRight(hMargin)
162162
contentTitleLabel.pin.below(of: contentImageView).left().right().marginHorizontal(hMargin).sizeToFit(.width)
163163
contentDomainLabel.pin.below(of: contentTitleLabel, aligned: .left).right().marginRight(hMargin).sizeToFit(.width)
164164

Podfile.lock

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ PODS:
22
- FlexLayout (1.3.6)
33
- LayoutKit (7.0.2)
44
- NotAutoLayout (3.1.1)
5-
- PinLayout (1.7.5)
5+
- PinLayout (1.7.9)
66
- Reveal-SDK (14)
77

88
DEPENDENCIES:
@@ -24,7 +24,7 @@ SPEC CHECKSUMS:
2424
FlexLayout: bcdde388eaf826cfb6f801c8a507e2dca70412fa
2525
LayoutKit: 183c513f8322f4e22321499e54163864bcdf7d97
2626
NotAutoLayout: 2e6e82146dcb556cb61fcfd638b202639c167e84
27-
PinLayout: d89b8e7107f872c039f15132094bc417aa83271d
27+
PinLayout: 21ce87a865407a7a3c8a38a326611c476095fedf
2828
Reveal-SDK: 55b5c5545233b680c2f8da734f202acc15d422b7
2929

3030
PODFILE CHECKSUM: 8558b640c2bd1d253536da517991c188d0d44fed

0 commit comments

Comments
 (0)