Merge branch 'main' into fix-invalidate-owner-size

.buckconfig

@@ -1,10 +0,0 @@
-[cxx]
-  gtest_dep = //lib/gtest:gtest
-[android]
-  target = android-25
-  build_tools_version = 26.0.2
-[ndk]
-  ndk_version = 15.2.4203891
-  compiler = clang
-  app_platform = android-21
-  cpu_abis = arm64, armv7, x86, x86_64

.clang-format

@@ -54,3 +54,115 @@ SpaceInEmptyParentheses: false
 SpacesBeforeTrailingComments: 1
 Standard: Cpp11
 UseTab: Never
+---
+Language: ObjC
+AccessModifierOffset: -1
+AlignAfterOpenBracket: AlwaysBreak
+AlignConsecutiveMacros: false
+AlignConsecutiveAssignments: false
+AlignConsecutiveBitFields: false
+AlignConsecutiveDeclarations: false
+AlignEscapedNewlines: Left
+AlignOperands: DontAlign
+AlignTrailingComments: false
+AllowAllArgumentsOnNextLine: true
+AllowAllConstructorInitializersOnNextLine: true
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortEnumsOnASingleLine: true
+AllowShortBlocksOnASingleLine: Never
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: Empty
+AllowShortLambdasOnASingleLine: All
+AllowShortIfStatementsOnASingleLine: Never
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+AlwaysBreakTemplateDeclarations: Yes
+BinPackArguments: false
+BinPackParameters: false
+BreakBeforeBinaryOperators: None
+BreakBeforeBraces: Attach
+BreakInheritanceList: BeforeColon
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializers: BeforeColon
+BreakAfterJavaFieldAnnotations: false
+BreakStringLiterals: false
+ColumnLimit: 80
+CommentPragmas: '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DeriveLineEnding: true
+DerivePointerAlignment: false
+DisableFormat: false
+FixNamespaceComments: true
+ForEachMacros:
+  - FOR_EACH
+  - FOR_EACH_R
+  - FOR_EACH_RANGE
+IncludeBlocks: Preserve
+IncludeCategories:
+  - Regex:           '^<.*\.h(pp)?>'
+    Priority:        1
+  - Regex:           '^<.*'
+    Priority:        2
+  - Regex:           '.*'
+    Priority:        3
+IndentCaseLabels: true
+IndentCaseBlocks: false
+IndentGotoLabels: true
+IndentPPDirectives: None
+IndentExternBlock: AfterExternBlock
+IndentWidth: 2
+IndentWrappedFunctionNames: false
+InsertTrailingCommas: None
+JavaScriptQuotes: Leave
+JavaScriptWrapImports: true
+KeepEmptyLinesAtTheStartOfBlocks: false
+MacroBlockBegin: ''
+MacroBlockEnd: ''
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+ObjCBinPackProtocolList: Auto
+ObjCBlockIndentWidth: 2
+ObjCBreakBeforeNestedBlockParam: true
+ObjCSpaceAfterProperty: false
+ObjCSpaceBeforeProtocolList: false
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyBreakTemplateDeclaration: 10
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+PointerAlignment: Left
+ReflowComments: true
+SortIncludes: true
+SortUsingDeclarations: true
+SpaceAfterCStyleCast: false
+SpaceAfterLogicalNot: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeCpp11BracedList: false
+SpaceBeforeCtorInitializerColon: true
+SpaceBeforeInheritanceColon: true
+SpaceBeforeParens: ControlStatements
+SpaceBeforeRangeBasedForLoopColon: true
+SpaceInEmptyBlock: false
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles: false
+SpacesInConditionalStatement: false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+SpaceBeforeSquareBrackets: false
+Standard: Latest
+TabWidth: 8
+UseCRLF: false
+UseTab: Never
+...

.github/actions/black/action.yml

@@ -0,0 +1,25 @@
+name: Black Formatter
+inputs:
+  directory:
+    description: Directory to Lint
+    required: true
+  version:
+    description: pypi version of "black" to use
+    required: false
+    default: 22.3.0
+
+runs:
+  using: "composite"
+  steps:
+    - name: Ensure supported Python selected
+      uses: actions/setup-python@v4
+      with:
+        python-version: '>=3.6.2'
+
+    - name: pip install
+      shell: bash
+      run: pip install black==${{ inputs.version }}
+
+    - name: black
+      shell: bash
+      run: black --check ${{ inputs.directory }}

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

