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

layoutBox · Jun 13, 2024 · 001e6bf · 001e6bf
2 parents 4cb460f + fcb3e79
commit 001e6bf
Show file tree

Hide file tree

Showing 96 changed files with 9,401 additions and 7,554 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,12 @@
 
 # Change Log
 
+## [2.0.7](https://github.com/layoutBox/FlexLayout/releases/tag/2.0.7)
+
+#### Update yoga to version 3.0.4
+
+Added by [heoblitz](https://github.com/heoblitz) in Pull Request [#245](https://github.com/layoutBox/FlexLayout/pull/252)
+
 
 ## [2.0.06](https://github.com/layoutBox/FlexLayout/releases/tag/2.0.07)
 

diff --git a/FlexLayout.podspec b/FlexLayout.podspec
@@ -1,7 +1,7 @@
 
 Pod::Spec.new do |spec|
   spec.name         = "FlexLayout"
-  spec.version      = "2.0.07"
+  spec.version      = "2.0.7"
   spec.summary      = "FlexLayout"
   spec.homepage     = "https://github.com/lucdion/FlexLayout.git"
   spec.license      = "MIT license"
@@ -19,7 +19,7 @@ Pod::Spec.new do |spec|
      '-fexceptions',
      '-Wall',
      '-Werror',
-     '-std=c++1y',
+     '-std=c++20',
      '-fPIC'
   ]
 end
diff --git a/FlexLayout.xcodeproj/project.pbxproj b/FlexLayout.xcodeproj/project.pbxproj
diff --git a/Package.swift b/Package.swift
@@ -34,6 +34,5 @@ let package = Package(
       ]
     ),
   ],
-  cLanguageStandard: .gnu99,
-  cxxLanguageStandard: .gnucxx11
+  cxxLanguageStandard: CXXLanguageStandard(rawValue: "c++20")
 )
diff --git a/Podfile.lock b/Podfile.lock
@@ -1,7 +1,7 @@
 PODS:
-  - FlexLayout (2.0.05)
+  - FlexLayout (2.0.7)
   - PinLayout (1.10.5)
-  - SwiftLint (0.54.0)
+  - SwiftLint (0.55.1)
 
 DEPENDENCIES:
   - FlexLayout (from `./`)
@@ -18,9 +18,9 @@ EXTERNAL SOURCES:
     :path: "./"
 
 SPEC CHECKSUMS:
-  FlexLayout: 1cdf0b71a0d06669a497c5a80a355e76129a1025
+  FlexLayout: fcb9aaa754029afff0cb99e9cdfe10c68d70b6ac
   PinLayout: f6c2b63a5a5b24864064e1d15c67de41b4e74748
-  SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211
+  SwiftLint: 3fe909719babe5537c552ee8181c0031392be933
 
 PODFILE CHECKSUM: a0f152e938c551fd661bee3ffe26ccc6175f088b
 

diff --git a/Sources/YogaKit/YGLayout.mm b/Sources/YogaKit/YGLayout.mm
@@ -365,7 +365,7 @@ - (CGSize)calculateLayoutWithSize:(CGSize)size {
 #pragma mark - Private
 
 static float YGMeasureBaselineLabel(
-    YGNodeRef node,
+    YGNodeConstRef node,
     const float width,
     const float height) {
 
@@ -374,7 +374,7 @@ static float YGMeasureBaselineLabel(
 }
 
 static float YGMeasureBaselineTextView(
-    YGNodeRef node,
+    YGNodeConstRef node,
     const float width,
     const float height) {
 
@@ -383,7 +383,7 @@ static float YGMeasureBaselineTextView(
 }
 
 static float YGMeasureBaselineTextField(
-    YGNodeRef node,
+    YGNodeConstRef node,
     const float width,
     const float height) {
 
@@ -401,7 +401,7 @@ static float YGMeasureBaselineTextField(
 }
 
 static YGSize YGMeasureView(
-    YGNodeRef node,
+    YGNodeConstRef node,
     float width,
     YGMeasureMode widthMode,
     float height,