Merge pull request #21 from layoutBox/update_libraries

lucdion · web-flow · commit c316e0ab0e2d · 2020-08-21T16:32:37.000-04:00
Update libraries PinLayout and FlexLayout
diff --git a/.ruby-version b/.ruby-version
@@ -0,0 +1 @@
+ruby-2.7.0
diff --git a/.travis.yml b/.travis.yml
@@ -1,10 +1,13 @@
 language: objective-c
-osx_image: xcode10
+osx_image: xcode11.6
+
+cache:
+  - bundler
+  - cocoapods
 
 before_install:
-  - gem install xcpretty-travis-formatter;
-  - gem install cocoapods --no-document --quiet;
-  - pod install --repo-update;
+  - bundle install # --deployment # to cache vendor/bundle
+  - bundle exec pod install --repo-update
 
 script:
-  - set -o pipefail && xcodebuild -workspace LayoutFrameworkBenchmark.xcworkspace -scheme LayoutFrameworkBenchmark -sdk iphonesimulator12.0 -destination 'platform=iOS Simulator,name=iPhone 8' build | xcpretty -f `xcpretty-travis-formatter`
+  - set -o pipefail && xcodebuild -workspace LayoutFrameworkBenchmark.xcworkspace -scheme LayoutFrameworkBenchmark -sdk iphonesimulator13.6 -destination 'platform=iOS Simulator,name=iPhone 8' build | xcpretty
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,4 @@
 source 'https://rubygems.org'
 gem 'synx'
 gem 'cocoapods'