@@ -0,0 +1,23 @@
+name: Clang Format
+inputs:
+  directory:
+    description: Directory to Lint
+    required: true
+  version:
+    description: LLVM version to use # Should be kept roughly in sync with arcanist
+    required: false
+    default: 12
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install
+      shell: bash
+      run: sudo apt-get install -y clang-format-${{ inputs.version }}
+
+    - name: clang-format
+      working-directory: ${{ inputs.directory }}
+      shell: bash
+      env:
+        BASHOPTS: extglob:nullglob
+      run: clang-format-${{ inputs.version }} --dry-run --Werror **/*.{h,hh,hpp,c,cpp,cc,m,mm}

.github/actions/install-emsdk/action.yml

@@ -0,0 +1,23 @@
+name: Install emsdk (including emcc)
+inputs:
+  version:
+    description: EMCC Version to install
+    required: false
+    default: 3.1.28
+
+runs:
+  using: "composite"
+  steps:
+    - name: Clone emsdk repo
+      working-directory: ${{ runner.temp }}
+      shell: bash
+      run: git clone https://github.com/emscripten-core/emsdk.git
+
+    - name: emdsk install
+      working-directory: ${{ runner.temp }}/emsdk
+      shell: bash
+      run: |
+        ./emsdk install ${{ inputs.version }}
+        ./emsdk activate ${{ inputs.version }}
+        echo $RUNNER_TEMP/emsdk >> $GITHUB_PATH
+        echo $RUNNER_TEMP/emsdk/upstream/emscripten >> $GITHUB_PATH

.github/actions/install-ninja/action.yml

@@ -0,0 +1,14 @@
+name: Install Ninja
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install ninja (Linux)
+      if: ${{ runner.os == 'Linux' }}
+      shell: bash
+      run: sudo apt-get install -y ninja-build
+
+    - name: Install ninja (Windows)
+      if: ${{ runner.os == 'Windows' }}
+      shell: powershell
+      run: choco install ninja

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

@@ -0,0 +1,10 @@
+name: Setup Android envirionment
+
+runs:
+  using: "composite"
+  steps:
+    - name: Select Java Version
+      uses: actions/setup-java@v2
+      with:
+        distribution: temurin
+        java-version: 11

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

@@ -0,0 +1,9 @@
+name: Setup Apple envirionment
+
+runs:
+  using: "composite"
+  steps:
+    # TODO: This and Ruby should be versioned
+    - name: Install Cocoapods
+      shell: bash
+      run: sudo gem install cocoapods

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

@@ -0,0 +1,12 @@
+name: Setup C++ envirionment
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install Ninja
+      if: ${{ runner.os != 'Windows' }}
+      uses: ./.github/actions/install-ninja
+
+    - name: Setup VS Developer Command Prompt
+      if: ${{ runner.os == 'Windows' }}
+      uses: ilammy/msvc-dev-cmd@v1

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

@@ -0,0 +1,20 @@
+name: Setup JavaScript envirionment
+
+runs:
+  using: "composite"
+  steps:
+    - name: Install Node
+      uses: actions/setup-node@v1
+      with:
+        node-version: 18.x
+
+    - name: Install emsdk
+      uses: ./.github/actions/install-emsdk
+
+    - name: Install Ninja
+      uses: ./.github/actions/install-ninja
+
+    - name: yarn install
+      shell: bash
+      run: yarn install --frozen-lockfile
+      working-directory: javascript

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

@@ -0,0 +1,18 @@
+name: Setup Website envirionment
+
+runs:
+  using: "composite"
+  steps:
+    # TODO: Update to latest when website is moved to the workspace version of
+    # yoga-layout
+    - name: Install Node
+      uses: actions/setup-node@v1
+      with:
+        node-version: 12.x
+
+    # TODO: the website should be in a yarn workspace with the library, but the
+    # current version of gatsby is incompatible with hoisting.
+    - name: yarn install
+      shell: bash
+      run: yarn install --frozen-lockfile
+      working-directory: website

.github/workflows/ci.yml

@@ -1,56 +0,0 @@
-name: CI
-
-on: [push, pull_request]
-
-jobs:
-  website:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Setup Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 8.x
-      - name: Install dependencies
-        run: yarn install --frozen-lockfile --ignore-scripts
-        working-directory: website
-      - name: Build
-        run: yarn build
-        working-directory: website
-      - name: Deploy
-        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
-        uses: peaceiris/actions-gh-pages@v3
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_branch: gh-pages
-          publish_dir: website/public
-          cname: yogalayout.com
-          keep_files: true
-          user_name: 'Yoga-bot'
-          user_email: 'yogabot@fb.com'
-  android:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Install dependencies
-        run: |
-          if [[ -n "${{ secrets.encrypted_d27e803291ff_iv }}" ]]; then
-            openssl aes-256-cbc -K ${{ secrets.encrypted_d27e803291ff_key }} -iv {{ secrets.encrypted_d27e803291ff_iv }} -in scripts/setup-keys.enc -d >> gradle.properties;
-          fi
-          sudo apt-get update
-          sudo apt-get install -y ninja-build
-          pushd $HOME
-          git clone --depth 1 https://github.com/facebook/buck.git
-          cd buck
-          ant
-          popd
-          echo "::set-env name=PATH::$PATH:$HOME/buck/bin/"
-          export PATH=$PATH:$HOME/buck/bin/
-          buck --version
-          export TERMINAL=dumb
-          source scripts/android-setup.sh && installAndroidSDK
-          echo "::set-env name=ANDROID_SDK::$ANDROID_HOME"
-          echo "::set-env name=ANDROID_NDK_REPOSITORY::$HOME/android-ndk"
-          echo "::set-env name=ANDROID_NDK_HOME::$ANDROID_NDK_REPOSITORY/android-ndk-r15c"
-      - name: Build
-        run: ./gradlew testDebugUnit && scripts/publish-snapshot.sh

.github/workflows/publish-android.yml

@@ -0,0 +1,29 @@
+name: Android
+
+on:
+  release:
+    types:
+      - created
+  workflow_dispatch:
+
+jobs:
+  publish:
+    name: Publish to Maven Central
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-android
+
+      - name: Publish and release
+        run: |
+          ./gradlew :yoga:assembleRelease publish --info
+          ./gradlew closeAndReleaseRepository
+        env:
+          ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
+          ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
+          ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_KEY_CONTENTS }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyId: ${{ secrets.SIGNING_KEY_ID }}
+          ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.SIGNING_PASSWORD }}

.github/workflows/publish-website.yml

@@ -0,0 +1,32 @@
+name: Website
+
+on:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  publish:
+    name: Publish to GitHub Pages
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-website
+
+      - name: yarn build
+        run: yarn build
+        working-directory: website
+
+      - uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_branch: gh-pages
+          publish_dir: website/public
+          cname: yogalayout.com
+          keep_files: true
+          user_name: 'Yoga-bot'
+          user_email: 'yogabot@fb.com'

.github/workflows/validate-android.yml

@@ -0,0 +1,26 @@
+name: Android
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build [${{ matrix.os }}][${{ matrix.mode }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        mode: [Debug, Release]
+        os: [ubuntu-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-android
+
+      - name: Build
+        run: ./gradlew assemble${{ matrix.mode }} --stacktrace

.github/workflows/validate-apple.yml

@@ -0,0 +1,55 @@
+name: Apple
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  lint-pods:
+    name: Lint
+    runs-on: macos-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-apple
+
+      - name: pod spec lint
+        run: pod spec lint --verbose
+        continue-on-error: true # Apple Build is Broken
+
+  build-sample:
+    name: Build [${{ matrix.mode }}]
+    runs-on: macos-latest
+    strategy:
+      matrix:
+        mode: [Debug, Release]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-apple
+
+      - name: pod install
+        run: pod install
+        working-directory: ./YogaKit/YogaKitSample
+        continue-on-error: true # Apple Build is Broken
+
+      # TODO: xcodebuild
+
+  clang-format:
+    name: Format
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: clang-format
+        uses: ./.github/actions/clang-format
+        with:
+          directory: ./YogaKit

.github/workflows/validate-cpp.yml

@@ -0,0 +1,64 @@
+name: C++
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+env:
+  GTEST_COLOR: 1
+
+jobs:
+  test:
+    name: Build and Test [${{ matrix.os }}][${{ matrix.mode }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        mode: [Debug, Release]
+        os: [ubuntu-latest] # TODO: fix issues building GTest Binary with MSVC in GitHub Actions
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-cpp
+
+      - name: Unit tests
+        run: ./unit_tests ${{ matrix.mode }}
+
+  benchmark:
+    name: Benchmark [${{ matrix.os }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-cpp
+
+      - name: Build benchmark
+        run: |
+          cmake -S . -B build -G Ninja -D CMAKE_BUILD_TYPE=Release
+          cmake --build build
+        working-directory: benchmark
+
+      - name: Run benchmark
+        run: ./build/benchmark
+        working-directory: benchmark
+
+  clang-format:
+    name: Format
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: clang-format
+        uses: ./.github/actions/clang-format
+        with:
+          directory: ./yoga

.github/workflows/validate-js.yml

@@ -0,0 +1,74 @@
+name: JavaScript
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+env:
+  FORCE_COLOR: 3
+
+jobs:
+  benchmark:
+    name: Benchmark [${{ matrix.os }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-js
+
+      - name: yarn benchmark
+        run: yarn benchmark
+        working-directory: javascript
+
+  build:
+    name: Build [${{ matrix.os }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-js
+
+      - name: yarn build
+        run: yarn build
+        working-directory: javascript
+
+  test:
+    name: Test [${{ matrix.os }}]
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-latest, windows-latest]
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-js
+
+      - name: yarn test
+        run: yarn test
+        working-directory: javascript
+
+  lint:
+    name: Lint
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: yarn install
+        run: yarn install --frozen-lockfile
+        working-directory: javascript
+
+      - name: yarn lint
+        run: yarn lint
+        working-directory: javascript

.github/workflows/validate-python.yml

@@ -0,0 +1,21 @@
+name: Python
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  format:
+    name: Format
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: black --check
+        uses: ./.github/actions/black
+        with:
+          directory: ${{ github.workspace }}

.github/workflows/validate-website.yml

@@ -0,0 +1,23 @@
+name: Website
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: Build
+    runs-on: ubuntu-20.04
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Setup
+        uses: ./.github/actions/setup-website
+
+      - name: yarn build
+        run: yarn build
+        working-directory: website

.gitignore

@@ -5,14 +5,15 @@
 /.buckconfig.local
 /.buckd
 /gentest/test.html
-.buckversion
+.buck-java11
 
 # Jekyll
 /.sass-cache/
 /_site/
 
 # Visual studio code
-.vscode
+!.vscode
+
 *.pdb
 *.tlog
 *.obj
@@ -63,5 +64,7 @@ Carthage/Build
 
 # Gradle
 .gradle
+
 # NDK/CMake
+.cxx
 .externalNativeBuild

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "lib/gtest/googletest"]
-	path = lib/gtest/googletest
-	url = https://github.com/google/googletest.git

.vscode/extensions.json

@@ -0,0 +1,7 @@
+{
+  "recommendations": [
+    "ms-vscode.cpptools",
+    "EditorConfig.EditorConfig",
+    "dbaeumer.vscode-eslint",
+  ]
+}

.vscode/launch.json

@@ -0,0 +1,25 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+    {
+      "name": "Debug C++ Unit tests (lldb)",
+      "type": "cppdbg",
+      "MIMode": "lldb",
+      "request": "launch",
+      "program": "${workspaceFolder}/tests/build/yogatests",
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "Build Unit Tests"
+    },
+    {
+      "name": "Debug C++ Unit tests (vsdbg)",
+      "type": "cppvsdbg",
+      "request": "launch",
+      "program": "${workspaceFolder}/tests/build/yogatests",
+      "cwd": "${workspaceFolder}",
+      "preLaunchTask": "Build Unit Tests"
+    }
+  ]
+}

.vscode/settings.json

@@ -0,0 +1,20 @@
+{
+  "editor.formatOnSave": true,
+  "editor.codeActionsOnSave": {
+    "source.fixAll.eslint": true
+  },
+  "eslint.format.enable": true,
+  "eslint.packageManager": "yarn",
+  "eslint.enable": true,
+  "eslint.validate": [
+    "javascript",
+    "javascriptreact",
+    "typescript",
+    "typescriptreact"
+  ],
+  "eslint.workingDirectories": [
+    {
+      "mode": "auto"
+    }
+  ],
+}

.vscode/tasks.json

@@ -0,0 +1,23 @@
+{
+  // See https://go.microsoft.com/fwlink/?LinkId=733558
+  // for the documentation about the tasks.json format
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Build Unit Tests",
+      "type": "shell",
+      "command": "(which ninja && cmake -B build -S . -D CMAKE_BUILD_TYPE=Debug -G Ninja || cmake -B build -S . -D CMAKE_BUILD_TYPE=Debug) && cmake --build build",
+      "windows": {
+        "command": "(where ninja && cmake -B build -S . -D CMAKE_BUILD_TYPE=Debug -G Ninja || cmake -B build -S . -D CMAKE_BUILD_TYPE=Debug) && cmake --build build",
+      },
+      "group": "build",
+      "options": {
+        "cwd": "tests"
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      }
+    }
+  ]
+}

BUCK

@@ -1,83 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-load("//tools/build_defs/oss:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "LIBRARY_COMPILER_FLAGS", "YOGA_ROOTS", "subdir_glob", "yoga_cxx_library", "yoga_cxx_test", "yoga_dep", "yoga_prebuilt_cxx_library")
-
-GMOCK_OVERRIDE_FLAGS = [
-    # gmock does not mark mocked methods as override, ignore the warnings in tests
-    "-Wno-inconsistent-missing-override",
-]
-
-TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + [
-    "-DDEBUG",
-    "-DYG_ENABLE_EVENTS",
-]
-
-yoga_prebuilt_cxx_library(
-    name = "ndklog",
-    exported_platform_linker_flags = [
-        (
-            "^android.*",
-            ["-llog"],
-        ),
-    ],
-    header_only = True,
-    visibility = YOGA_ROOTS,
-)
-
-yoga_cxx_library(
-    name = "yoga",
-    srcs = glob(["yoga/**/*.cpp"]),
-    compiler_flags = LIBRARY_COMPILER_FLAGS,
-    public_include_directories = ["."],
-    raw_headers = glob(["yoga/**/*.h"]),
-    soname = "libyogacore.$(ext)",
-    tests = [":YogaTests"],
-    visibility = ["PUBLIC"],
-    deps = [
-        ":ndklog",
-    ],
-)
-
-yoga_cxx_library(
-    name = "yoga-static",
-    srcs = glob(["yoga/**/*.cpp"]),
-    compiler_flags = LIBRARY_COMPILER_FLAGS,
-    preferred_linkage = "static",
-    public_include_directories = ["."],
-    raw_headers = glob(["yoga/**/*.h"]),
-    tests = [":YogaTests"],
-    visibility = ["PUBLIC"],
-    deps = [
-        ":ndklog",
-    ],
-)
-
-yoga_cxx_library(
-    name = "yogaForDebug",
-    srcs = glob(["yoga/**/*.cpp"]),
-    compiler_flags = TEST_COMPILER_FLAGS,
-    public_include_directories = ["."],
-    raw_headers = glob(["yoga/**/*.h"]),
-    soname = "libyogacore.$(ext)",
-    tests = [":YogaTests"],
-    visibility = ["PUBLIC"],
-    deps = [
-        ":yoga",
-    ],
-)
-
-yoga_cxx_test(
-    name = "YogaTests",
-    srcs = glob(["tests/*.cpp"]),
-    headers = subdir_glob([("", "yoga/**/*.h")]),
-    compiler_flags = TEST_COMPILER_FLAGS,
-    contacts = ["emilsj@fb.com"],
-    visibility = ["PUBLIC"],
-    deps = [
-        ":yogaForDebug",
-        yoga_dep("testutil:testutil"),
-        GTEST_TARGET,
-    ],
-)

