Skip to content

Update yoga 3.0.4 #252

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

Merged
lucdion merged 4 commits into from
Jun 13, 2024
Merged

Update yoga 3.0.4 #252

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2b34a75
Update Yoga from version 2.0 to 3.0.4
heoblitz Jun 12, 2024
8aa0dfd
Change YGNodeRef to YGNodeConstRef
heoblitz Jun 12, 2024
d2934a2
Update FlexLayout.xcodeproj
heoblitz Jun 13, 2024
65a2e86
Update Podfile.lock
heoblitz Jun 13, 2024
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
2 changes: 1 addition & 1 deletion FlexLayout.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Pod::Spec.new do |spec|
'-fexceptions',
'-Wall',
'-Werror',
'-std=c++1y',
'-std=c++20',
Copy link
Copy Markdown
Collaborator Author

@heoblitz heoblitz Jun 12, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update the compiler version to c++20 to support Yoga 3.

'-fPIC'
]
end
440 changes: 320 additions & 120 deletions FlexLayout.xcodeproj/project.pbxproj
View file
Open in desktop

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,5 @@ let package = Package(
]
),
],
cLanguageStandard: .gnu99,
cxxLanguageStandard: .gnucxx11
cxxLanguageStandard: CXXLanguageStandard(rawValue: "c++20")
)
4 changes: 2 additions & 2 deletions Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- FlexLayout (2.0.05)
- FlexLayout (2.0.07)
- PinLayout (1.10.5)
- SwiftLint (0.54.0)

Expand All @@ -18,7 +18,7 @@ EXTERNAL SOURCES:
:path: "./"

SPEC CHECKSUMS:
FlexLayout: 1cdf0b71a0d06669a497c5a80a355e76129a1025
FlexLayout: 154a56a77c623050eb3a503cacfd6d71d1bb58b0
PinLayout: f6c2b63a5a5b24864064e1d15c67de41b4e74748
SwiftLint: c1de071d9d08c8aba837545f6254315bc900e211

Expand Down
8 changes: 4 additions & 4 deletions Sources/YogaKit/YGLayout.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ - (CGSize)calculateLayoutWithSize:(CGSize)size {
#pragma mark - Private

static float YGMeasureBaselineLabel(
YGNodeRef node,
YGNodeConstRef node,
const float width,
const float height) {

Expand All @@ -374,7 +374,7 @@ static float YGMeasureBaselineLabel(
}

static float YGMeasureBaselineTextView(
YGNodeRef node,
YGNodeConstRef node,
const float width,
const float height) {

Expand All @@ -383,7 +383,7 @@ static float YGMeasureBaselineTextView(
}

static float YGMeasureBaselineTextField(
YGNodeRef node,
YGNodeConstRef node,
const float width,
const float height) {

Expand All @@ -401,7 +401,7 @@ static float YGMeasureBaselineTextField(
}

static YGSize YGMeasureView(
YGNodeRef node,
YGNodeConstRef node,
float width,
YGMeasureMode widthMode,
float height,
Expand Down
Loading