Skip to content

Commit 219be95

Browse files
author
Luc Dion
committed
Update frameworks
1 parent 2359f92 commit 219be95

6 files changed

Lines changed: 37 additions & 50 deletions

File tree

‎LayoutFrameworkBenchmark.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,7 @@
197197
24661CF91F4EFFF5002CB883 /* Frameworks */,
198198
24661CFA1F4EFFF5002CB883 /* Resources */,
199199
84A6AA5174E802B10D43854E /* [CP] Embed Pods Frameworks */,
200-
4C7BAC685B12080739E96688 /* [CP] Copy Pods Resources */,
200+
B8AEA99D8FF290D7C77FC40D /* [CP] Copy Pods Resources */,
201201
);
202202
buildRules = (
203203
);
@@ -256,43 +256,43 @@
256256
/* End PBXResourcesBuildPhase section */
257257

258258
/* Begin PBXShellScriptBuildPhase section */
259-
4C7BAC685B12080739E96688 /* [CP] Copy Pods Resources */ = {
259+
84A6AA5174E802B10D43854E /* [CP] Embed Pods Frameworks */ = {
260260
isa = PBXShellScriptBuildPhase;
261261
buildActionMask = 2147483647;
262262
files = (
263263
);
264264
inputPaths = (
265+
"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh",
266+
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
267+
"${BUILT_PRODUCTS_DIR}/LayoutKit/LayoutKit.framework",
268+
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
269+
"${PODS_ROOT}/Reveal-SDK/RevealServer-14/iOS/RevealServer.framework",
265270
);
266-
name = "[CP] Copy Pods Resources";
271+
name = "[CP] Embed Pods Frameworks";
267272
outputPaths = (
273+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
274+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LayoutKit.framework",
275+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
276+
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
268277
);
269278
runOnlyForDeploymentPostprocessing = 0;
270279
shellPath = /bin/sh;
271-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-resources.sh\"\n";
280+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh\"\n";
272281
showEnvVarsInLog = 0;
273282
};
274-
84A6AA5174E802B10D43854E /* [CP] Embed Pods Frameworks */ = {
283+
B8AEA99D8FF290D7C77FC40D /* [CP] Copy Pods Resources */ = {
275284
isa = PBXShellScriptBuildPhase;
276285
buildActionMask = 2147483647;
277286
files = (
278287
);
279288
inputPaths = (
280-
"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh",
281-
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
282-
"${BUILT_PRODUCTS_DIR}/LayoutKit/LayoutKit.framework",
283-
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
284-
"${PODS_ROOT}/Reveal-SDK/RevealServer-13/iOS/RevealServer.framework",
285289
);
286-
name = "[CP] Embed Pods Frameworks";
290+
name = "[CP] Copy Pods Resources";
287291
outputPaths = (
288-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
289-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/LayoutKit.framework",
290-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
291-
"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
292292
);
293293
runOnlyForDeploymentPostprocessing = 0;
294294
shellPath = /bin/sh;
295-
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-frameworks.sh\"\n";
295+
shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-LayoutFrameworkBenchmark/Pods-LayoutFrameworkBenchmark-resources.sh\"\n";
296296
showEnvVarsInLog = 0;
297297
};
298298
FB2DF4C2068AD4C560959816 /* [CP] Check Pods Manifest.lock */ = {

‎LayoutFrameworkBenchmark.xcodeproj/xcshareddata/xcschemes/LayoutFrameworkBenchmark.xcscheme‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
buildConfiguration = "Debug"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
29-
language = ""
3029
shouldUseLaunchSchemeArgsEnv = "YES">
3130
<Testables>
3231
</Testables>
@@ -46,7 +45,6 @@
4645
buildConfiguration = "Release"
4746
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4847
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49-
language = ""
5048
launchStyle = "0"
5149
useCustomWorkingDirectory = "NO"
5250
ignoresPersistentStateOnLaunch = "NO"

‎LayoutFrameworkBenchmark/Benchmarks/BenchmarkViewController.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class BenchmarkViewController: UITableViewController {
3939
return CollectionViewControllerFeedItemManualView(data: data)
4040
}),
4141

42-
ViewControllerData(title: "PinLayout 1.5", factoryBlock: { viewCount in
42+
ViewControllerData(title: "PinLayout 1.7", factoryBlock: { viewCount in
4343
let data = FeedItemData.generate(count: viewCount)
4444
return CollectionViewControllerFeedItemPinLayoutView(data: data)
4545
}),

‎Podfile‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ inhibit_all_warnings!
1111
target 'LayoutFrameworkBenchmark' do
1212
pod 'FlexLayout'
1313
pod 'LayoutKit'
14-
#pod 'PinLayout'
15-
pod 'PinLayout', :git => 'https://github.com/mirego/PinLayout.git', :commit => '41f0d47'
14+
pod 'PinLayout'
1615
pod 'Reveal-SDK'
1716
end

‎Podfile.lock‎

Lines changed: 8 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,21 @@
11
PODS:
2-
- FlexLayout (1.3.5)
2+
- FlexLayout (1.3.6)
33
- LayoutKit (7.0.2)
4-
- PinLayout (1.5.9)
5-
- Reveal-SDK (13)
4+
- PinLayout (1.7.2)
5+
- Reveal-SDK (14)
66

77
DEPENDENCIES:
88
- FlexLayout
99
- LayoutKit
10-
- PinLayout (from `https://github.com/mirego/PinLayout.git`, commit `41f0d47`)
10+
- PinLayout
1111
- Reveal-SDK
1212

13-
EXTERNAL SOURCES:
14-
PinLayout:
15-
:commit: 41f0d47
16-
:git: https://github.com/mirego/PinLayout.git
17-
18-
CHECKOUT OPTIONS:
19-
PinLayout:
20-
:commit: 41f0d47
21-
:git: https://github.com/mirego/PinLayout.git
22-
2313
SPEC CHECKSUMS:
24-
FlexLayout: 8cfa915850eab120c3d89c3b8b02e3aca96de554
14+
FlexLayout: bcdde388eaf826cfb6f801c8a507e2dca70412fa
2515
LayoutKit: 183c513f8322f4e22321499e54163864bcdf7d97
26-
PinLayout: b2ebf8622b28e82b6e1216ab4e4a0a8d082214fe
27-
Reveal-SDK: ccc2b0f8014965ea448b7534a7c2c8da232b75e8
16+
PinLayout: bbe0fc9a60ef0f3dc1909ea26e7a1684b30a263d
17+
Reveal-SDK: 55b5c5545233b680c2f8da734f202acc15d422b7
2818

29-
PODFILE CHECKSUM: 0b632096e0e587472c5a809521683004bf9e1942
19+
PODFILE CHECKSUM: ae655f930c514ff23a524af2662b04f9eb65b4a4
3020

3121
COCOAPODS: 1.3.1

‎README.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
<p align="center">
2-
<a href="https://github.com/lucdion/LayoutFrameworkBenchmark"><img src="docs_markdown/images/logo.png" alt="FlexLayout" width="270"/></a>
2+
<a href="https://github.com/layoutBox/LayoutFrameworkBenchmark"><img src="docs_markdown/images/logo.png" alt="FlexLayout" width="270"/></a>
33
</p>
44

55
<h1 align="center" style="color: #376C9D; font-family: Arial Black, Gadget, sans-serif; font-size: 2em">Layout Framework Benchmark</h1>
66

77
<p align="center">
88
<a href=""><img src="https://img.shields.io/cocoapods/p/FlexLayout.svg?style=flat" /></a>
9-
<a href="https://travis-ci.org/lucdion/LayoutFrameworkBenchmark"><img src="https://travis-ci.org/lucdion/LayoutFrameworkBenchmark.svg?branch=master" /></a>
10-
<a href="https://raw.githubusercontent.com/lucdion/LayoutFrameworkBenchmark/master/LICENSE"><img src="https://img.shields.io/badge/license-New%20BSD-blue.svg?style=flat" /></a>
9+
<a href="https://travis-ci.org/layoutBox/LayoutFrameworkBenchmark"><img src="https://travis-ci.org/layoutBox/LayoutFrameworkBenchmark.svg?branch=master" /></a>
10+
<a href="https://raw.githubusercontent.com/layoutBox/LayoutFrameworkBenchmark/master/LICENSE"><img src="https://img.shields.io/badge/license-New%20BSD-blue.svg?style=flat" /></a>
1111
</p>
1212

1313
<br>
@@ -36,27 +36,27 @@ Choosing the right layout framework for your project is an important decision. T
3636

3737
* **Auto layout**
3838
Apple's auto layout constraints.
39-
[Auto layout benchmark's source code](https://github.com/lucdion/LayoutFrameworkBenchmark/blob/master/LayoutFrameworkBenchmark/Benchmarks/AutoLayout/FeedItemAutoLayoutView.swift)
39+
[Auto layout benchmark's source code](https://github.com/layoutBox/LayoutFrameworkBenchmark/blob/master/LayoutFrameworkBenchmark/Benchmarks/AutoLayout/FeedItemAutoLayoutView.swift)
4040

41-
* [**FlexLayout**](https://github.com/lucdion/FlexLayout)
41+
* [**FlexLayout**](https://github.com/layoutBox/FlexLayout)
4242
FlexLayout adds a nice Swift interface to the highly optimized [Yoga](https://github.com/facebook/yoga) flexbox implementation. Concise, intuitive & chainable syntax.
43-
[FlexLayout benchmark's source code](https://github.com/lucdion/LayoutFrameworkBenchmark/blob/master/LayoutFrameworkBenchmark/Benchmarks/FlexLayout/FeedItemFlexLayoutView.swift)
43+
[FlexLayout benchmark's source code](https://github.com/layoutBox/LayoutFrameworkBenchmark/blob/master/LayoutFrameworkBenchmark/Benchmarks/FlexLayout/FeedItemFlexLayoutView.swift)
4444

4545
* [**LayoutKit**](https://github.com/linkedin/LayoutKit)
4646
LayoutKit is a fast view layout library for iOS, macOS, and tvOS.
47-
[LayoutKit benchmark's source code](https://github.com/lucdion/LayoutFrameworkBenchmark/tree/master/LayoutFrameworkBenchmark/Benchmarks/LayoutKit)
47+
[LayoutKit benchmark's source code](https://github.com/layoutBox/LayoutFrameworkBenchmark/tree/master/LayoutFrameworkBenchmark/Benchmarks/LayoutKit)
4848

4949
* **Manual layout**
5050
Layout is done by setting UIView's frame property directly. This implementation comes directly from the LayoutKit benchmark.
51-
[Manual layout benchmark's source code](https://github.com/lucdion/LayoutFrameworkBenchmark/blob/master/LayoutFrameworkBenchmark/Benchmarks/ManualLayout/FeedItemManualView.swift)
51+
[Manual layout benchmark's source code](https://github.com/layoutBox/LayoutFrameworkBenchmark/blob/master/LayoutFrameworkBenchmark/Benchmarks/ManualLayout/FeedItemManualView.swift)
5252

5353
* [**PinLayout**](https://github.com/mirego/PinLayout)
5454
Fast Swift UIViews layouting without auto layout. No magic, pure code, full control and blazing fast. Concise syntax, intuitive, readable & chainable.
55-
[PinLayout benchmark's source code](https://github.com/lucdion/LayoutFrameworkBenchmark/blob/master/LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift)
55+
[PinLayout benchmark's source code](https://github.com/layoutBox/LayoutFrameworkBenchmark/blob/master/LayoutFrameworkBenchmark/Benchmarks/PinLayout/FeedItemPinLayoutView.swift)
5656

5757
* **UIStackViews**
5858
Apple's UIStackViews.
59-
[UIStackViews benchmark's source code](https://github.com/lucdion/LayoutFrameworkBenchmark/blob/master/LayoutFrameworkBenchmark/Benchmarks/UIStackView/FeedItemUIStackView.swift)
59+
[UIStackViews benchmark's source code](https://github.com/layoutBox/LayoutFrameworkBenchmark/blob/master/LayoutFrameworkBenchmark/Benchmarks/UIStackView/FeedItemUIStackView.swift)
6060

6161
* [**Yoga**](https://github.com/facebook/yoga)
6262
Yoga's performance hasn't been tested directly, but FlexLayout has. FlexLayout is a light Swift interface for Yoga.
@@ -137,7 +137,7 @@ The **X axis** in following charts indicates the **number of cells** contained f
137137
<br>
138138

139139
## Contributing, comments, ideas, suggestions, issues, .... <a name="comments"></a>
140-
For any **comments**, **ideas**, **suggestions**, simply open an [issue](https://github.com/lucdion/LayoutFrameworkBenchmark/issues).
140+
For any **comments**, **ideas**, **suggestions**, simply open an [issue](https://github.com/layoutBox/LayoutFrameworkBenchmark/issues).
141141

142142
If you'd like to contribute by adding other layout framework, you're welcomed!
143143

0 commit comments

Comments
 (0)