CMakeLists.txt

@@ -1,24 +1,52 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-cmake_minimum_required(VERSION 3.4.1)
-
+cmake_minimum_required(VERSION 3.13)
+project(yoga-all)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-add_compile_options(
-    -fno-omit-frame-pointer
-    -fexceptions
-    -fvisibility=hidden
-    -ffunction-sections
-    -fdata-sections
-    -Wall
-    -std=c++11)
+include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/project-defaults.cmake)
 
-file(GLOB_RECURSE yogacore_SRC yoga/*.cpp)
-add_library(yogacore STATIC ${yogacore_SRC})
+add_subdirectory(yoga)
+add_subdirectory(tests)
 
-target_include_directories(yogacore PUBLIC .)
-target_link_libraries(yogacore android log)
-set_target_properties(yogacore PROPERTIES CXX_STANDARD 11)
+# cmake install config
+include(GNUInstallDirs)
+include(CMakePackageConfigHelpers)
+
+# declare target to install
+install(TARGETS yogacore EXPORT yoga-targets
+    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+)
+
+# install header files
+install(DIRECTORY
+    "${CMAKE_CURRENT_LIST_DIR}/yoga"
+    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
+    FILES_MATCHING PATTERN "*.h"
+)
+
+# install target config
+install(EXPORT yoga-targets
+    FILE yogaTargets.cmake
+    NAMESPACE yoga::
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/yoga
+)
+
+
+# generate config file
+configure_package_config_file(
+    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/yoga-config.cmake.in
+    ${CMAKE_CURRENT_BINARY_DIR}/yogaConfig.cmake
+    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/yoga
+)
+
+# install config file
+install(FILES
+    ${CMAKE_CURRENT_BINARY_DIR}/yogaConfig.cmake
+    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/yoga
+)

CODE_OF_CONDUCT.md

@@ -74,4 +74,3 @@ available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.ht
 
 For answers to common questions about this code of conduct, see
 https://www.contributor-covenant.org/faq
-

CONTRIBUTING.md

@@ -8,7 +8,7 @@ Facebook has adopted a Code of Conduct that we expect project participants to ad
 
 ## Pull Requests
 We actively welcome your pull requests.
-1. Fork the repo and create your branch from `master`.
+1. Fork the repo and create your branch from `main`.
 2. If you've added code that should be tested, add tests
 3. If you've changed APIs, update the documentation.
 4. Ensure the test suite passes.

README.md

@@ -1,14 +1,24 @@
-# Yoga [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![bintray](https://img.shields.io/bintray/v/facebook/maven/com.facebook.yoga:yoga.svg)](https://bintray.com/facebook/maven/com.facebook.yoga%3Ayoga/_latestVersion) [![NuGet](https://img.shields.io/nuget/v/Facebook.Yoga.svg)](https://www.nuget.org/packages/Facebook.Yoga)
+# 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/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![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)
+
+Yoga is an embeddable and performant flexbox layout engine with bindings for multiple languages.
+
 
 ## Building
-Yoga builds with [buck](https://buckbuild.com). Make sure you install buck before contributing to Yoga. Yoga's main implementation is in C++, with bindings to supported languages and frameworks. When making changes to Yoga please ensure the changes are also propagated to these bindings when applicable.
+Yoga's main implementation targets C++ 14 with accompanying build logic in CMake. A wrapper is provided to build the main library and run unit tests.
 
-## Testing
-For testing we rely on [gtest](https://github.com/google/googletest) as a submodule. After cloning Yoga run `git submodule init` followed by `git submodule update`.
+```sh
+./unit_tests <Debug|Release>
+```
 
-For any changes you make you should ensure that all the tests are passing. In case you make any fixes or additions to the library please also add tests for that change to ensure we don't break anything in the future. Tests are located in the `tests` directory. Run the tests by executing `buck test //:yoga`.
+While not required, this script will use [ninja](https://ninja-build.org/) if it is installed for faster builds.
 
-Instead of manually writing a test which ensures parity with web implementations of Flexbox you can run `gentest/gentest.rb` to generate a test for you. You can write html which you want to verify in Yoga, in `gentest/fixtures` folder, such as the following.
+Yoga is additionally part of the [vcpkg](https://github.com/Microsoft/vcpkg/) collection of ports maintained by Microsoft and community contributors. If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository.
+
+
+
+## Adding Tests
+
+Many of Yoga's tests are automatically generated, using HTML fixtures describing node structure. These are rendered in Chrome to generate an expected layout result for the tree. New fixtures can be added to `gentest/fixtures`.
 
 ```html
 <div id="my_test" style="width: 100px; height: 100px; align-items: center;">
@@ -16,33 +26,11 @@ Instead of manually writing a test which ensures parity with web implementations
 </div>
 ```
 
-Run `gentest/gentest.rb` to generate test code and re-run `buck test //:yoga` to validate the behavior. One test case will be generated for every root `div` in the input html.
+To generate new tests from added fixtures:
+1. Run `bundle install` in the `gentest` directory to install dependencies of the test generator.
+2. Run `ruby gentest.rb` in the `gentest` directory.
 
-You may need to install the latest watir-webdriver gem (`gem install watir-webdriver`) and [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/) to run `gentest/gentest.rb` Ruby script.
 
-### .NET
-.NET testing is not integrated in buck yet, you might need to set up .NET testing environment. We have a script which to launch C# test on macOS, `csharp/tests/Facebook.Yoga/test_macos.sh`.
+## Debugging
 
-## Benchmarks
-Benchmarks are located in `benchmark/YGBenchmark.c` and can be run with `buck run //benchmark:benchmark`. If you think your change has affected performance please run this before and after your change to validate that nothing has regressed. Benchmarks are run on every commit in CI.
-
-### JavaScript
-Installing through NPM
-```sh
-npm install yoga-layout
-```
-By default this will install the library and try to build for all platforms (node, browser asm, and standalone webpack). You may receive errors if you do not have the required platform development tools already installed. To preset the platform you'd like to build for you can set a .npmrc property first.
-```sh
-npm config set yoga-layout:platform standalone
-```
-This will now only run the standalone webpack build upon install.
-
-## Build Platforms
-
-| name           | description                                     |
-|----------------|-------------------------------------------------|
-| all (default)  | Builds all of these platforms.                  |
-| browser        | Builds asm js browser version.                  |
-| node           | Builds node js version.                         |
-| standalone     | Runs webpack.                                   |
-| none           | Does nothing. You can use the prepackaged libs. |
+Yoga provides a VSCode "launch.json" configuration which allows debugging unit tests. Simply add your breakpoints, and run "Debug C++ Unit tests (lldb)" (or "Debug C++ Unit tests (vsdbg)" on Windows).

Yoga.podspec

@@ -1,8 +1,9 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
+
 Pod::Spec.new do |spec|
   spec.name = 'Yoga'
   spec.version = '1.14.0'
@@ -29,10 +30,10 @@ Pod::Spec.new do |spec|
       '-fexceptions',
       '-Wall',
       '-Werror',
-      '-std=c++1y',
+      '-std=c++14',
       '-fPIC'
   ]
   spec.source_files = 'yoga/**/*.{c,h,cpp}'
-  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGNode,YGStyle,YGValue}.h'
+  spec.public_header_files = 'yoga/*.h'
 
 end

