Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Carthage support #25

Merged
merged 16 commits into from
Oct 2, 2017
+44 −110
Merged

Carthage support #25

Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
1bdb303
Add Cartfile
Oct 1, 2017
b6bf206
update
Oct 1, 2017
e594f0d
update
Oct 1, 2017
b234903
update
Oct 1, 2017
d0b841c
no message
Oct 1, 2017
5daec3b
update
Oct 1, 2017
44ada46
removed pod
Oct 1, 2017
505dd96
upate
Oct 1, 2017
003631d
update
Oct 1, 2017
bda240d
Update yoga
Oct 1, 2017
9df9800
update
Oct 1, 2017
a7bc187
UPdate
Oct 1, 2017
9d5d2ab
update yoga carthage
Oct 2, 2017
e3100b0
update
Oct 2, 2017
c15cb27
Update
Oct 2, 2017
86b58c8
Removed the workspace
Oct 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .gitignore
View file
Original file line number Diff line number Diff line change
@@ -5,4 +5,5 @@
build/
xcuserdata
Data/
Pods/
Pods/
Carthage/
1 change: 1 addition & 0 deletions Cartfile
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "lucdion/yoga" "flexlayout_branch"
1 change: 1 addition & 0 deletions Cartfile.resolved
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
github "lucdion/yoga" "f141e5c737f0e327b8eef53f0b4bf05dd85bb6e6"
10 changes: 5 additions & 5 deletions Example/FlexLayoutSample.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
@@ -413,9 +413,9 @@
);
inputPaths = (
"${SRCROOT}/../Pods/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh",
"${BUILT_PRODUCTS_DIR}/Yoga-iOS10.0/yoga.framework",
"${BUILT_PRODUCTS_DIR}/YogaKit-iOS10.0/YogaKit.framework",
"${BUILT_PRODUCTS_DIR}/FlexLayout-iOS10.0/FlexLayout.framework",
"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
"${BUILT_PRODUCTS_DIR}/YogaKit/YogaKit.framework",
"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
"${PODS_ROOT}/Reveal-SDK/RevealServer-10/iOS/RevealServer.framework",
);
@@ -556,7 +556,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
@@ -600,7 +600,7 @@
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 10.0;
IPHONEOS_DEPLOYMENT_TARGET = 9.0;
MTL_ENABLE_DEBUG_INFO = NO;
SDKROOT = iphoneos;
SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule";
3 changes: 2 additions & 1 deletion Example/FlexLayoutSample.xcodeproj/xcshareddata/xcschemes/FlexLayoutSample.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
version = "1.8">
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -46,6 +46,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
110 changes: 23 additions & 87 deletions FlexLayout.xcodeproj/project.pbxproj
View file

Large diffs are not rendered by default.

Binary file modified ...codeproj/project.xcworkspace/xcuserdata/dionlu.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
3 changes: 2 additions & 1 deletion FlexLayout.xcodeproj/xcshareddata/xcschemes/FlexLayout.xcscheme
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0830"
version = "1.8">
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
@@ -57,6 +57,7 @@
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
language = ""
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
13 changes: 0 additions & 13 deletions FlexLayout.xcworkspace/contents.xcworkspacedata
View file

This file was deleted.

2 changes: 1 addition & 1 deletion Podfile.lock
View file
Original file line number Diff line number Diff line change
@@ -33,6 +33,6 @@ SPEC CHECKSUMS:
Yoga: 81670877477311136b1b3f69a6307ce62e1c89cf
YogaKit: 8fe0ddd21673226c0b6077fc3ad5c8fa6cda722e

PODFILE CHECKSUM: 5d378ff794dc3399c62fb3e844e7bc0f1fe06b0f
PODFILE CHECKSUM: c21c683cef342a000b67355e6dcbaa8c220805c6

COCOAPODS: 1.3.1
0 Sources/Impl/FixLayout+Enum.swift → Sources/Impl/FlexLayout+Enum.swift
View file
File renamed without changes.
8 changes: 7 additions & 1 deletion docs_markdown/examples.md
View file
Original file line number Diff line number Diff line change
@@ -7,7 +7,13 @@

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

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.
The Example App is available in the [`Example`](https://github.com/lucdion/FlexLayout/tree/master/Example) folder.

### Running the Example app
1. Do a `pod install` from the FlexLayout root directory.
2. Open the newly generated `FlexLayout.xcworkspace` Xcode workspace.
3. Select the `FlexLayoutSample` target.
4. Run the app on your device or simulator.

</br>