Merge branch 'master' into master

Author: lucdion

.travis.yml

@@ -1,10 +1,10 @@
 language: objective-c
-osx_image: xcode9.2 
+osx_image: xcode9.4 
 
 before_install:
   - gem install xcpretty-travis-formatter;
   - gem install cocoapods --no-document --quiet;
   - pod install --repo-update;
 
 script:
-  - 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`
+  - 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/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -91,8 +91,9 @@
       "scale" : "2x"
     },
     {
-      "idiom" : "ios-marketing",
       "size" : "1024x1024",
+      "idiom" : "ios-marketing",
+      "filename" : "Icon-1024.png",
       "scale" : "1x"
     }
   ],

LayoutFrameworkBenchmark/Assets.xcassets/AppIcon.appiconset/Icon-1024.png

@@ -63,7 +63,7 @@ class CollectionViewController<ContentViewType: UIView>: UICollectionViewControl
     }
 
     override func collectionView(_ collectionView: UICollectionView, cellForItemAt indexPath: IndexPath) -> UICollectionViewCell {
-        let cell: CellType = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath) as! CellType
+        let cell = collectionView.dequeueReusableCell(withReuseIdentifier: reuseIdentifier, for: indexPath) as! CellType
         cell.setData(data[indexPath.row])
         return cell
     }

LayoutFrameworkBenchmark/Benchmarks/CollectionViewController.swift

@@ -158,7 +158,7 @@ class FeedItemPinLayoutView: UIView, DataBinder {
 
         posterCommentLabel.pin.below(of: posterTimeLabel).left(hMargin).right(hMargin).marginTop(vMargin).sizeToFit(.width)
 
-        contentImageView.pin.below(of: posterCommentLabel, aligned: .left).right().marginRight(hMargin)
+        contentImageView.pin.below(of: posterCommentLabel, aligned: .left).right().marginTop(vMargin).marginRight(hMargin)
         contentTitleLabel.pin.below(of: contentImageView).left().right().marginHorizontal(hMargin).sizeToFit(.width)
         contentDomainLabel.pin.below(of: contentTitleLabel, aligned: .left).right().marginRight(hMargin).sizeToFit(.width)
 

LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift

@@ -3,8 +3,8 @@ PODS:
   - LayoutKit (8.0.1)
   - NKFrameLayoutKit (2.1)
   - NotAutoLayout (3.1.1)
-  - PinLayout (1.7.8)
-  - Reveal-SDK (16)
+  - PinLayout (1.7.9)
+  - Reveal-SDK (14)
 
 DEPENDENCIES:
   - FlexLayout
@@ -28,8 +28,8 @@ SPEC CHECKSUMS:
   LayoutKit: dab1c2eea7a0bf9d8d755a8a793f87a929768455
   NKFrameLayoutKit: 6a2f6ac34f85d495e683ea0f7f1605903a4d3e00
   NotAutoLayout: 2e6e82146dcb556cb61fcfd638b202639c167e84
-  PinLayout: 2baeb56058fcbc600e4a39146868d78f998b0e1f
-  Reveal-SDK: ed36bdbb3cbf90b94ae5da0dbcb3c7ae6738c51f
+  PinLayout: 21ce87a865407a7a3c8a38a326611c476095fedf
+  Reveal-SDK: 55b5c5545233b680c2f8da734f202acc15d422b7
 
 PODFILE CHECKSUM: 9565083f4813952a5a640666616b259832defa8b