YogaDev.xcworkspace/contents.xcworkspacedata

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<Workspace
-   version = "1.0">
-   <FileRef
-      location = "group:YogaDev/YogaDev.xcodeproj">
-   </FileRef>
-   <FileRef
-      location = "group:ReactYoga.xcodeproj">
-   </FileRef>
-</Workspace>

YogaDev.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>IDEDidComputeMac32BitWarning</key>
-	<true/>
-</dict>
-</plist>

YogaDev/YogaDev.xcodeproj/project.pbxproj

@@ -1,350 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 50;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		6D4C7FA42249476900CBB1EC /* YGMarker.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7F892249476700CBB1EC /* YGMarker.cpp */; };
-		6D4C7FA52249476900CBB1EC /* YGValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7F8B2249476700CBB1EC /* YGValue.cpp */; };
-		6D4C7FA62249476900CBB1EC /* YGLayout.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7F902249476700CBB1EC /* YGLayout.cpp */; };
-		6D4C7FA72249476900CBB1EC /* YGNodePrint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7F922249476700CBB1EC /* YGNodePrint.cpp */; };
-		6D4C7FA82249476900CBB1EC /* YGStyle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7F992249476800CBB1EC /* YGStyle.cpp */; };
-		6D4C7FA92249476900CBB1EC /* log.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7F9A2249476800CBB1EC /* log.cpp */; };
-		6D4C7FAA2249476900CBB1EC /* YGNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7F9B2249476800CBB1EC /* YGNode.cpp */; };
-		6D4C7FAB2249476900CBB1EC /* Yoga.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7F9C2249476800CBB1EC /* Yoga.cpp */; };
-		6D4C7FAC2249476900CBB1EC /* Utils.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7F9D2249476800CBB1EC /* Utils.cpp */; };
-		6D4C7FAD2249476900CBB1EC /* YGEnums.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7F9E2249476800CBB1EC /* YGEnums.cpp */; };
-		6D4C7FAE2249476900CBB1EC /* YGConfig.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 6D4C7FA32249476800CBB1EC /* YGConfig.cpp */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXCopyFilesBuildPhase section */
-		6D4C7F76224945B200CBB1EC /* CopyFiles */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "include/$(PRODUCT_NAME)";
-			dstSubfolderSpec = 16;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
-/* Begin PBXFileReference section */
-		6D4C7F78224945B200CBB1EC /* libYogaDev.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libYogaDev.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		6D4C7F892249476700CBB1EC /* YGMarker.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGMarker.cpp; path = ../yoga/YGMarker.cpp; sourceTree = "<group>"; };
-		6D4C7F8A2249476700CBB1EC /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Utils.h; path = ../yoga/Utils.h; sourceTree = "<group>"; };
-		6D4C7F8B2249476700CBB1EC /* YGValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGValue.cpp; path = ../yoga/YGValue.cpp; sourceTree = "<group>"; };
-		6D4C7F8C2249476700CBB1EC /* instrumentation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = instrumentation.h; path = ../yoga/instrumentation.h; sourceTree = "<group>"; };
-		6D4C7F8D2249476700CBB1EC /* YGStyle.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGStyle.h; path = ../yoga/YGStyle.h; sourceTree = "<group>"; };
-		6D4C7F8E2249476700CBB1EC /* YGNodePrint.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGNodePrint.h; path = ../yoga/YGNodePrint.h; sourceTree = "<group>"; };
-		6D4C7F8F2249476700CBB1EC /* YGMarker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGMarker.h; path = ../yoga/YGMarker.h; sourceTree = "<group>"; };
-		6D4C7F902249476700CBB1EC /* YGLayout.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGLayout.cpp; path = ../yoga/YGLayout.cpp; sourceTree = "<group>"; };
-		6D4C7F912249476700CBB1EC /* YGEnums.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGEnums.h; path = ../yoga/YGEnums.h; sourceTree = "<group>"; };
-		6D4C7F922249476700CBB1EC /* YGNodePrint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGNodePrint.cpp; path = ../yoga/YGNodePrint.cpp; sourceTree = "<group>"; };
-		6D4C7F932249476700CBB1EC /* YGMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGMacros.h; path = ../yoga/YGMacros.h; sourceTree = "<group>"; };
-		6D4C7F942249476700CBB1EC /* log.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = log.h; path = ../yoga/log.h; sourceTree = "<group>"; };
-		6D4C7F952249476800CBB1EC /* YGFloatOptional.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGFloatOptional.h; path = ../yoga/YGFloatOptional.h; sourceTree = "<group>"; };
-		6D4C7F962249476800CBB1EC /* YGNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGNode.h; path = ../yoga/YGNode.h; sourceTree = "<group>"; };
-		6D4C7F972249476800CBB1EC /* YGLayout.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGLayout.h; path = ../yoga/YGLayout.h; sourceTree = "<group>"; };
-		6D4C7F982249476800CBB1EC /* CompactValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CompactValue.h; path = ../yoga/CompactValue.h; sourceTree = "<group>"; };
-		6D4C7F992249476800CBB1EC /* YGStyle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGStyle.cpp; path = ../yoga/YGStyle.cpp; sourceTree = "<group>"; };
-		6D4C7F9A2249476800CBB1EC /* log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = log.cpp; path = ../yoga/log.cpp; sourceTree = "<group>"; };
-		6D4C7F9B2249476800CBB1EC /* YGNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGNode.cpp; path = ../yoga/YGNode.cpp; sourceTree = "<group>"; };
-		6D4C7F9C2249476800CBB1EC /* Yoga.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Yoga.cpp; path = ../yoga/Yoga.cpp; sourceTree = "<group>"; };
-		6D4C7F9D2249476800CBB1EC /* Utils.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = Utils.cpp; path = ../yoga/Utils.cpp; sourceTree = "<group>"; };
-		6D4C7F9E2249476800CBB1EC /* YGEnums.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGEnums.cpp; path = ../yoga/YGEnums.cpp; sourceTree = "<group>"; };
-		6D4C7F9F2249476800CBB1EC /* Yoga-internal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "Yoga-internal.h"; path = "../yoga/Yoga-internal.h"; sourceTree = "<group>"; };
-		6D4C7FA02249476800CBB1EC /* YGValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGValue.h; path = ../yoga/YGValue.h; sourceTree = "<group>"; };
-		6D4C7FA12249476800CBB1EC /* Yoga.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Yoga.h; path = ../yoga/Yoga.h; sourceTree = "<group>"; };
-		6D4C7FA22249476800CBB1EC /* YGConfig.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = YGConfig.h; path = ../yoga/YGConfig.h; sourceTree = "<group>"; };
-		6D4C7FA32249476800CBB1EC /* YGConfig.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = YGConfig.cpp; path = ../yoga/YGConfig.cpp; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		6D4C7F75224945B200CBB1EC /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		6D4C7F6F224945B200CBB1EC = {
-			isa = PBXGroup;
-			children = (
-				6D4C7F982249476800CBB1EC /* CompactValue.h */,
-				6D4C7F8C2249476700CBB1EC /* instrumentation.h */,
-				6D4C7F9A2249476800CBB1EC /* log.cpp */,
-				6D4C7F942249476700CBB1EC /* log.h */,
-				6D4C7F9D2249476800CBB1EC /* Utils.cpp */,
-				6D4C7F8A2249476700CBB1EC /* Utils.h */,
-				6D4C7FA32249476800CBB1EC /* YGConfig.cpp */,
-				6D4C7FA22249476800CBB1EC /* YGConfig.h */,
-				6D4C7F9E2249476800CBB1EC /* YGEnums.cpp */,
-				6D4C7F912249476700CBB1EC /* YGEnums.h */,
-				6D4C7F952249476800CBB1EC /* YGFloatOptional.h */,
-				6D4C7F902249476700CBB1EC /* YGLayout.cpp */,
-				6D4C7F972249476800CBB1EC /* YGLayout.h */,
-				6D4C7F932249476700CBB1EC /* YGMacros.h */,
-				6D4C7F892249476700CBB1EC /* YGMarker.cpp */,
-				6D4C7F8F2249476700CBB1EC /* YGMarker.h */,
-				6D4C7F9B2249476800CBB1EC /* YGNode.cpp */,
-				6D4C7F962249476800CBB1EC /* YGNode.h */,
-				6D4C7F922249476700CBB1EC /* YGNodePrint.cpp */,
-				6D4C7F8E2249476700CBB1EC /* YGNodePrint.h */,
-				6D4C7F992249476800CBB1EC /* YGStyle.cpp */,
-				6D4C7F8D2249476700CBB1EC /* YGStyle.h */,
-				6D4C7F8B2249476700CBB1EC /* YGValue.cpp */,
-				6D4C7FA02249476800CBB1EC /* YGValue.h */,
-				6D4C7F9F2249476800CBB1EC /* Yoga-internal.h */,
-				6D4C7F9C2249476800CBB1EC /* Yoga.cpp */,
-				6D4C7FA12249476800CBB1EC /* Yoga.h */,
-				6D4C7F79224945B200CBB1EC /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		6D4C7F79224945B200CBB1EC /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				6D4C7F78224945B200CBB1EC /* libYogaDev.a */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		6D4C7F77224945B200CBB1EC /* YogaDev */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = 6D4C7F81224945B200CBB1EC /* Build configuration list for PBXNativeTarget "YogaDev" */;
-			buildPhases = (
-				6D4C7F74224945B200CBB1EC /* Sources */,
-				6D4C7F75224945B200CBB1EC /* Frameworks */,
-				6D4C7F76224945B200CBB1EC /* CopyFiles */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = YogaDev;
-			productName = YogaDev;
-			productReference = 6D4C7F78224945B200CBB1EC /* libYogaDev.a */;
-			productType = "com.apple.product-type.library.static";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		6D4C7F70224945B200CBB1EC /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 1010;
-				ORGANIZATIONNAME = "Will Wilson";
-				TargetAttributes = {
-					6D4C7F77224945B200CBB1EC = {
-						CreatedOnToolsVersion = 10.1;
-					};
-				};
-			};
-			buildConfigurationList = 6D4C7F73224945B200CBB1EC /* Build configuration list for PBXProject "YogaDev" */;
-			compatibilityVersion = "Xcode 9.3";
-			developmentRegion = en;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-			);
-			mainGroup = 6D4C7F6F224945B200CBB1EC;
-			productRefGroup = 6D4C7F79224945B200CBB1EC /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				6D4C7F77224945B200CBB1EC /* YogaDev */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXSourcesBuildPhase section */
-		6D4C7F74224945B200CBB1EC /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				6D4C7FAD2249476900CBB1EC /* YGEnums.cpp in Sources */,
-				6D4C7FAE2249476900CBB1EC /* YGConfig.cpp in Sources */,
-				6D4C7FAA2249476900CBB1EC /* YGNode.cpp in Sources */,
-				6D4C7FAB2249476900CBB1EC /* Yoga.cpp in Sources */,
-				6D4C7FA92249476900CBB1EC /* log.cpp in Sources */,
-				6D4C7FA62249476900CBB1EC /* YGLayout.cpp in Sources */,
-				6D4C7FAC2249476900CBB1EC /* Utils.cpp in Sources */,
-				6D4C7FA82249476900CBB1EC /* YGStyle.cpp in Sources */,
-				6D4C7FA42249476900CBB1EC /* YGMarker.cpp in Sources */,
-				6D4C7FA52249476900CBB1EC /* YGValue.cpp in Sources */,
-				6D4C7FA72249476900CBB1EC /* YGNodePrint.cpp in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin XCBuildConfiguration section */
-		6D4C7F7F224945B200CBB1EC /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = dwarf;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				ENABLE_TESTABILITY = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
-				MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
-				MTL_FAST_MATH = YES;
-				ONLY_ACTIVE_ARCH = YES;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		6D4C7F80224945B200CBB1EC /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				CLANG_ANALYZER_NONNULL = YES;
-				CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
-				CLANG_CXX_LANGUAGE_STANDARD = "gnu++14";
-				CLANG_CXX_LIBRARY = "libc++";
-				CLANG_ENABLE_MODULES = YES;
-				CLANG_ENABLE_OBJC_ARC = YES;
-				CLANG_ENABLE_OBJC_WEAK = YES;
-				CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
-				CLANG_WARN_BOOL_CONVERSION = YES;
-				CLANG_WARN_COMMA = YES;
-				CLANG_WARN_CONSTANT_CONVERSION = YES;
-				CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
-				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
-				CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
-				CLANG_WARN_EMPTY_BODY = YES;
-				CLANG_WARN_ENUM_CONVERSION = YES;
-				CLANG_WARN_INFINITE_RECURSION = YES;
-				CLANG_WARN_INT_CONVERSION = YES;
-				CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
-				CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
-				CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
-				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
-				CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
-				CLANG_WARN_STRICT_PROTOTYPES = YES;
-				CLANG_WARN_SUSPICIOUS_MOVE = YES;
-				CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
-				CLANG_WARN_UNREACHABLE_CODE = YES;
-				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				ENABLE_NS_ASSERTIONS = NO;
-				ENABLE_STRICT_OBJC_MSGSEND = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu11;
-				GCC_NO_COMMON_BLOCKS = YES;
-				GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
-				GCC_WARN_UNDECLARED_SELECTOR = YES;
-				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
-				GCC_WARN_UNUSED_FUNCTION = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 12.1;
-				MTL_ENABLE_DEBUG_INFO = NO;
-				MTL_FAST_MATH = YES;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		6D4C7F82224945B200CBB1EC /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Debug;
-		};
-		6D4C7F83224945B200CBB1EC /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				CODE_SIGN_STYLE = Automatic;
-				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				SKIP_INSTALL = YES;
-				TARGETED_DEVICE_FAMILY = "1,2";
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		6D4C7F73224945B200CBB1EC /* Build configuration list for PBXProject "YogaDev" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				6D4C7F7F224945B200CBB1EC /* Debug */,
-				6D4C7F80224945B200CBB1EC /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		6D4C7F81224945B200CBB1EC /* Build configuration list for PBXNativeTarget "YogaDev" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				6D4C7F82224945B200CBB1EC /* Debug */,
-				6D4C7F83224945B200CBB1EC /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = 6D4C7F70224945B200CBB1EC /* Project object */;
-}

