Merge pull request #25 from lucdion/carthage_support

Carthage support
layoutBox · Oct 2, 2017 · 5e3e654 · 5e3e654
2 parents 7d54b87 + 86b58c8
commit 5e3e654
Show file tree

Hide file tree

Showing 12 changed files with 44 additions and 110 deletions.
diff --git a/.gitignore b/.gitignore
@@ -5,4 +5,5 @@
 build/
 xcuserdata
 Data/
-Pods/
+Pods/
+Carthage/
diff --git a/Cartfile b/Cartfile
@@ -0,0 +1 @@
+github "lucdion/yoga" "flexlayout_branch"
diff --git a/Cartfile.resolved b/Cartfile.resolved
@@ -0,0 +1 @@
+github "lucdion/yoga" "f141e5c737f0e327b8eef53f0b4bf05dd85bb6e6"
diff --git a/Example/FlexLayoutSample.xcodeproj/project.pbxproj b/Example/FlexLayoutSample.xcodeproj/project.pbxproj
@@ -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";

diff --git a/Example/FlexLayoutSample.xcodeproj/xcshareddata/xcschemes/FlexLayoutSample.xcscheme b/Example/FlexLayoutSample.xcodeproj/xcshareddata/xcschemes/FlexLayoutSample.xcscheme
@@ -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"

diff --git a/FlexLayout.xcodeproj/project.pbxproj b/FlexLayout.xcodeproj/project.pbxproj
diff --git a/...codeproj/project.xcworkspace/xcuserdata/dionlu.xcuserdatad/UserInterfaceState.xcuserstate b/...codeproj/project.xcworkspace/xcuserdata/dionlu.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/FlexLayout.xcodeproj/xcshareddata/xcschemes/FlexLayout.xcscheme b/FlexLayout.xcodeproj/xcshareddata/xcschemes/FlexLayout.xcscheme
@@ -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"

diff --git a/FlexLayout.xcworkspace/contents.xcworkspacedata b/FlexLayout.xcworkspace/contents.xcworkspacedata
diff --git a/Podfile.lock b/Podfile.lock
@@ -33,6 +33,6 @@ SPEC CHECKSUMS:
   Yoga: 81670877477311136b1b3f69a6307ce62e1c89cf
   YogaKit: 8fe0ddd21673226c0b6077fc3ad5c8fa6cda722e
 
-PODFILE CHECKSUM: 5d378ff794dc3399c62fb3e844e7bc0f1fe06b0f
+PODFILE CHECKSUM: c21c683cef342a000b67355e6dcbaa8c220805c6
 
 COCOAPODS: 1.3.1
diff --git a/Sources/Impl/FixLayout+Enum.swift → Sources/Impl/FlexLayout+Enum.swift b/Sources/Impl/FixLayout+Enum.swift → Sources/Impl/FlexLayout+Enum.swift
diff --git a/docs_markdown/examples.md b/docs_markdown/examples.md
@@ -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>
-Original file line number
+Diff line change
@@ Expand Up / @@ -5,4 +5,5 @@ @@
     build/
     xcuserdata
     Data/
-    Pods/
+    Pods/
+    Carthage/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		github "lucdion/yoga" "f141e5c737f0e327b8eef53f0b4bf05dd85bb6e6"