Merge branch 'master' into dependabot/bundler/rexml-3.3.9

Author: OhKanghoon

.swiftpm/xcode/package.xcworkspace/contents.xcworkspacedata

@@ -7,6 +7,17 @@
 
 # Change Log
 
+## [2.2.0](https://github.com/layoutBox/FlexLayout/releases/tag/2.2.0)
+
+#### Upgrade yoga to v3.2.1
+
+Added by [OhKanghoon](https://github.com/OhKanghoon) in Pull Request [#271](https://github.com/layoutBox/FlexLayout/pull/266)
+
+#### Upgrade yoga to v3.1.0
+
+Added by [OhKanghoon](https://github.com/OhKanghoon) in Pull Request [#266](https://github.com/layoutBox/FlexLayout/pull/266)
+
+
 ## [2.0.10](https://github.com/layoutBox/FlexLayout/releases/tag/2.0.10)
 
 #### Support `align-content`: `space-evenly`

CHANGELOG.md

@@ -199,7 +199,7 @@
 		249EFE361E64FAFE00165E39 = {
 			isa = PBXGroup;
 			children = (
-				249EFE411E64FAFE00165E39 /* FlexLayoutSample */,
+				249EFE411E64FAFE00165E39 /* ../FlexLayoutSample */,
 				461884C59B72ACEAFC912B8A /* Frameworks */,
 				85CAAE97812075333AF3E88F /* Pods */,
 				249EFE401E64FAFE00165E39 /* Products */,
@@ -214,7 +214,7 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
-		249EFE411E64FAFE00165E39 /* FlexLayoutSample */ = {
+		249EFE411E64FAFE00165E39 /* ../FlexLayoutSample */ = {
 			isa = PBXGroup;
 			children = (
 				2439CC671E66614D003326FB /* Supporting Files */,
@@ -449,11 +449,13 @@
 			);
 			inputPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-FlexLayoutSample/Pods-FlexLayoutSample-frameworks.sh",
+				"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
 				"${BUILT_PRODUCTS_DIR}/FlexLayout/FlexLayout.framework",
 				"${BUILT_PRODUCTS_DIR}/PinLayout/PinLayout.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
+				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FlexLayout.framework",
 				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/PinLayout.framework",
 			);
@@ -475,7 +477,7 @@
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "Pods/SwiftLint/swiftlint ../FlexLayoutSample\n";
+			shellScript = "\"${PODS_ROOT}/SwiftLint/swiftlint\" --path ../FlexLayoutSample\n";
 		};
 /* End PBXShellScriptBuildPhase section */
 
@@ -662,7 +664,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				GCC_INPUT_FILETYPE = automatic;
 				INFOPLIST_FILE = "../FlexLayoutSample/Supporting Files/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -676,7 +678,7 @@
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				GCC_INPUT_FILETYPE = automatic;
 				INFOPLIST_FILE = "../FlexLayoutSample/Supporting Files/Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 12.0;
+				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.lucdion.FlexLayoutSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

Example/cocoapods/FlexLayoutSample.xcodeproj/project.pbxproj

@@ -1,18 +1,19 @@
 
 Pod::Spec.new do |spec|
   spec.name         = "FlexLayout"
-  spec.version      = "2.0.10"
+  spec.version      = "2.2.0"
   spec.summary      = "FlexLayout"
   spec.homepage     = "https://github.com/lucdion/FlexLayout.git"
   spec.license      = "MIT license"
   spec.author       = { "Luc Dion" => "luc_dion@yahoo.com" }
 
-  spec.platform     = :ios, "12.0"
+  spec.platform     = :ios, "13.4"
   spec.source       = { :git => "https://github.com/lucdion/FlexLayout.git", :tag => "#{spec.version}" }
   spec.source_files = "Sources/**/*.{swift,h,m,mm,cpp,c}"
-  spec.public_header_files = "Sources/yoga/include/yoga/*.h", "Sources/YogaKit/include/YogaKit/*.h"
+  spec.public_header_files = "Sources/YogaKit/include/YogaKit/*.h"
   spec.libraries    = 'c++'
 
+
   # Should match yoga_defs.bzl + BUCK configuration
   spec.compiler_flags = [
      '-fno-omit-frame-pointer',
@@ -22,4 +23,6 @@ Pod::Spec.new do |spec|
      '-std=c++20',
      '-fPIC'
   ]
+
+  spec.dependency 'Yoga', '3.2.1'
 end