YogaKit.podspec

@@ -1,4 +1,4 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
+# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.

YogaKit/BUCK

@@ -1,67 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-load("//tools/build_defs/oss:yoga_defs.bzl", "subdir_glob", "yoga_apple_library", "yoga_apple_test", "yoga_dep")
-
-COMPILER_FLAGS = [
-    "-fobjc-arc",
-    "-Wconditional-uninitialized",
-    "-Wdangling-else",
-    "-Wdeprecated-declarations",
-    "-Wimplicit-retain-self",
-    "-Wincomplete-implementation",
-    "-Wobjc-method-access",
-    "-Wobjc-missing-super-calls",
-    "-Wmismatched-return-types",
-    "-Wreturn-type",
-    "-Wno-global-constructors",
-    "-Wno-shadow",
-    "-Wunused-const-variable",
-    "-Wunused-function",
-    "-Wunused-property-ivar",
-    "-Wunused-result",
-    "-Wunused-value",
-]
-
-yoga_apple_library(
-    name = "YogaKit",
-    srcs = glob(["Source/**/*.m"]),
-    header_namespace = "",
-    exported_headers = subdir_glob(
-        [
-            ("", "Source/**/*.h"),
-            ("Source", "**/*.h"),
-        ],
-        prefix = "YogaKit",
-    ),
-    compiler_flags = COMPILER_FLAGS,
-    frameworks = [
-        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
-        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
-        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
-    ],
-    header_path_prefix = "",
-    link_whole = True,
-    modular = True,
-    module_name = "YogaKit",
-    visibility = ["PUBLIC"],
-    deps = [
-        yoga_dep(":yoga"),
-    ],
-)
-
-yoga_apple_test(
-    name = "YogaKitTests",
-    srcs = glob(["Tests/**/*.m"]),
-    compiler_flags = COMPILER_FLAGS,
-    frameworks = [
-        "$PLATFORM_DIR/Developer/Library/Frameworks/XCTest.framework",
-        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
-    ],
-    info_plist = "Tests/Info.plist",
-    visibility = ["PUBLIC"],
-    deps = [
-        ":YogaKit",
-    ],
-)

