Skip to content

Commit 68765af

Browse files
committed
Merge branch 'main' into extended_main
2 parents 049febd + 3029139 commit 68765af

File tree

143 files changed

+25776
-2460
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

143 files changed

+25776
-2460
lines changed

.github/actions/clang-format/action.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/actions/setup-cpp/action.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ runs:
1616
if: ${{ inputs.toolchain == 'Clang' }}
1717
shell: bash
1818
run: |
19+
sudo apt-get install -y libc++-dev libc++abi-dev
1920
echo "CC=/usr/bin/clang" >> $GITHUB_ENV
2021
echo "CXX=/usr/bin/clang++" >> $GITHUB_ENV
2122
echo "CXXFLAGS=-stdlib=libc++" >> $GITHUB_ENV

.github/workflows/publish-android-release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
ORG_GRADLE_PROJECT_SIGNING_PWD: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_PWD }}
2525

2626
- name: Upload Build Artifacts
27-
uses: actions/upload-artifact@v3
27+
uses: actions/upload-artifact@v4
2828
with:
2929
name: 'snapshot-artifacts'
3030
path: '~/.m2/repository/'

.github/workflows/publish-android-snashot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
ORG_GRADLE_PROJECT_USE_SNAPSHOT: true
2424

2525
- name: Upload Build Artifacts
26-
uses: actions/upload-artifact@v3
26+
uses: actions/upload-artifact@v4
2727
with:
2828
name: 'snapshot-artifacts'
2929
path: '~/.m2/repository/'

.github/workflows/validate-cpp.yml

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -97,13 +97,3 @@ jobs:
9797
cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=Release
9898
cmake --build build
9999
working-directory: capture
100-
101-
clang-format:
102-
name: Format
103-
runs-on: ubuntu-latest
104-
105-
steps:
106-
- uses: actions/checkout@v3
107-
108-
- name: clang-format
109-
uses: ./.github/actions/clang-format

.github/workflows/validate-js.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ jobs:
110110
run: yarn pack --filename yoga-layout.tar.gz
111111
working-directory: javascript
112112

113-
- uses: actions/upload-artifact@v3
113+
- uses: actions/upload-artifact@v4
114114
with:
115115
name: npm-package
116116
path: javascript/yoga-layout.tar.gz

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Yoga [![Support Ukraine](https://img.shields.io/badge/Support-Ukraine-FFD500?style=flat&labelColor=005BBB)](https://opensource.fb.com/support-ukraine) [![CocoaPods](https://img.shields.io/cocoapods/v/Yoga.svg)](http://cocoapods.org/pods/Yoga) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![Maven Central](https://img.shields.io/maven-central/v/com.facebook.yoga/yoga)](https://search.maven.org/artifact/com.facebook.yoga/yoga)
1+
# Yoga [![CocoaPods](https://img.shields.io/cocoapods/v/Yoga.svg)](http://cocoapods.org/pods/Yoga) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![Maven Central](https://img.shields.io/maven-central/v/com.facebook.yoga/yoga)](https://search.maven.org/artifact/com.facebook.yoga/yoga) ![SPM](https://img.shields.io/badge/SPM-Supported-blue.svg)
22

33
Yoga is an embeddable and performant flexbox layout engine with bindings for multiple languages.
44

build.gradle

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
plugins {
9-
id("com.android.library") version "8.2.1" apply false
10-
id("com.android.application") version "8.2.1" apply false
9+
id("com.android.library") version "8.7.1" apply false
10+
id("com.android.application") version "8.7.1" apply false
1111
id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
1212
}
1313

@@ -34,6 +34,8 @@ nexusPublishing {
3434
sonatype {
3535
username.set(sonatypeUsername)
3636
password.set(sonatypePassword)
37+
nexusUrl.set(uri("https://ossrh-staging-api.central.sonatype.com/service/local/"))
38+
snapshotRepositoryUrl.set(uri("https://central.sonatype.com/repository/maven-snapshots/"))
3739
}
3840
}
3941
}

capture/NodeToString.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -225,17 +225,17 @@ static void serializeTreeImpl(
225225
appendEdges<&YGNodeStyleGetPosition>(
226226
j, "position", node, defaultNode.get());
227227

228-
appendFloatIfNotDefault(
228+
appendYGValueIfNotDefault(
229229
j["style"],
230230
"gap",
231231
YGNodeStyleGetGap(node, YGGutterAll),
232232
YGNodeStyleGetGap(defaultNode.get(), YGGutterAll));
233-
appendFloatIfNotDefault(
233+
appendYGValueIfNotDefault(
234234
j["style"],
235235
"column-gap",
236236
YGNodeStyleGetGap(node, YGGutterColumn),
237237
YGNodeStyleGetGap(defaultNode.get(), YGGutterColumn));
238-
appendFloatIfNotDefault(
238+
appendYGValueIfNotDefault(
239239
j["style"],
240240
"row-gap",
241241
YGNodeStyleGetGap(node, YGGutterRow),

cmake/project-defaults.cmake

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,9 @@ add_compile_options(
1919
/EHsc
2020
# Enable warnings and warnings as errors
2121
/W4
22-
# Disable RTTI
23-
$<$<COMPILE_LANGUAGE:CXX>:/GR->
22+
/WX
23+
# Enable RTTI
24+
$<$<COMPILE_LANGUAGE:CXX>:/GR>
2425
# Use /O2 (Maximize Speed)
2526
$<$<CONFIG:RELEASE>:/O2>)
2627

@@ -33,8 +34,9 @@ add_compile_options(
3334
-fexceptions
3435
# Enable warnings and warnings as errors
3536
-Wall
36-
# Disable RTTI
37-
$<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
37+
-Werror
38+
# Enable RTTI
39+
$<$<COMPILE_LANGUAGE:CXX>:-frtti>
3840
# Use -O2 (prioritize speed)
3941
$<$<CONFIG:RELEASE>:-O2>
4042
# Enable separate sections per function/data item

0 commit comments

Comments
 (0)