+gem 'xcpretty-travis-formatter'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,83 +1,103 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    CFPropertyList (3.0.0)
-    activesupport (4.2.10)
+    CFPropertyList (3.0.2)
+    activesupport (4.2.11.3)
       i18n (~> 0.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    atomos (0.1.2)
-    claide (1.0.2)
+    algoliasearch (1.27.3)
+      httpclient (~> 2.8, >= 2.8.3)
+      json (>= 1.5.1)
+    atomos (0.1.3)
+    claide (1.0.3)
     clamp (0.6.5)
-    cocoapods (1.5.3)
+    cocoapods (1.9.3)
       activesupport (>= 4.0.2, < 5)
       claide (>= 1.0.2, < 2.0)
-      cocoapods-core (= 1.5.3)
-      cocoapods-deintegrate (>= 1.0.2, < 2.0)
-      cocoapods-downloader (>= 1.2.0, < 2.0)
+      cocoapods-core (= 1.9.3)
+      cocoapods-deintegrate (>= 1.0.3, < 2.0)
+      cocoapods-downloader (>= 1.2.2, < 2.0)
       cocoapods-plugins (>= 1.0.0, < 2.0)
       cocoapods-search (>= 1.0.0, < 2.0)
       cocoapods-stats (>= 1.0.0, < 2.0)
-      cocoapods-trunk (>= 1.3.0, < 2.0)
+      cocoapods-trunk (>= 1.4.0, < 2.0)
       cocoapods-try (>= 1.1.0, < 2.0)
       colored2 (~> 3.1)
       escape (~> 0.0.4)
-      fourflusher (~> 2.0.1)
+      fourflusher (>= 2.3.0, < 3.0)
       gh_inspector (~> 1.0)
-      molinillo (~> 0.6.5)
+      molinillo (~> 0.6.6)
       nap (~> 1.0)
-      ruby-macho (~> 1.1)
-      xcodeproj (>= 1.5.7, < 2.0)
-    cocoapods-core (1.5.3)
+      ruby-macho (~> 1.4)
+      xcodeproj (>= 1.14.0, < 2.0)
+    cocoapods-core (1.9.3)
       activesupport (>= 4.0.2, < 6)
+      algoliasearch (~> 1.0)
+      concurrent-ruby (~> 1.1)
       fuzzy_match (~> 2.0.4)
       nap (~> 1.0)
-    cocoapods-deintegrate (1.0.2)
-    cocoapods-downloader (1.2.1)
+      netrc (~> 0.11)
+      typhoeus (~> 1.0)
+    cocoapods-deintegrate (1.0.4)
+    cocoapods-downloader (1.4.0)
     cocoapods-plugins (1.0.0)
       nap
     cocoapods-search (1.0.0)
-    cocoapods-stats (1.0.0)
-    cocoapods-trunk (1.3.0)
+    cocoapods-stats (1.1.0)
+    cocoapods-trunk (1.5.0)
       nap (>= 0.8, < 2.0)
       netrc (~> 0.11)
-    cocoapods-try (1.1.0)
+    cocoapods-try (1.2.0)
     colored2 (3.1.2)
     colorize (0.8.1)
-    concurrent-ruby (1.0.5)
+    concurrent-ruby (1.1.7)
     escape (0.0.4)
-    fourflusher (2.0.1)
+    ethon (0.12.0)
+      ffi (>= 1.3.0)
+    ffi (1.13.1)
+    fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
+    httpclient (2.8.3)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    molinillo (0.6.5)
-    nanaimo (0.2.5)
+    json (2.3.1)
+    minitest (5.14.1)
+    molinillo (0.6.6)
+    nanaimo (0.3.0)
     nap (1.1.0)
     netrc (0.11.0)
-    ruby-macho (1.1.0)
+    rouge (2.0.7)
+    ruby-macho (1.4.0)
     synx (0.2.1)
       clamp (~> 0.6)
       colorize (~> 0.7)
       xcodeproj (~> 1.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    typhoeus (1.4.0)
+      ethon (>= 0.9.0)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
-    xcodeproj (1.5.9)
+    xcodeproj (1.18.0)
       CFPropertyList (>= 2.3.3, < 4.0)
-      atomos (~> 0.1.2)
+      atomos (~> 0.1.3)
       claide (>= 1.0.2, < 2.0)
       colored2 (~> 3.1)
-      nanaimo (~> 0.2.5)
+      nanaimo (~> 0.3.0)
+    xcpretty (0.3.0)
+      rouge (~> 2.0.7)
+    xcpretty-travis-formatter (1.0.0)
+      xcpretty (~> 0.2, >= 0.0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   cocoapods
   synx
+  xcpretty-travis-formatter
 
 BUNDLED WITH
-   1.16.1
+   2.1.2
diff --git a/LayoutFrameworkBenchmark.xcodeproj/project.pbxproj b/LayoutFrameworkBenchmark.xcodeproj/project.pbxproj
@@ -241,7 +241,6 @@
 				TargetAttributes = {
 					24661CFB1F4EFFF5002CB883 = {
 						CreatedOnToolsVersion = 8.3.2;
-						DevelopmentTeam = ZYH5WDPX24;
 						LastSwiftMigration = 1010;
 						ProvisioningStyle = Automatic;
 					};
@@ -252,6 +251,7 @@
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 				Base,
 			);
@@ -284,13 +284,13 @@
 			files = (
 			);
 			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh",
+				"${PODS_ROOT}/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh",
 				"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/LayoutKit/LayoutKit.framework",
 				"${BUILT_PRODUCTS_DIR}/NKFrameLayoutKit/NKFrameLayoutKit.framework",
 				"${BUILT_PRODUCTS_DIR}/NotAutoLayout/NotAutoLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
-				"${PODS_ROOT}/Reveal-SDK/RevealServer-19/iOS/RevealServer.framework",
+				"${PODS_ROOT}/Reveal-SDK/RevealServer/iOS/RevealServer.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
@@ -303,7 +303,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		FB2DF4C2068AD4C560959816 /* [CP] Check Pods Manifest.lock */ = {
@@ -480,14 +480,16 @@
 			baseConfigurationReference = 73BD901DE3512A23A7603899 /* Pods-LayoutFrameworkBenchmark.debug.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = ZYH5WDPX24;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = LayoutFrameworkBenchmark/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.mirego.test.dev;
+				PRODUCT_BUNDLE_IDENTIFIER = com.layoutbox.LayoutFrameworkBenchmark;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Debug;
 		};
@@ -496,14 +498,16 @@
 			baseConfigurationReference = 1A3C4D1FF88A9395CE622CF2 /* Pods-LayoutFrameworkBenchmark.release.xcconfig */;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				DEVELOPMENT_TEAM = ZYH5WDPX24;
+				CODE_SIGN_STYLE = Automatic;
+				DEVELOPMENT_TEAM = "";
 				INFOPLIST_FILE = LayoutFrameworkBenchmark/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
-				PRODUCT_BUNDLE_IDENTIFIER = com.mirego.test.dev;
+				PRODUCT_BUNDLE_IDENTIFIER = com.layoutbox.LayoutFrameworkBenchmark;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
-				SWIFT_VERSION = 4.2;
+				SWIFT_VERSION = 5.0;
 			};
 			name = Release;
 		};
diff --git a/LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme b/LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme
@@ -27,8 +27,6 @@
       selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
       selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
       shouldUseLaunchSchemeArgsEnv = "YES">
-      <Testables>
-      </Testables>
       <MacroExpansion>
          <BuildableReference
             BuildableIdentifier = "primary"
@@ -38,8 +36,8 @@
             ReferencedContainer = "container:LayoutFrameworkBenchmark.xcodeproj">
          </BuildableReference>
       </MacroExpansion>
-      <AdditionalOptions>
-      </AdditionalOptions>
+      <Testables>
+      </Testables>
    </TestAction>
    <LaunchAction
       buildConfiguration = "Release"
@@ -61,8 +59,6 @@
             ReferencedContainer = "container:LayoutFrameworkBenchmark.xcodeproj">
          </BuildableReference>
       </BuildableProductRunnable>
-      <AdditionalOptions>
-      </AdditionalOptions>
    </LaunchAction>
    <ProfileAction
       buildConfiguration = "Release"
diff --git a/LayoutFrameworkBenchmark/Benchmarks/BenchmarkViewController.swift b/LayoutFrameworkBenchmark/Benchmarks/BenchmarkViewController.swift
@@ -49,7 +49,7 @@ class BenchmarkViewController: UITableViewController {
             return CollectionViewControllerFeedItemNotAutoLayoutView(data: data)
         }),
         
-        ViewControllerData(title: "PinLayout 1.8", factoryBlock: { viewCount in
+        ViewControllerData(title: "PinLayout 1.9", factoryBlock: { viewCount in
             let data = FeedItemData.generate(count: viewCount)
             return CollectionViewControllerFeedItemPinLayoutView(data: data)
         }),
diff --git a/Podfile b/Podfile
@@ -1,4 +1,4 @@
-source 'https://github.com/CocoaPods/Specs.git'
+source 'https://cdn.cocoapods.org/'
 
 use_frameworks!
 
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,10 +1,10 @@
 PODS:
-  - FlexLayout (1.3.11)
-  - LayoutKit (10.0.1)
-  - NKFrameLayoutKit (2.4)
+  - FlexLayout (1.3.17)
+  - LayoutKit (10.1.0)
+  - NKFrameLayoutKit (2.5)
   - NotAutoLayout (3.2.0)
-  - PinLayout (1.8.6)
-  - Reveal-SDK (19)
+  - PinLayout (1.8.13)
+  - Reveal-SDK (26)
 
 DEPENDENCIES:
   - FlexLayout
@@ -15,7 +15,7 @@ DEPENDENCIES:
   - Reveal-SDK
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  trunk:
     - FlexLayout
     - LayoutKit
     - NKFrameLayoutKit
@@ -24,13 +24,13 @@ SPEC REPOS:
     - Reveal-SDK
 
 SPEC CHECKSUMS:
-  FlexLayout: b008184d23aae0c56e1c916e803445a13a6f4e5a
-  LayoutKit: 4e69fb0f1cc3e9c2a764b58f99e88004f5da861c
-  NKFrameLayoutKit: c119f04a6ac305c7db5e29e1b856cee0e8a661bb
+  FlexLayout: 257b6763526bc957d2abc2b77a05760b86ca0e21
+  LayoutKit: 66478bb3af5ce4519a056d9465bc4c7585d2350b
+  NKFrameLayoutKit: 8485fd4fb04c2c99e38e4dfd4b65a99ce10689b9
   NotAutoLayout: 4723ad82a21a7c6c60c823fff7f7c29467811b92
-  PinLayout: fe2a2432d6982588e208572005c941aeeae417ab
-  Reveal-SDK: 9f0d2c6c12eb7507921e5454ac165b7aa21140a4
+  PinLayout: e41a50260a76508b7a7fcee8955c76639adc69bc
+  Reveal-SDK: 5f94f14aff3d5f2a49f246edcd266fa4472679e9
 
-PODFILE CHECKSUM: 3e63d42365b39b217c5809f0c7ebad9865d228e2
+PODFILE CHECKSUM: d74752ab55b8b4e940de10f66499bdb34a26c294
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.9.3
diff --git a/docs_markdown/benchmark_comparison_all.png b/docs_markdown/benchmark_comparison_all.png
diff --git a/docs_markdown/benchmark_comparison_all_small.png b/docs_markdown/benchmark_comparison_all_small.png

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-source 'https://github.com/CocoaPods/Specs.git'`
	`1`	`+source 'https://cdn.cocoapods.org/'`
`2`	`2`
`3`	`3`	`use_frameworks!`
`4`	`4`