YogaKit/README.md

@@ -12,11 +12,10 @@ pod 'YogaKit', '~> 1.7'
 ```
 
 ## Getting Started
-Checkout the docs [here](https://facebook.github.io/yoga/docs/api/yogakit/).
 
-We also have a sample project. To try it out, clone this repo and open `YogaKitSample.xcodeproj` in the [YogaKitSample](https://github.com/facebook/yoga/tree/master/YogaKit/YogaKitSample) directory.
+We have a sample project. To try it out, clone this repo and open `YogaKitSample.xcodeproj` in the [YogaKitSample](https://github.com/facebook/yoga/tree/main/YogaKit/YogaKitSample) directory.
 
 ## Contributing
 We welcome all pull-requests! At Facebook we sync the open source version of `YogaKit` daily, so we're always testing the latest changes.
 
-See the [CONTRIBUTING.md](https://github.com/facebook/yoga/blob/master/CONTRIBUTING.md) file for how to help out.
+See the [CONTRIBUTING.md](https://github.com/facebook/yoga/blob/main/CONTRIBUTING.md) file for how to help out.

YogaKit/Source/UIView+Yoga.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/Source/UIView+Yoga.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/Source/YGLayout+Private.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/Source/YGLayout.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/Source/YGLayout.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -285,6 +285,10 @@ YG_VALUE_PROPERTY(maxWidth, MaxWidth)
 YG_VALUE_PROPERTY(maxHeight, MaxHeight)
 YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
 
+YG_EDGE_PROPERTY(columnGap, ColumnGap, Gap, YGGutterColumn)
+YG_EDGE_PROPERTY(rowGap, RowGap, Gap, YGGutterRow)
+YG_EDGE_PROPERTY(gap, Gap, Gap, YGGutterAll)
+
 #pragma mark - Layout and Sizing
 
 - (YGDirection)resolvedDirection {

YogaKit/Source/YGLayoutExtensions.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/Tests/YogaKitTests.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -28,17 +28,19 @@
 
   UIView* child2 = [UIView new];
   child2.backgroundColor = [UIColor greenColor];
-  child2.frame = (CGRect){.size = {
-                              .width = 200,
-                              .height = 100,
-                          }};
+  child2.frame = (CGRect){
+      .size = {
+          .width = 200,
+          .height = 100,
+      }};
 
   UIView* child3 = [UIView new];
   child3.backgroundColor = [UIColor yellowColor];
-  child3.frame = (CGRect){.size = {
-                              .width = 100,
-                              .height = 100,
-                          }};
+  child3.frame = (CGRect){
+      .size = {
+          .width = 100,
+          .height = 100,
+      }};
 
   [child2 addSubview:child3];
   [root addSubview:child1];

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/BUCK

@@ -1,30 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "JAVA_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
-
-yoga_android_aar(
-    name = "android",
-    enable_relinker = True,
-    manifest_skeleton = "src/main/AndroidManifest.xml",
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [
-        ANDROID_JAVA_TARGET,
-        ANDROID_RES_TARGET,
-        JAVA_TARGET,
-        PROGUARD_ANNOTATIONS_TARGET,
-    ],
-)
-
-yoga_android_resource(
-    name = "res",
-    package = "com.facebook.yoga.android",
-    res = "src/main/res",
-    visibility = [
-        "PUBLIC",
-    ],
-)

android/README.md

@@ -4,11 +4,11 @@
 
 YogaLayout is available via jcenter:
 
-    compile 'com.facebook.yoga.android:yoga-layout:1.2.0'
+    implementation 'com.facebook.yoga.android:yoga-layout:1.16.0'
 
 ## Getting Started
 
-Check out the docs [here](https://facebook.github.io/yoga/docs/api/android/).
+Check out the docs [here](https://yogalayout.com/getting-started/standalone/).
 
 We also have a sample project.  To try it, clone the repo and run (with a device attached)
 

android/build.gradle

@@ -1,21 +1,18 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
-apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'maven-publish'
-
-version = VERSION_NAME
-group = GROUP
 
 android {
+    namespace 'com.facebook.yoga.android'
+
     compileSdkVersion rootProject.compileSdkVersion
     buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion
 
     defaultConfig {
         minSdkVersion rootProject.minSdkVersion
@@ -32,21 +29,10 @@ dependencies {
     api project(':yoga')
 }
 
-task sourcesJar(type: Jar) {
-    classifier = 'source'
-    from android.sourceSets.main.java.srcDirs
+// We don't build Javadoc at this time as we can't disable "BUCK" files
+// from mistakenly getting parsed as Java.
+tasks.withType(Javadoc).all {
+  enabled = false
 }
 
-task javadoc(type: Javadoc) {
-    failOnError false
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    classpath += configurations.compile
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-apply from: rootProject.file('gradle/release.gradle')
+apply plugin: 'com.vanniktech.maven.publish'

android/sample/AndroidManifest.xml

@@ -9,7 +9,6 @@
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.facebook.samples.yoga"
           android:versionCode="1"
           android:versionName="1.0"
           >
@@ -17,11 +16,6 @@
   <variable name="applicationId" value="com.facebook.yoga"/>
   <variable name="app_label" value="Yoga Sample App"/>
 
-  <uses-sdk
-    android:minSdkVersion="15"
-    android:targetSdkVersion="19"
-    />
-
   <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
   <application

android/sample/BUCK

@@ -1,36 +0,0 @@
-# Copyright 2014-present, Facebook, Inc.
-# All rights reserved.
-#
-# This source code is licensed under the license found in the
-# LICENSE-examples file in the root directory of this source tree.
-
-load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "ANDROID_SAMPLE_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "yoga_android_binary", "yoga_android_resource")
-
-yoga_android_binary(
-    name = "sample",
-    keystore = ":debug_keystore",
-    manifest = "AndroidManifest.xml",
-    deps = [
-        ANDROID_SAMPLE_JAVA_TARGET,
-        ANDROID_SAMPLE_RES_TARGET,
-    ],
-)
-
-yoga_android_resource(
-    name = "res",
-    package = "com.facebook.samples.yoga",
-    res = "res",
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [
-        ANDROID_RES_TARGET,
-    ],
-)
-
-fb_native.keystore(
-    name = "debug_keystore",
-    properties = "debug.keystore.properties",
-    store = "debug.keystore",
-)

android/sample/java/com/facebook/samples/yoga/BUCK

@@ -1,21 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the license found in the
-# LICENSE-examples file in the root directory of this source tree.
-
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "ANDROID_SUPPORT_TARGET", "APPCOMPAT_TARGET", "SOLOADER_TARGET", "yoga_android_library")
-
-yoga_android_library(
-    name = "yoga",
-    srcs = glob(["**/*.java"]),
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [
-        ANDROID_JAVA_TARGET,
-        ANDROID_SAMPLE_RES_TARGET,
-        ANDROID_SUPPORT_TARGET,
-        APPCOMPAT_TARGET,
-        SOLOADER_TARGET,
-    ],
-)

android/sample/java/com/facebook/samples/yoga/BenchmarkActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/sample/java/com/facebook/samples/yoga/BenchmarkAggregator.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/sample/java/com/facebook/samples/yoga/BenchmarkFragment.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/sample/java/com/facebook/samples/yoga/BenchmarkInflate.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/sample/java/com/facebook/samples/yoga/BenchmarkLayout.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/sample/java/com/facebook/samples/yoga/BenchmarkMeasure.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/sample/java/com/facebook/samples/yoga/MainActivity.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/src/main/AndroidManifest.xml

@@ -2,21 +2,12 @@
 
 <!--
   Copyright (c) Facebook, Inc. and its affiliates.
-  
+
   This source code is licensed under the MIT license found in the
   LICENSE file in the root directory of this source tree.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.facebook.yoga.android"
-          android:versionCode="1"
-          android:versionName="1.0"
-          >
-
-  <uses-sdk
-    android:minSdkVersion="15"
-    android:targetSdkVersion="21"
-    />
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
   <application/>
 

android/src/main/java/com/facebook/yoga/android/BUCK

@@ -1,21 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "JSR_305_TARGET", "SOLOADER_TARGET", "yoga_android_library")
-
-yoga_android_library(
-    name = "android",
-    srcs = glob(["**/*.java"]),
-    visibility = [
-        "PUBLIC",
-    ],
-    deps = [
-        ANDROID_RES_TARGET,
-        INFER_ANNOTATIONS_TARGET,
-        JAVA_TARGET,
-        JSR_305_TARGET,
-        SOLOADER_TARGET,
-    ],
-)

android/src/main/java/com/facebook/yoga/android/VirtualYogaLayout.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/src/main/java/com/facebook/yoga/android/YogaLayout.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/src/main/java/com/facebook/yoga/android/YogaViewLayoutFactory.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

android/src/main/res/values/attrs.xml

@@ -2,7 +2,7 @@
 
 <!--
   Copyright (c) Facebook, Inc. and its affiliates.
-  
+
   This source code is licensed under the MIT license found in the
   LICENSE file in the root directory of this source tree.
 -->
@@ -130,8 +130,14 @@
     <attr name="yg_positionAll" format="dimension|string"/>
 
     <attr name="yg_positionType" format="enum">
-      <enum name="relative" value="0"/>
-      <enum name="absolute" value="1"/>
+      <!-- "static" is a reserved keyword
+      <enum name="static" value="0"/>
+      -->
+      <enum name="relative" value="1"/>
+      <enum name="absolute" value="2"/>
+      <enum name="position_static" value="0"/>
+      <enum name="position_relative" value="1"/>
+      <enum name="position_absolute" value="2"/>
     </attr>
 
     <attr name="yg_width" format="dimension|string"/>

benchmark/BUCK

@@ -1,24 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-load("//tools/build_defs/oss:yoga_defs.bzl", "subdir_glob", "yoga_cxx_binary", "yoga_dep")
-
-yoga_cxx_binary(
-    name = "benchmark",
-    srcs = glob(["*.c"]),
-    headers = subdir_glob([("", "*.h")]),
-    header_namespace = "",
-    compiler_flags = [
-        "-fno-omit-frame-pointer",
-        "-fexceptions",
-        "-Wall",
-        "-Werror",
-        "-O3",
-        "-std=c11",
-    ],
-    visibility = ["PUBLIC"],
-    deps = [
-        yoga_dep(":yoga"),
-    ],
-)

benchmark/CMakeLists.txt

@@ -0,0 +1,19 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+
+cmake_minimum_required(VERSION 3.13)
+project(benchmark)
+set(CMAKE_VERBOSE_MAKEFILE on)
+
+set(YOGA_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/..)
+include(${YOGA_ROOT}/cmake/project-defaults.cmake)
+
+add_subdirectory(${YOGA_ROOT}/yoga ${CMAKE_CURRENT_BINARY_DIR}/yoga)
+
+file(GLOB SOURCES CONFIGURE_DEPENDS
+    ${CMAKE_CURRENT_SOURCE_DIR}/*.c)
+add_executable(benchmark ${SOURCES})
+target_link_libraries(benchmark yogacore)

benchmark/YGBenchmark.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

build.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -10,14 +10,11 @@
 buildscript {
     repositories {
         google()
-        jcenter()
-        maven { url 'https://maven.google.com/' }
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-
+        classpath 'com.android.tools.build:gradle:7.3.1'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
@@ -26,46 +23,21 @@ buildscript {
 allprojects {
   repositories {
     google()
-    jcenter()
+    mavenCentral()
   }
 }
 
 ext {
-    minSdkVersion = 14
-    targetSdkVersion = 25
-    compileSdkVersion = 26
-    buildToolsVersion = '28.0.3'
+    buildToolsVersion = "33.0.0"
+    ndkVersion = "23.1.7779620" // Corresponds to AGP 7.3
+    cmakeVersion = "3.18.1+"
+    minSdkVersion = 21
+    compileSdkVersion = 33
+    targetSdkVersion = 33
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }
 
-// If you have an idea on how to avoid this, please get in touch or
-// answer https://stackoverflow.com/questions/43867014/how-to-use-the-gradle-ndk-build-to-compile-for-the-host-machine.
-task copyNativeLibs(type: Copy, dependsOn: ':buckBuildNative') {
-    from "${rootDir}/buck-out/gen/java/tests#default,shared-library-symlink-tree/"
-    include '*.so'
-    include '*.dylib'
-    into "$buildDir/jniLibs"
-}
-
-task buckBuildNative(type: Exec) {
-    workingDir rootDir
-    environment BUCKVERSION: 'last'
-    commandLine 'buck', 'build', '//java/...'
-}
-
-allprojects {
-    afterEvaluate {
-        tasks.withType(Test) {
-            dependsOn copyNativeLibs
-            def libDir = "${rootDir}/build/jniLibs"
-            systemProperty 'java.library.path', libDir
-            environment 'LD_LIBRARY_PATH', libDir
-            environment 'DYLD_LIBRARY_PATH', libDir
-        }
-    }
-}
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

cmake/project-defaults.cmake

@@ -0,0 +1,50 @@
+# Copyright (c) Meta Platforms, Inc. and affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+set(CMAKE_CXX_STANDARD 14)
+set(CMAKE_CXX_VISIBILITY_PRESET hidden)
+set(CMAKE_POSITION_INDEPENDENT_CODE ON)
+
+add_compile_definitions($<$<CONFIG:DEBUG>:DEBUG>)
+
+if(MSVC)
+
+add_compile_options(
+    # Don't omit frame pointers (e.g. for crash dumps)
+    /Oy-
+    # "Standard C++ exception handling" (C++ stack unwinding including extern c)
+    /EHsc
+    # Enable warnings and warnings as errors
+    /W3
+    /WX
+    # Disable RTTI
+    $<$<COMPILE_LANGUAGE:CXX>:/GR->
+    # Use /O2 (Maximize Speed)
+    $<$<CONFIG:RELEASE>:/O2>)
+
+else()
+
+add_compile_options(
+    # Don't omit frame pointers (e.g. for crash dumps)
+    -fno-omit-frame-pointer
+    # Enable exception handling
+    -fexceptions
+    # Enable warnings and warnings as errors
+    -Wall
+    -Werror
+    # Disable RTTI
+    $<$<COMPILE_LANGUAGE:CXX>:-fno-rtti>
+    # Use -O2 (prioritize speed)
+    $<$<CONFIG:RELEASE>:-O2>
+    # Enable separate sections per function/data item
+    $<$<CONFIG:RELEASE>:-ffunction-sections>
+    $<$<CONFIG:RELEASE>:-fdata-sections>)
+
+add_link_options(
+    # Discard unused sections
+    $<$<CONFIG:RELEASE>:$<$<CXX_COMPILER_ID:Clang,GNU>:-Wl,--gc-sections>>
+    $<$<CONFIG:RELEASE>:$<$<CXX_COMPILER_ID:AppleClang>:-Wl,-dead_strip>>)
+
+endif()

cmake/yoga-config.cmake.in

@@ -0,0 +1,10 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+@PACKAGE_INIT@
+
+include("${CMAKE_CURRENT_LIST_DIR}/yogaTargets.cmake")
+
+check_required_components(yoga)

csharp/.hgignore

@@ -1,272 +0,0 @@
-## Ignore Visual Studio temporary files, build results, and
-## files generated by popular Visual Studio add-ons.
-
-# User-specific files
-*.suo
-*.user
-*.userosscache
-*.sln.docstates
-
-# User-specific files (MonoDevelop/Xamarin Studio)
-*.userprefs
-
-# Build results
-[Dd]ebug/
-[Dd]ebugPublic/
-[Rr]elease/
-[Rr]eleases/
-x64/
-x86/
-bld/
-[Bb]in/
-[Oo]bj/
-[Ll]og/
-
-# Visual Studio 2015 cache/options directory
-.vs/
-# Uncomment if you have tasks that create the project's static files in wwwroot
-#wwwroot/
-
-# MSTest test Results
-[Tt]est[Rr]esult*/
-[Bb]uild[Ll]og.*
-
-# NUNIT
-*.VisualState.xml
-TestResult.xml
-tests/Facebook.Yoga/NUnit-[0-9\.]*/
-tests/Facebook.Yoga/YogaTest.dll
-tests/Facebook.Yoga/YogaTest.dll.mdb
-tests/Facebook.Yoga/libyoga.dylib
-
-# Build Results of an ATL Project
-[Dd]ebugPS/
-[Rr]eleasePS/
-dlldata.c
-
-# DNX
-project.lock.json
-project.fragment.lock.json
-artifacts/
-
-*_i.c
-*_p.c
-*_i.h
-*.ilk
-*.meta
-*.obj
-*.pch
-*.pdb
-*.pgc
-*.pgd
-*.rsp
-*.sbr
-*.tlb
-*.tli
-*.tlh
-*.tmp
-*.tmp_proj
-*.log
-*.vspscc
-*.vssscc
-.builds
-*.pidb
-*.svclog
-*.scc
-
-# Chutzpah Test files
-_Chutzpah*
-
-# Visual C++ cache files
-ipch/
-*.aps
-*.ncb
-*.opendb
-*.opensdf
-*.sdf
-*.cachefile
-*.VC.db
-*.VC.VC.opendb
-
-# Visual Studio profiler
-*.psess
-*.vsp
-*.vspx
-*.sap
-
-# TFS 2012 Local Workspace
-$tf/
-
-# Guidance Automation Toolkit
-*.gpState
-
-# ReSharper is a .NET coding add-in
-_ReSharper*/
-*.[Rr]e[Ss]harper
-*.DotSettings.user
-
-# JustCode is a .NET coding add-in
-.JustCode
-
-# TeamCity is a build add-in
-_TeamCity*
-
-# DotCover is a Code Coverage Tool
-*.dotCover
-
-# Visual Studio code coverage results
-*.coverage
-*.coveragexml
-
-# NCrunch
-_NCrunch_*
-.*crunch*.local.xml
-nCrunchTemp_*
-
-# MightyMoose
-*.mm.*
-AutoTest.Net/
-
-# Web workbench (sass)
-.sass-cache/
-
-# Installshield output folder
-[Ee]xpress/
-
-# DocProject is a documentation generator add-in
-DocProject/buildhelp/
-DocProject/Help/*.HxT
-DocProject/Help/*.HxC
-DocProject/Help/*.hhc
-DocProject/Help/*.hhk
-DocProject/Help/*.hhp
-DocProject/Help/Html2
-DocProject/Help/html
-
-# Click-Once directory
-publish/
-
-# Publish Web Output
-*.[Pp]ublish.xml
-*.azurePubxml
-# TODO: Comment the next line if you want to checkin your web deploy settings
-# but database connection strings (with potential passwords) will be unencrypted
-*.pubxml
-*.publishproj
-
-# Microsoft Azure Web App publish settings. Comment the next line if you want to
-# checkin your Azure Web App publish settings, but sensitive information contained
-# in these scripts will be unencrypted
-PublishScripts/
-
-# NuGet Packages
-*.nupkg
-# The packages folder can be ignored because of Package Restore
-**/packages/*
-# except build/, which is used as an MSBuild target.
-!**/packages/build/
-# Uncomment if necessary however generally it will be regenerated when needed
-#!**/packages/repositories.config
-# NuGet v3's project.json files produces more ignoreable files
-*.nuget.props
-*.nuget.targets
-
-# Microsoft Azure Build Output
-csx/
-*.build.csdef
-
-# Microsoft Azure Emulator
-ecf/
-rcf/
-
-# Windows Store app package directories and files
-AppPackages/
-BundleArtifacts/
-Package.StoreAssociation.xml
-_pkginfo.txt
-
-# Visual Studio cache files
-# files ending in .cache can be ignored
-*.[Cc]ache
-# but keep track of directories ending in .cache
-!*.[Cc]ache/
-
-# Others
-ClientBin/
-~$*
-*~
-*.dbmdl
-*.dbproj.schemaview
-*.jfm
-*.pfx
-*.publishsettings
-node_modules/
-orleans.codegen.cs
-
-# Since there are multiple workflows, uncomment next line to ignore bower_components
-# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622)
-#bower_components/
-
-# RIA/Silverlight projects
-Generated_Code/
-
-# Backup & report files from converting an old project file
-# to a newer Visual Studio version. Backup files are not needed,
-# because we have git ;-)
-_UpgradeReport_Files/
-Backup*/
-UpgradeLog*.XML
-UpgradeLog*.htm
-
-# SQL Server files
-*.mdf
-*.ldf
-
-# Business Intelligence projects
-*.rdl.data
-*.bim.layout
-*.bim_*.settings
-
-# Microsoft Fakes
-FakesAssemblies/
-
-# GhostDoc plugin setting file
-*.GhostDoc.xml
-
-# Node.js Tools for Visual Studio
-.ntvs_analysis.dat
-
-# Visual Studio 6 build log
-*.plg
-
-# Visual Studio 6 workspace options file
-*.opt
-
-# Visual Studio LightSwitch build output
-**/*.HTMLClient/GeneratedArtifacts
-**/*.DesktopClient/GeneratedArtifacts
-**/*.DesktopClient/ModelManifest.xml
-**/*.Server/GeneratedArtifacts
-**/*.Server/ModelManifest.xml
-_Pvt_Extensions
-
-# Paket dependency manager
-.paket/paket.exe
-paket-files/
-
-# FAKE - F# Make
-.fake/
-
-# JetBrains Rider
-.idea/
-*.sln.iml
-
-# CodeRush
-.cr/
-
-# Python Tools for Visual Studio (PTVS)
-__pycache__/
-*.pyc
-
-# local buck build
-lib/

csharp/Android/Facebook.Yoga.Android.Tests/MainActivity.cs

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

csharp/BUCK

@@ -1,42 +0,0 @@
-# Copyright (c) Facebook, Inc. and its affiliates.
-#
-# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree.
-
-load("//tools/build_defs:fb_native_wrapper.bzl", "fb_native")
-load(
-    "//tools/build_defs/oss:yoga_defs.bzl",
-    "BASE_COMPILER_FLAGS",
-    "yoga_apple_binary",
-    "yoga_cxx_library",
-    "yoga_dep",
-)
-
-COMPILER_FLAGS = BASE_COMPILER_FLAGS + ["-std=c++11"]
-
-fb_native.csharp_library(
-    name = "yogalibnet46",
-    srcs = glob(["**/*.cs"]),
-    dll_name = "Facebook.Yoga.dll",
-    framework_ver = "net46",
-)
-
-fb_native.csharp_library(
-    name = "yogalibnet45",
-    srcs = glob(["**/*.cs"]),
-    dll_name = "Facebook.Yoga.dll",
-    framework_ver = "net45",
-)
-
-yoga_cxx_library(
-    name = "yoganet",
-    srcs = ["Yoga/YGInterop.cpp"],
-    compiler_flags = COMPILER_FLAGS,
-    link_style = "static",
-    link_whole = True,
-    soname = "libyoga.$(ext)",
-    visibility = ["PUBLIC"],
-    deps = [yoga_dep(":yoga")],
-)
-
-yoga_apple_binary()

csharp/Facebook.Yoga/BaselineFunction.cs

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

csharp/Facebook.Yoga/Logger.cs

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

csharp/Facebook.Yoga/MeasureFunction.cs

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

csharp/Facebook.Yoga/MeasureOutput.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

csharp/Facebook.Yoga/Native.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
@@ -293,6 +293,12 @@ namespace Facebook.Yoga
         [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
         public static extern float YGNodeStyleGetAspectRatio(YGNodeHandle node);
 
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern void YGNodeStyleSetGap(YGNodeHandle node, YogaGutter gutter, float gapLength);
+
+        [DllImport(DllName, ExactSpelling = true, CallingConvention = CallingConvention.Cdecl)]
+        public static extern float YGNodeStyleGetGap(YGNodeHandle node, YogaGutter gutter);
+
 #endregion
 
 #region YG_NODE_STYLE_EDGE_PROPERTY

csharp/Facebook.Yoga/YGConfigHandle.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

csharp/Facebook.Yoga/YGNodeHandle.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

csharp/Facebook.Yoga/YogaAlign.cs

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 namespace Facebook.Yoga
 {
     public enum YogaAlign

csharp/Facebook.Yoga/YogaBaselineFunc.cs

@@ -1,5 +1,5 @@
-/**
- * Copyright (c) Facebook, Inc. and its affiliates.
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

csharp/Facebook.Yoga/YogaConfig.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

csharp/Facebook.Yoga/YogaConstants.cs

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.

csharp/Facebook.Yoga/YogaDimension.cs

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 namespace Facebook.Yoga
 {
     public enum YogaDimension

csharp/Facebook.Yoga/YogaDirection.cs

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 namespace Facebook.Yoga
 {
     public enum YogaDirection

csharp/Facebook.Yoga/YogaDisplay.cs

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 namespace Facebook.Yoga
 {
     public enum YogaDisplay

csharp/Facebook.Yoga/YogaEdge.cs

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 namespace Facebook.Yoga
 {
     public enum YogaEdge

csharp/Facebook.Yoga/YogaExperimentalFeature.cs

@@ -1,14 +1,18 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 namespace Facebook.Yoga
 {
     public enum YogaExperimentalFeature
     {
         WebFlexBasis,
+        AbsolutePercentageAgainstPaddingEdge,
+        FixAbsoluteTrailingColumnMargin,
     }
 }

csharp/Facebook.Yoga/YogaFlexDirection.cs

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 namespace Facebook.Yoga
 {
     public enum YogaFlexDirection

csharp/Facebook.Yoga/YogaGutter.cs

@@ -0,0 +1,18 @@
+/*
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
+// @generated by enums.py
+
+namespace Facebook.Yoga
+{
+    public enum YogaGutter
+    {
+        Column,
+        Row,
+        All,
+    }
+}

csharp/Facebook.Yoga/YogaJustify.cs

@@ -1,10 +1,12 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
 
+// @generated by enums.py
+
 namespace Facebook.Yoga
 {
     public enum YogaJustify