Merge pull request #61 from layoutBox/integrates_yoga_sources

Integrates Yoga sources into FlexLayout

.travis.yml

@@ -7,7 +7,7 @@ before_install:
   - gem install xcpretty-travis-formatter;
   #- gem install cocoapods -v '1.3.1' --no-document --quiet;
   # - gem install slather --no-document --quiet;  
-  #- pod install --repo-update;
+  - bundle exec pod install --repo-update;
   # - carthage bootstrap --verbose --platform iOS --cache-builds --use-ssh 
 
 script:

Example/FlexLayoutSample.xcodeproj/project.pbxproj

@@ -436,14 +436,12 @@
 				"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
 				"${PODS_ROOT}/Reveal-SDK/RevealServer-10/iOS/RevealServer.framework",
-				"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/RevealServer.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
@@ -635,10 +633,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 8561ACDBCFFA1B4B9ABEAB16 /* Pods-FlexLayoutSample.debug.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				GCC_INPUT_FILETYPE = automatic;
 				INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;
@@ -649,10 +646,9 @@
 			isa = XCBuildConfiguration;
 			baseConfigurationReference = 0D0595B5E0950936D037ECF2 /* Pods-FlexLayoutSample.release.xcconfig */;
 			buildSettings = {
-				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
+				GCC_INPUT_FILETYPE = automatic;
 				INFOPLIST_FILE = "FlexLayoutSample/Supporting Files/Info.plist";
-				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 3.0;

Example/FlexLayoutSample/UI/Common/BaseViewController.swift

@@ -33,4 +33,3 @@ class BaseViewController: UIViewController {
         }
     }
 }
-

Example/FlexLayoutSample/UI/Examples/RaywenderlichTutorial/RaywenderlichTutorialView.swift

@@ -148,7 +148,7 @@ class RayWenderlichTutorialView: BaseView {
         super.layoutSubviews()
 
         // 1) Layout the contentView & rootFlexContainer using PinLayout
-        contentView.pin.all().margin(safeArea)
+        contentView.pin.all()
         rootFlexContainer.pin.top().left().right()
 
         // 2) Let the flexbox container layout itself and adjust the height

FlexLayout.podspec

@@ -1,21 +1,27 @@
 
-Pod::Spec.new do |s|
-  s.name         = "FlexLayout"
-  s.version      = "1.2.3"
-  s.summary      = "FlexLayout"
+Pod::Spec.new do |spec|
+  spec.name         = "FlexLayout"
+  spec.version      = "1.2.4"
+  spec.summary      = "FlexLayout"
 
-  s.homepage     = "https://github.com/lucdion/FlexLayout.git"
-  s.license      = "BSD 3-clause"
+  spec.homepage     = "https://github.com/lucdion/FlexLayout.git"
+  spec.license      = "BSD 3-clause"
 
-  s.author             = { 
+  spec.author             = { 
     "Luc Dion" => "ldion@mirego.com"
   }
 
-  s.platform     = :ios, "9.0"
+  spec.platform     = :ios, "9.0"
 
-  s.source       = { :git => "https://github.com/lucdion/FlexLayout.git", :tag => "#{s.version}" }
-  s.source_files  = "Sources/**/*.{swift,h,m}"
+  spec.source       = { :git => "https://github.com/lucdion/FlexLayout.git", :tag => "#{spec.version}" }
+  spec.source_files  = "Sources/**/*.{swift,h,m,cpp,c}"
 
-  # Latest master commit id.
-  s.dependency "Yoga", "1.6"
+  #spec.compiler_flags = [
+  #    '-fno-omit-frame-pointer',
+  #    '-fexceptions',
+  #    '-Wall',
+  #    '-Werror',
+  #    '-std=c11',
+  #    '-fPIC'
+  #]
 end