Skip to content

Commit 5e3e654

Browse files
author
Luc Dion
authored
Merge pull request #25 from lucdion/carthage_support
Carthage support
2 parents 7d54b87 + 86b58c8 commit 5e3e654

File tree

12 files changed

+44
-110
lines changed

12 files changed

+44
-110
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@
55
build/
66
xcuserdata
77
Data/
8-
Pods/
8+
Pods/
9+
Carthage/

Cartfile

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "lucdion/yoga" "flexlayout_branch"

Cartfile.resolved

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
github "lucdion/yoga" "f141e5c737f0e327b8eef53f0b4bf05dd85bb6e6"

Example/FlexLayoutSample.xcodeproj/project.pbxproj

+5-5
Original file line numberDiff line numberDiff line change
@@ -413,9 +413,9 @@
413413
);
414414
inputPaths = (
415415
"${SRCROOT}/../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh",
416-
"${BUILT_PRODUCTS_DIR}/Yoga-iOS10.0/yoga.framework",
417-
"${BUILT_PRODUCTS_DIR}/YogaKit-iOS10.0/YogaKit.framework",
418-
"${BUILT_PRODUCTS_DIR}/FlexLayout-iOS10.0/FlexLayout.framework",
416+
"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
417+
"${BUILT_PRODUCTS_DIR}/YogaKit/YogaKit.framework",
418+
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
419419
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
420420
"${PODS_ROOT}/Reveal-SDK/RevealServer-10/iOS/RevealServer.framework",
421421
);
@@ -556,7 +556,7 @@
556556
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
557557
GCC_WARN_UNUSED_FUNCTION = YES;
558558
GCC_WARN_UNUSED_VARIABLE = YES;
559-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
559+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
560560
MTL_ENABLE_DEBUG_INFO = YES;
561561
ONLY_ACTIVE_ARCH = YES;
562562
SDKROOT = iphoneos;
@@ -600,7 +600,7 @@
600600
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
601601
GCC_WARN_UNUSED_FUNCTION = YES;
602602
GCC_WARN_UNUSED_VARIABLE = YES;
603-
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
603+
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
604604
MTL_ENABLE_DEBUG_INFO = NO;
605605
SDKROOT = iphoneos;
606606
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";

Example/FlexLayoutSample.xcodeproj/xcshareddata/xcschemes/FlexLayoutSample.xcscheme

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "0830"
4-
version = "1.8">
4+
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -46,6 +46,7 @@
4646
buildConfiguration = "Debug"
4747
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
4848
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
49+
language = ""
4950
launchStyle = "0"
5051
useCustomWorkingDirectory = "NO"
5152
ignoresPersistentStateOnLaunch = "NO"

FlexLayout.xcodeproj/project.pbxproj

+23-87
Large diffs are not rendered by default.

FlexLayout.xcodeproj/xcshareddata/xcschemes/FlexLayout.xcscheme

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
33
LastUpgradeVersion = "0830"
4-
version = "1.8">
4+
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -57,6 +57,7 @@
5757
buildConfiguration = "Debug"
5858
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
5959
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
60+
language = ""
6061
launchStyle = "0"
6162
useCustomWorkingDirectory = "NO"
6263
ignoresPersistentStateOnLaunch = "NO"

FlexLayout.xcworkspace/contents.xcworkspacedata

-13
This file was deleted.

Podfile.lock

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,6 @@ SPEC CHECKSUMS:
3333
Yoga: 81670877477311136b1b3f69a6307ce62e1c89cf
3434
YogaKit: 8fe0ddd21673226c0b6077fc3ad5c8fa6cda722e
3535

36-
PODFILE CHECKSUM: 5d378ff794dc3399c62fb3e844e7bc0f1fe06b0f
36+
PODFILE CHECKSUM: c21c683cef342a000b67355e6dcbaa8c220805c6
3737

3838
COCOAPODS: 1.3.1

docs_markdown/examples.md

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,13 @@
77

88
The FlexLayout's Example exposes some usage example of FlexLayout.
99

10-
The Example App is available in the [`Example`](https://github.com/lucdion/FlexLayout/tree/master/Example) folder. You must do a `pod install` before running the project.
10+
The Example App is available in the [`Example`](https://github.com/lucdion/FlexLayout/tree/master/Example) folder.
11+
12+
### Running the Example app
13+
1. Do a `pod install` from the FlexLayout root directory.
14+
2. Open the newly generated `FlexLayout.xcworkspace` Xcode workspace.
15+
3. Select the `FlexLayoutSample` target.
16+
4. Run the app on your device or simulator.
1117

1218
</br>
1319

0 commit comments

Comments
 (0)