Merge branch 'master' into fix-absolute-with-padding

.buckconfig

@@ -0,0 +1,10 @@
+[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,115 +54,3 @@ 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

@@ -1,25 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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

@@ -1,14 +0,0 @@
-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

@@ -1,12 +0,0 @@
-name: Setup Android environment
-
-runs:
-  using: "composite"
-  steps:
-    - name: Select Java Version
-      uses: actions/setup-java@v2
-      with:
-        distribution: zulu
-        java-version: 17
-    - name: Configure Gradle Caches
-      uses: gradle/gradle-build-action@v2

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

@@ -1,9 +0,0 @@
-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

@@ -1,12 +0,0 @@
-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

@@ -1,20 +0,0 @@
-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

@@ -1,18 +0,0 @@
-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

@@ -0,0 +1,56 @@
+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-release.yml

@@ -1,38 +0,0 @@
-name: Publish Android Release
-
-on:
-  push:
-    tags:
-      - '*'
-  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 to Maven Local
-        run: ./gradlew publishToMavenLocal
-        env:
-          ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_KEY }}
-          ORG_GRADLE_PROJECT_SIGNING_PWD: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_PWD }}
-
-      - name: Upload Build Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'snapshot-artifacts'
-          path: '~/.m2/repository/'
-
-      - name: Publish to the Maven Central
-        run: ./gradlew publishToSonatype closeAndReleaseSonatypeStagingRepository
-        env:
-          ORG_GRADLE_PROJECT_SONATYPE_USERNAME: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_USERNAME }}
-          ORG_GRADLE_PROJECT_SONATYPE_PASSWORD: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_PASSWORD }}
-          ORG_GRADLE_PROJECT_SIGNING_KEY: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_KEY }}
-          ORG_GRADLE_PROJECT_SIGNING_PWD: ${{ secrets.ORG_GRADLE_PROJECT_SIGNING_PWD }}

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

@@ -1,36 +0,0 @@
-name: Publish Android Snapshot
-
-on:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  publish:
-    name: Publish Snapshot
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup-android
-
-      - name: Publish to Maven Local
-        run: ./gradlew publishToMavenLocal
-        env:
-          ORG_GRADLE_PROJECT_USE_SNAPSHOT: true
-
-      - name: Upload Build Artifacts
-        uses: actions/upload-artifact@v3
-        with:
-          name: 'snapshot-artifacts'
-          path: '~/.m2/repository/'
-
-      - name: Publish to the Snapshot Repository
-        run: ./gradlew publishToSonatype
-        env:
-          ORG_GRADLE_PROJECT_SONATYPE_USERNAME: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_USERNAME }}
-          ORG_GRADLE_PROJECT_SONATYPE_PASSWORD: ${{ secrets.ORG_GRADLE_PROJECT_SONATYPE_PASSWORD }}
-          ORG_GRADLE_PROJECT_USE_SNAPSHOT: true

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

@@ -1,29 +0,0 @@
-name: Publish CocoaPods Release
-
-on:
-  push:
-    tags:
-      - '*'
-  workflow_dispatch:
-
-jobs:
-  publish:
-    name: Publish to CocoaPods trunk
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup-apple
-
-      - name: Publish Yoga
-        run: pod trunk push Yoga.podspec
-        env:
-          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}
-
-      - name: Publish YogaKit
-        # Must run with --synchronous since YogaKit may depend on the just published version of Yoga
-        run: pod trunk push YogaKit.podspec --synchronous
-        env:
-          COCOAPODS_TRUNK_TOKEN: ${{ secrets.COCOAPODS_TRUNK_TOKEN }}

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

@@ -1,25 +0,0 @@
-name: Publish NPM Release
-
-on:
-  push:
-    tags:
-      - '*'
-  workflow_dispatch:
-
-jobs:
-  publish:
-    name: Publish to npmjs registry
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup-js
-
-      - name: Store auth token in config file
-        run: echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
-
-      - name: yarn publish
-        run: yarn publish
-        working-directory: javascript

.github/workflows/publish-website.yml

@@ -1,32 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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

@@ -1,55 +0,0 @@
-name: Apple
-
-on:
-  pull_request:
-  push:
-    branches:
-      - main
-  workflow_dispatch:
-
-jobs:
-  lint-pods:
-    name: Lint pod
-    runs-on: macos-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup-apple
-
-      - name: pod lib lint
-        run: pod lib lint --verbose --include-podspecs=**/*.podspec
-
-  build-sample:
-    name: Build sample [${{ 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
-
-      - name: xcodebuild YogaKitSample.xcworkspace
-        run: xcodebuild -workspace YogaKitSample.xcworkspace -scheme YogaKitSample
-        working-directory: ./YogaKit/YogaKitSample
-
-  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

@@ -1,64 +0,0 @@
-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

@@ -1,92 +0,0 @@
-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
-
-  pack:
-    name: Pack
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Setup
-        uses: ./.github/actions/setup-js
-
-      - name: yarn pack
-        run: yarn pack --filename yoga-layout.tar.gz
-        working-directory: javascript
-
-      - uses: actions/upload-artifact@v3
-        with:
-          name: npm-package
-          path: javascript/yoga-layout.tar.gz

.github/workflows/validate-python.yml

@@ -1,21 +0,0 @@
-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

@@ -1,23 +0,0 @@
-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,15 +5,14 @@
 /.buckconfig.local
 /.buckd
 /gentest/test.html
-.buck-java11
+.buckversion
 
 # Jekyll
 /.sass-cache/
 /_site/
 
 # Visual studio code
-!.vscode
-
+.vscode
 *.pdb
 *.tlog
 *.obj
@@ -64,11 +63,5 @@ Carthage/Build
 
 # Gradle
 .gradle
-local.properties
-
 # NDK/CMake
-.cxx
 .externalNativeBuild
-
-# Docusarus build
-.docusaurus

.gitmodules

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

.vscode/extensions.json

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

.vscode/launch.json

@@ -1,25 +0,0 @@
-{
-  // 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

@@ -1,20 +0,0 @@
-{
-  "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

@@ -1,23 +0,0 @@
-{
-  // 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

@@ -0,0 +1,83 @@
+# 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,52 +1,24 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
+# 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.
 
-cmake_minimum_required(VERSION 3.13...3.26)
-project(yoga-all)
+cmake_minimum_required(VERSION 3.4.1)
+
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/project-defaults.cmake)
+add_compile_options(
+    -fno-omit-frame-pointer
+    -fexceptions
+    -fvisibility=hidden
+    -ffunction-sections
+    -fdata-sections
+    -Wall
+    -std=c++11)
 
-add_subdirectory(yoga)
-add_subdirectory(tests)
+file(GLOB_RECURSE yogacore_SRC yoga/*.cpp)
+add_library(yogacore STATIC ${yogacore_SRC})
 
-# 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
-)
+target_include_directories(yogacore PUBLIC .)
+target_link_libraries(yogacore android log)
+set_target_properties(yogacore PROPERTIES CXX_STANDARD 11)

CODE_OF_CONDUCT.md

@@ -74,3 +74,4 @@ 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 `main`.
+1. Fork the repo and create your branch from `master`.
 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,24 +1,14 @@
-# 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.
-
+# 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)
 
 ## Building
-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.
+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.
 
-```sh
-./unit_tests <Debug|Release>
-```
+## 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`.
 
-While not required, this script will use [ninja](https://ninja-build.org/) if it is installed for faster builds.
+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`.
 
-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`.
+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.
 
 ```html
 <div id="my_test" style="width: 100px; height: 100px; align-items: center;">
@@ -26,11 +16,33 @@ Many of Yoga's tests are automatically generated, using HTML fixtures describing
 </div>
 ```
 
-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.
+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.
 
+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.
 
-## Debugging
+### .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`.
 
-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).
+## 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.podspec

@@ -1,26 +1,24 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
+# 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.
 
-
 Pod::Spec.new do |spec|
   spec.name = 'Yoga'
-  spec.version = '2.0.1'
+  spec.version = '1.14.0'
   spec.license =  { :type => 'MIT', :file => "LICENSE" }
   spec.homepage = 'https://yogalayout.com/'
   spec.documentation_url = 'https://yogalayout.com/docs'
 
-  spec.summary = 'An embeddable and performant flexbox layout engine with bindings for multiple languages'
+  spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.'
+  spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.'
 
-  spec.authors = {'Meta Open Source' => 'opensource@meta.com'}
+  spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => "v#{spec.version.to_s}",
+    :tag => spec.version.to_s,
   }
-
-  spec.ios.deployment_target = "13.4"
-
+  spec.platforms = { :ios => "8.0", :osx => "10.7", :tvos => "10.0", :watchos => "2.0" }
   spec.module_name = 'yoga'
   spec.requires_arc = false
   spec.pod_target_xcconfig = {
@@ -31,11 +29,10 @@ Pod::Spec.new do |spec|
       '-fexceptions',
       '-Wall',
       '-Werror',
-      '-Wextra',
-      '-std=c++14',
+      '-std=c++1y',
       '-fPIC'
   ]
-  spec.source_files = 'yoga/**/*.{h,cpp}'
-  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
-  spec.swift_version = '5.1'
+  spec.source_files = 'yoga/**/*.{c,h,cpp}'
+  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGNode,YGStyle,YGValue}.h'
+
 end

YogaDev.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,10 @@
+<?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

@@ -0,0 +1,8 @@
+<?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

@@ -0,0 +1,350 @@
+// !$*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,28 +1,33 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
+# 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.
 
 podspec = Pod::Spec.new do |spec|
   spec.name = 'YogaKit'
-  spec.version = '2.0.1'
+  spec.version = '1.18.1'
   spec.license =  { :type => 'MIT', :file => "LICENSE" }
-  spec.homepage = 'https://yogalayout.com/'
-  spec.documentation_url = 'https://yogalayout.com/docs'
-  spec.deprecated = true
+  spec.homepage = 'https://facebook.github.io/yoga/'
+  spec.documentation_url = 'https://facebook.github.io/yoga/docs/'
 
-  spec.summary = 'YogaKit allows using the Yoga layout engine in combination with UIKit'
+  spec.summary = 'Yoga is a cross-platform layout engine which implements Flexbox.'
+  spec.description = 'Yoga is a cross-platform layout engine enabling maximum collaboration within your team by implementing an API many designers are familiar with, and opening it up to developers across different platforms.'
 
-  spec.authors = {'Meta Open Source' => 'opensource@meta.com'}
+  spec.authors = 'Facebook'
   spec.source = {
     :git => 'https://github.com/facebook/yoga.git',
-    :tag => "v#{spec.version.to_s}",
+    :tag => "1.18.0",
   }
 
-  spec.platforms = { :ios => "13.4" }
+  spec.platform = :ios
+  spec.ios.deployment_target = '8.0'
   spec.ios.frameworks = 'UIKit'
   spec.module_name = 'YogaKit'
-  spec.dependency 'Yoga', "~> #{spec.version.to_s}"
+  spec.dependency 'Yoga', '~> 1.14'
+  # Fixes the bug related the xcode 11 not able to find swift related frameworks.
+  # https://github.com/Carthage/Carthage/issues/2825
+  # https://twitter.com/krzyzanowskim/status/1151549874653081601?s=21
+  spec.pod_target_xcconfig = {"LD_VERIFY_BITCODE": "NO"}
   spec.source_files = 'YogaKit/Source/*.{h,m,swift}'
   spec.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
   spec.private_header_files = 'YogaKit/Source/YGLayout+Private.h'

YogaKit/.swift-version

@@ -0,0 +1 @@
+3.0.2

YogaKit/BUCK

@@ -0,0 +1,67 @@
+# 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,10 +12,11 @@ pod 'YogaKit', '~> 1.7'
 ```
 
 ## Getting Started
+Checkout the docs [here](https://facebook.github.io/yoga/docs/api/yogakit/).
 
-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.
+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.
 
 ## 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/main/CONTRIBUTING.md) file for how to help out.
+See the [CONTRIBUTING.md](https://github.com/facebook/yoga/blob/master/CONTRIBUTING.md) file for how to help out.

YogaKit/Source/UIView+Yoga.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.

YogaKit/Source/UIView+Yoga.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.

YogaKit/Source/YGLayout+Private.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.

YogaKit/Source/YGLayout.h

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.

YogaKit/Source/YGLayout.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.
@@ -175,7 +175,6 @@ static YGConfigRef globalConfig;
   globalConfig = YGConfigNew();
   YGConfigSetExperimentalFeatureEnabled(
       globalConfig, YGExperimentalFeatureWebFlexBasis, true);
-  YGConfigSetErrata(globalConfig, YGErrataClassic);
   YGConfigSetPointScaleFactor(globalConfig, [UIScreen mainScreen].scale);
 }
 
@@ -286,10 +285,6 @@ 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) Meta Platforms, Inc. and affiliates.
+ * 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.

YogaKit/Tests/YogaKitTests.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.
@@ -252,10 +252,6 @@
 }
 
 - (void)testFrameAndOriginPlacement {
-  // https://www.internalfb.com/intern/test/562950017690956
-  XCTSkip(
-      @"TODO: this test fails with actual dimensions off by 1px from expected");
-
   const CGSize containerSize = CGSizeMake(320, 50);
 
   UIView* container = [[UIView alloc]

YogaKit/YogaKitSample/Podfile

@@ -1,17 +1,6 @@
 use_frameworks!
 
-platform :ios, "13.4"
-
 target 'YogaKitSample' do
   pod 'YogaKit', :path => '../../YogaKit.podspec'
-  pod 'Yoga', :path => '../../Yoga.podspec'
-  pod 'IGListKit', '~> 4.0.0'
-end
-
-post_install do |installer|
-  installer.pods_project.targets.each do |target|
-    target.build_configurations.each do |config|
-      config.build_settings['IPHONEOS_DEPLOYMENT_TARGET'] = '13.4'
-    end
-  end
+  pod 'IGListKit', '~> 2.1.0'
 end

YogaKit/YogaKitSample/Podfile.lock

@@ -1,33 +1,26 @@
 PODS:
-  - IGListDiffKit (4.0.0)
-  - IGListKit (4.0.0):
-    - IGListDiffKit (= 4.0.0)
-  - Yoga (2.0.0-beta.1)
-  - YogaKit (2.0.0-beta.1):
-    - Yoga (~> 2.0.0-beta.1)
+  - IGListKit (2.1.0):
+    - IGListKit/Default (= 2.1.0)
+  - IGListKit/Default (2.1.0):
+    - IGListKit/Diffing
+  - IGListKit/Diffing (2.1.0)
+  - Yoga (1.7.0)
+  - YogaKit (1.7.0):
+    - Yoga (~> 1.7)
 
 DEPENDENCIES:
-  - IGListKit (~> 4.0.0)
-  - Yoga (from `../../Yoga.podspec`)
+  - IGListKit (~> 2.1.0)
   - YogaKit (from `../../YogaKit.podspec`)
 
-SPEC REPOS:
-  trunk:
-    - IGListDiffKit
-    - IGListKit
-
 EXTERNAL SOURCES:
-  Yoga:
-    :path: "../../Yoga.podspec"
   YogaKit:
-    :path: "../../YogaKit.podspec"
+    :path: ../../YogaKit.podspec
 
 SPEC CHECKSUMS:
-  IGListDiffKit: 665d6cf43ce726e676013db9c7d6c4294259b6b2
-  IGListKit: fd5a5d21935298f5849fa49d426843cff97b77c7
-  Yoga: 090c6851e548d085d6211b5466b57ba8f4013a90
-  YogaKit: 5ae1939cd7516fdf6c343abb4b4aa381c9911ccf
+  IGListKit: b826c68ef7a4ae1626c09d4d3e1ea7a169e6c36e
+  Yoga: 2ed1d7accfef3610a67f58c0cf101a0662137f2c
+  YogaKit: 31576530e8fcae3175469719ec3212397403330b
 
-PODFILE CHECKSUM: e5d9841ef739884db00a29f2d529d16bf247a4ca
+PODFILE CHECKSUM: 216f8e7127767709e0e43f3711208d238fa5c404
 
-COCOAPODS: 1.12.1
+COCOAPODS: 1.1.1

YogaKit/YogaKitSample/YogaKitSample.xcodeproj/project.pbxproj

@@ -1,3 +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.
+ */
+
 // !$*UTF8*$!
 {
 	archiveVersion = 1;
@@ -171,6 +178,7 @@
 				13687D401DF8748300E7C260 /* Frameworks */,
 				13687D411DF8748300E7C260 /* Resources */,
 				FA2FB9DD6471BDD3FBCE503B /* [CP] Embed Pods Frameworks */,
+				6E01EB987F1564F3D71EBE5A /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -264,16 +272,28 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
-				"${PODS_ROOT}/Manifest.lock",
 			);
 			name = "[CP] Check Pods Manifest.lock";
 			outputPaths = (
-				"$(DERIVED_FILE_DIR)/Pods-YogaKitSample-checkManifestLockResult.txt",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n";
+			showEnvVarsInLog = 0;
+		};
+		6E01EB987F1564F3D71EBE5A /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			name = "[CP] Copy Pods Resources";
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-resources.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		FA2FB9DD6471BDD3FBCE503B /* [CP] Embed Pods Frameworks */ = {
@@ -282,22 +302,13 @@
 			files = (
 			);
 			inputPaths = (
-				"${PODS_ROOT}/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/IGListDiffKit/IGListDiffKit.framework",
-				"${BUILT_PRODUCTS_DIR}/IGListKit/IGListKit.framework",
-				"${BUILT_PRODUCTS_DIR}/Yoga/yoga.framework",
-				"${BUILT_PRODUCTS_DIR}/YogaKit/YogaKit.framework",
 			);
 			name = "[CP] Embed Pods Frameworks";
 			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IGListDiffKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/IGListKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/yoga.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YogaKit.framework",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-frameworks.sh\"\n";
+			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-YogaKitSample/Pods-YogaKitSample-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 /* End PBXShellScriptBuildPhase section */
@@ -355,7 +366,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGNING_ALLOWED = NO;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = dwarf;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
@@ -374,7 +385,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = iphoneos;
@@ -403,7 +414,7 @@
 				CLANG_WARN_SUSPICIOUS_MOVES = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGNING_ALLOWED = NO;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
 				ENABLE_NS_ASSERTIONS = NO;
@@ -416,7 +427,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = iphoneos;
 				VALIDATE_PRODUCT = YES;
@@ -435,7 +446,7 @@
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
-				SWIFT_VERSION = 5.1;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Debug;
 		};
@@ -450,7 +461,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSample;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_INSTALL_OBJC_HEADER = NO;
-				SWIFT_VERSION = 5.1;
+				SWIFT_VERSION = 3.0;
 			};
 			name = Release;
 		};
@@ -460,7 +471,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = YogaKitSampleTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSampleTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -474,7 +485,7 @@
 				ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
 				BUNDLE_LOADER = "$(TEST_HOST)";
 				INFOPLIST_FILE = YogaKitSampleTests/Info.plist;
-				IPHONEOS_DEPLOYMENT_TARGET = 13.4;
+				IPHONEOS_DEPLOYMENT_TARGET = 10.2;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
 				PRODUCT_BUNDLE_IDENTIFIER = com.facebook.YogaKitSampleTests;
 				PRODUCT_NAME = "$(TARGET_NAME)";

YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.

YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.
@@ -18,12 +18,12 @@ private final class ExampleModel {
     }
 }
 
-extension ExampleModel: ListDiffable {
+extension ExampleModel: IGListDiffable {
     fileprivate func diffIdentifier() -> NSObjectProtocol {
         return title as NSString
     }
 
-    fileprivate func isEqual(toDiffableObject object: ListDiffable?) -> Bool {
+    fileprivate func isEqual(toDiffableObject object: IGListDiffable?) -> Bool {
         guard let otherObj = object as? ExampleModel else { return false }
 
         return (title == otherObj.title) &&
@@ -31,16 +31,12 @@ extension ExampleModel: ListDiffable {
     }
 }
 
-final class ExamplesViewController: UIViewController, ListAdapterDataSource, ListSingleSectionControllerDelegate {
+final class ExamplesViewController: UIViewController, IGListAdapterDataSource, IGListSingleSectionControllerDelegate {
+    private lazy var adapter: IGListAdapter = {
+        return IGListAdapter(updater: IGListAdapterUpdater(), viewController: self, workingRangeSize: 0)
+    }()
+    private let collectionView = IGListCollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
 
-    private lazy var adapter: ListAdapter = {
-        return ListAdapter(updater: ListAdapterUpdater(), viewController: self, workingRangeSize: 0)
-    }()
-    private lazy var collectionView: UICollectionView = {
-        let collectionView = UICollectionView(frame: .zero, collectionViewLayout: UICollectionViewFlowLayout())
-        collectionView.backgroundColor = UIColor.systemBackground
-        return collectionView
-    }()
 
     // Update this to array to create more examples.
     private let models: [ExampleModel] = [ExampleModel(title: "Basic Layout", controllerClass: BasicViewController.self),
@@ -63,16 +59,16 @@ final class ExamplesViewController: UIViewController, ListAdapterDataSource, Lis
 
     //MARK: IGListAdapterDataSource
 
-    func objects(for listAdapter: ListAdapter) -> [ListDiffable] {
-        return models as [ListDiffable]
+    func objects(for listAdapter: IGListAdapter) -> [IGListDiffable] {
+        return models as [IGListDiffable]
     }
 
-    func listAdapter(_ listAdapter: ListAdapter, sectionControllerFor object: Any) -> ListSectionController {
-        let sizeBlock: ListSingleSectionCellSizeBlock = { (model, context) in
+    func listAdapter(_ listAdapter: IGListAdapter, sectionControllerFor object: Any) -> IGListSectionController {
+        let sizeBlock: IGListSingleSectionCellSizeBlock = { (model, context) in
             return CGSize(width: (context?.containerSize.width)!, height: 75.0)
         }
 
-        let configureBlock: ListSingleSectionCellConfigureBlock = { (model, cell) in
+        let configureBlock: IGListSingleSectionCellConfigureBlock = { (model, cell) in
             guard let m = model as? ExampleModel, let c = cell as? SingleLabelCollectionCell else {
                 return
             }
@@ -80,17 +76,18 @@ final class ExamplesViewController: UIViewController, ListAdapterDataSource, Lis
             c.label.text = m.title
         }
 
-        let sectionController = ListSingleSectionController(cellClass: SingleLabelCollectionCell.self,
+        let sectionController = IGListSingleSectionController(cellClass: SingleLabelCollectionCell.self,
                                                               configureBlock: configureBlock,
                                                               sizeBlock: sizeBlock)
         sectionController.selectionDelegate = self
         return sectionController
     }
 
-    func emptyView(for listAdapter: ListAdapter) -> UIView? { return nil }
+    func emptyView(for listAdapter: IGListAdapter) -> UIView? { return nil }
 
     //MARK: IGListSingleSectionControllerDelegate
-    func didSelect(_ sectionController: ListSingleSectionController, with object: Any) {
+
+    func didSelect(_ sectionController: IGListSingleSectionController) {
         let section = adapter.section(for: sectionController)
         let model = models[section]
 

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.
@@ -10,11 +10,11 @@ import YogaKit
 
 final class BasicViewController: UIViewController {
     override func viewDidLoad() {
-        super.viewDidLoad()
         let containerSize = self.view.bounds.size
 
-        view.backgroundColor = UIColor.systemBackground
-        view.configureLayout { (layout) in
+        let root = self.view!
+        root.backgroundColor = .white
+        root.configureLayout { (layout) in
             layout.isEnabled = true
             layout.width = YGValue(containerSize.width)
             layout.height = YGValue(containerSize.height)
@@ -30,29 +30,24 @@ final class BasicViewController: UIViewController {
             layout.height = 10
             layout.marginBottom = 25
         }
-        view.addSubview(child1)
+        root.addSubview(child1)
 
         let child2 = UIView(frame: CGRect(x: 0, y: 0, width: 200, height: 200))
         child2.backgroundColor = .green
         child2.configureLayout { (layout) in
             layout.isEnabled = true
             layout.alignSelf = .flexEnd
-            layout.width = 200
-            layout.height = 200
         }
-        view.addSubview(child2)
+        root.addSubview(child2)
 
         let child3 = UIView(frame: CGRect(x: 0, y: 0, width: 100, height: 100))
         child3.backgroundColor = .yellow
         child3.configureLayout { (layout) in
             layout.isEnabled = true
             layout.alignSelf = .flexStart
-            layout.width = 100
-            layout.height = 100
-
         }
-        view.addSubview(child3)
+        root.addSubview(child3)
 
-        view.yoga.applyLayout(preservingOrigin: true)
+        root.yoga.applyLayout(preservingOrigin: true)
     }
 }

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.
@@ -14,7 +14,6 @@ final class LayoutInclusionViewController: UIViewController {
     private let contentView: UIView = UIView(frame: .zero)
 
     override func viewDidLoad() {
-        super.viewDidLoad()
         let root = self.view!
         root.backgroundColor = .white
         root.configureLayout { (layout) in
@@ -52,9 +51,9 @@ final class LayoutInclusionViewController: UIViewController {
         }
         contentView.addSubview(disappearingView)
 
-        button.setTitle("Add Blue View", for: .selected)
-        button.setTitle("Remove Blue View", for: .normal)
-        button.addTarget(self, action: #selector(buttonWasTapped), for: .touchUpInside)
+        button.setTitle("Add Blue View", for: UIControlState.selected)
+        button.setTitle("Remove Blue View", for: UIControlState.normal)
+        button.addTarget(self, action: #selector(buttonWasTapped), for: UIControlEvents.touchUpInside)
         button.configureLayout { (layout) in
             layout.isEnabled = true
             layout.height = 300
@@ -67,7 +66,7 @@ final class LayoutInclusionViewController: UIViewController {
     }
 
     // MARK - UIButton Action
-    @objc func buttonWasTapped() {
+    func buttonWasTapped() {
         button.isSelected = !button.isSelected
 
         button.isUserInteractionEnabled = false

YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.

android/BUCK

@@ -0,0 +1,30 @@
+# 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:
 
-    implementation 'com.facebook.yoga.android:yoga-layout:1.16.0'
+    compile 'com.facebook.yoga.android:yoga-layout:1.2.0'
 
 ## Getting Started
 
-Check out the docs [here](https://yogalayout.com/getting-started/standalone/).
+Check out the docs [here](https://facebook.github.io/yoga/docs/api/android/).
 
 We also have a sample project.  To try it, clone the repo and run (with a device attached)
 

android/build.gradle

@@ -1,21 +1,21 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.
  */
 
-plugins {
-    id("com.android.library")
-    id("publish")
-}
+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
@@ -26,16 +26,27 @@ android {
         targetCompatibility rootProject.targetCompatibilityVersion
         sourceCompatibility rootProject.sourceCompatibilityVersion
     }
-
-    publishing {
-        multipleVariants {
-            withSourcesJar()
-            withJavadocJar()
-            includeBuildTypeValues('debug', 'release')
-        }
-    }
 }
 
 dependencies {
     api project(':yoga')
 }
+
+task sourcesJar(type: Jar) {
+    classifier = 'source'
+    from android.sourceSets.main.java.srcDirs
+}
+
+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')

android/gradle.properties

@@ -0,0 +1,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.
+#
+
+GROUP=com.facebook.yoga.android
+POM_NAME=YogaLayout
+POM_DESCRIPTION=YogaLayout
+POM_ARTIFACT_ID=yoga-layout
+POM_PACKAGING=aar

android/sample/AndroidManifest.xml

@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  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.
+-->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+          package="com.facebook.samples.yoga"
+          android:versionCode="1"
+          android:versionName="1.0"
+          >
+
+  <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:label="@string/app_name"
+      android:icon="@drawable/ic_launcher"
+      android:allowBackup="false"
+      android:theme="@style/NoTitleBarWhiteBG"
+      android:supportsRtl="true"
+      >
+
+    <activity
+        android:name=".MainActivity"
+        android:exported="true"
+        >
+
+      <intent-filter>
+        <action android:name="android.intent.action.MAIN"/>
+        <category android:name="android.intent.category.LAUNCHER"/>
+      </intent-filter>
+
+    </activity>
+
+    <activity
+        android:name=".BenchmarkActivity"
+        android:exported="false"
+        />
+
+  </application>
+
+</manifest>

android/sample/BUCK

@@ -0,0 +1,36 @@
+# 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/debug.keystore.properties

@@ -0,0 +1,3 @@
+key.alias=androiddebugkey
+key.store.password=android
+key.alias.password=android

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

@@ -0,0 +1,22 @@
+# 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"]),
+    autoglob = False,
+    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,27 +1,27 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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 com.facebook.yoga.sample;
+package com.facebook.samples.yoga;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentTransaction;
+import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.Menu;
+import android.support.v7.app.ActionBar;
 
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.fragment.app.Fragment;
-import androidx.fragment.app.FragmentManager;
-import androidx.fragment.app.FragmentPagerAdapter;
-import androidx.fragment.app.FragmentTransaction;
-import androidx.viewpager.widget.ViewPager;
-
+import com.facebook.samples.yoga.R;
 import com.facebook.yoga.android.YogaViewLayoutFactory;
 
 public class BenchmarkActivity extends AppCompatActivity {
@@ -33,24 +33,21 @@ public class BenchmarkActivity extends AppCompatActivity {
 
     setContentView(R.layout.benchmark_select_layout);
 
-    ViewPager viewPager = findViewById(R.id.viewpager);
+    ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
     viewPager.setAdapter(new PagerAdapter(getSupportFragmentManager()));
 
     final ActionBar actionBar = getSupportActionBar();
     actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
 
     ActionBar.TabListener tabListener = new ActionBar.TabListener() {
-      @Override
       public void onTabSelected(ActionBar.Tab tab, FragmentTransaction ft) {
-        ViewPager viewPager = findViewById(R.id.viewpager);
+        ViewPager viewPager = (ViewPager) findViewById(R.id.viewpager);
         viewPager.setCurrentItem(tab.getPosition());
       }
 
-      @Override
       public void onTabUnselected(ActionBar.Tab tab, FragmentTransaction ft) {
       }
 
-      @Override
       public void onTabReselected(ActionBar.Tab tab, FragmentTransaction ft) {
       }
     };

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

@@ -1,18 +1,21 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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 com.facebook.yoga.sample;
+package com.facebook.samples.yoga;
 
 import java.io.File;
+import java.io.FileWriter;
 import java.io.PrintWriter;
 import java.lang.Math;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.LinkedList;
 import java.util.List;
+import java.text.DateFormat;
 import java.util.Date;
 
 import android.content.Context;

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

@@ -1,30 +1,29 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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 com.facebook.yoga.sample;
+package com.facebook.samples.yoga;
 
 
+import java.util.Random;
 import android.os.Bundle;
+import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewParent;
-import android.widget.AdapterView;
-import android.widget.ArrayAdapter;
 import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
+import android.widget.ArrayAdapter;
+import android.widget.AdapterView;
 
-import androidx.fragment.app.Fragment;
-
+import com.facebook.samples.yoga.R;
 import com.facebook.yoga.android.YogaLayout;
 
-import java.util.Random;
-
 public class BenchmarkFragment extends Fragment implements AdapterView.OnItemSelectedListener {
   private LayoutInflater mInflater;
 
@@ -69,7 +68,7 @@ public class BenchmarkFragment extends Fragment implements AdapterView.OnItemSel
         container,
         false);
 
-    Spinner benchmarkSelect = rootLayout.findViewById(R.id.benchmarkSelect);
+    Spinner benchmarkSelect = (Spinner) rootLayout.findViewById(R.id.benchmarkSelect);
     String[] items = new String[]{"Basic", "Typical", "Nested"};
     ArrayAdapter<String> adapter = new ArrayAdapter<>(getActivity(), android.R.layout.simple_spinner_dropdown_item, items);
     benchmarkSelect.setAdapter(adapter);
@@ -105,7 +104,7 @@ public class BenchmarkFragment extends Fragment implements AdapterView.OnItemSel
   }
 
   private void updatePreview() {
-    LinearLayout previewLayout = rootLayout.findViewById(R.id.preview);
+    LinearLayout previewLayout = (LinearLayout) rootLayout.findViewById(R.id.preview);
     View v  = mInflater.inflate(yogaLayout, rootLayout, false);
     v.setLayoutParams(new LinearLayout.LayoutParams(
         LinearLayout.LayoutParams.MATCH_PARENT,

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

@@ -1,35 +1,44 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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 com.facebook.yoga.sample;
+package com.facebook.samples.yoga;
 
 import android.os.Bundle;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.TextView;
+import android.widget.Button;
+import android.view.ViewGroup;
+import android.util.Log;
+import com.facebook.samples.yoga.R;
 
 public class BenchmarkInflate extends BenchmarkFragment {
 
   @Override
-  public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+  public View onCreateView(
+    LayoutInflater inflater,
+    ViewGroup container,
+    Bundle savedInstanceState) {
     super.onCreateView(inflater, container, savedInstanceState);
 
-    Button b = rootLayout.findViewById(R.id.btn);
-    b.setOnClickListener(v -> startBenchmark());
+    Button b = (Button) rootLayout.findViewById(R.id.btn);
+    b.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        startBenchmark();
+      }
+    });
 
     return rootLayout;
   }
 
   protected void startBenchmark() {
     LayoutInflater inflater = LayoutInflater.from(getActivity());
-    TextView textView = rootLayout.findViewById(R.id.text);
+    TextView textView = (TextView) rootLayout.findViewById(R.id.text);
 
     final int ITERATIONS = 500;
 
@@ -48,13 +57,13 @@ public class BenchmarkInflate extends BenchmarkFragment {
     }
 
     textView.setText(
-            yogaInflationAggregator.toString() +
-                    "\n" +
+        yogaInflationAggregator.toString()+
+            "\n"+
             linearInflationAggregator.toString());
     Log.i(
       "YogaLayoutBenchmark",
-            yogaInflationAggregator.toString() +
-                    "\n" +
+      yogaInflationAggregator.toString()+
+        "\n"+
         linearInflationAggregator.toString());
     rootLayout.invalidate();
   }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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 com.facebook.yoga.sample;
+package com.facebook.samples.yoga;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -14,6 +14,9 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
+import com.facebook.samples.yoga.R;
+
+import java.util.Random;
 
 public class BenchmarkLayout extends BenchmarkFragment {
 
@@ -24,15 +27,21 @@ public class BenchmarkLayout extends BenchmarkFragment {
     Bundle savedInstanceState) {
     super.onCreateView(inflater, container, savedInstanceState);
 
-    Button b = rootLayout.findViewById(R.id.btn);
-    b.setOnClickListener(v -> startBenchmark());
+    Button b = (Button) rootLayout.findViewById(R.id.btn);
+    b.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        startBenchmark();
+      }
+    });
 
     return rootLayout;
   }
 
   protected void startBenchmark() {
     LayoutInflater inflater = LayoutInflater.from(getActivity());
-    TextView textView = rootLayout.findViewById(R.id.text);
+    TextView textView = (TextView) rootLayout.findViewById(R.id.text);
+    Random random = new Random();
 
     final int ITERATIONS = 500;
 
@@ -58,13 +67,13 @@ public class BenchmarkLayout extends BenchmarkFragment {
     }
 
     textView.setText(
-            yogaInflationAggregator +
-                    "\n" +
-                    linearInflationAggregator);
+        yogaInflationAggregator.toString()+
+            "\n"+
+            linearInflationAggregator.toString());
     Log.i(
       "YogaLayoutBenchmark",
-            yogaInflationAggregator +
-                    "\n" +
-                    linearInflationAggregator);
+      yogaInflationAggregator.toString()+
+        "\n"+
+        linearInflationAggregator.toString());
   }
 }

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

@@ -1,11 +1,11 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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 com.facebook.yoga.sample;
+package com.facebook.samples.yoga;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -14,6 +14,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.TextView;
+import com.facebook.samples.yoga.R;
 
 import java.util.Random;
 
@@ -26,8 +27,13 @@ public class BenchmarkMeasure extends BenchmarkFragment {
     Bundle savedInstanceState) {
     super.onCreateView(inflater, container, savedInstanceState);
 
-    Button b = rootLayout.findViewById(R.id.btn);
-    b.setOnClickListener(v -> startBenchmark());
+    Button b = (Button) rootLayout.findViewById(R.id.btn);
+    b.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        startBenchmark();
+      }
+    });
 
     return rootLayout;
   }
@@ -59,13 +65,13 @@ public class BenchmarkMeasure extends BenchmarkFragment {
     }
 
     textView.setText(
-            yogaMeasureAggregator.toString() +
-                    "\n" +
+        yogaMeasureAggregator.toString()+
+            "\n"+
             linearMeasureAggregator.toString());
     Log.i(
       "YogaLayoutBenchmark",
-            yogaMeasureAggregator.toString() +
-                    "\n" +
+      yogaMeasureAggregator.toString()+
+        "\n"+
         linearMeasureAggregator.toString());
 
     yogaMeasureAggregator.dump(getActivity());

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

@@ -1,22 +1,21 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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 com.facebook.yoga.sample;
+package com.facebook.samples.yoga;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
 import android.view.LayoutInflater;
-import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
+import android.view.Menu;
 
-import androidx.annotation.NonNull;
-import androidx.appcompat.app.AppCompatActivity;
-
+import com.facebook.samples.yoga.R;
 import com.facebook.soloader.SoLoader;
 import com.facebook.yoga.android.YogaViewLayoutFactory;
 
@@ -44,7 +43,7 @@ public class MainActivity extends AppCompatActivity {
   }
 
   @Override
-  public boolean onOptionsItemSelected(@NonNull MenuItem item) {
+  public boolean onOptionsItemSelected(MenuItem item) {
     // There is only one option
     Intent intent = new Intent(this, BenchmarkActivity.class);
     startActivity(intent);

android/sample/res/layout/benchmark_fragment.xml

@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <YogaLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:yoga="http://schemas.android.com/apk/res-auto"
     android:id="@+id/rt"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    app:yg_flexDirection="column"
+    yoga:yg_flexDirection="column"
     >
   <VirtualYogaLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      app:yg_flexDirection="row"
-      app:yg_height="50dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_height="50dp"
       >
     <Button
         android:id="@+id/btn"
@@ -19,7 +19,7 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:text="Run benchmark"
-        app:yg_flex="1"
+        yoga:yg_flex="1"
         />
     <Spinner
         android:id="@+id/benchmarkSelect"
@@ -34,12 +34,12 @@
       android:layout_height="match_parent"
       android:textSize="10sp"
       android:fontFamily="monospace"
-      app:yg_flex="1"
+      yoga:yg_flex="1"
       />
   <View
       android:layout_width="match_parent"
       android:layout_height="2dp"
-      android:background="@android:color/darker_gray"
+      android:background="@color/yoga_grey"
       />
   <LinearLayout
       android:id="@+id/preview"

android/sample/res/layout/benchmark_layout_1.xml

@@ -1,30 +1,30 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <YogaLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:yoga="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="60dp"
-    app:yg_flexDirection="row"
-    app:yg_alignItems="center"
+    yoga:yg_flexDirection="row"
+    yoga:yg_alignItems="center"
     >
   <View
       android:layout_width="50dp"
       android:layout_height="50dp"
       android:background="@color/yoga_blue"
-      app:yg_flex="0"
-      app:yg_marginAll="5dp"
+      yoga:yg_flex="0"
+      yoga:yg_marginAll="5dp"
       />
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/child_1_text"
-      app:yg_flex="0"
+      yoga:yg_flex="0"
       />
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:text="@string/child_2_text"
-      app:yg_flex="1"
-      app:yg_marginHorizontal="5dp"
+      yoga:yg_flex="1"
+      yoga:yg_marginHorizontal="5dp"
   />
 </YogaLayout>

android/sample/res/layout/benchmark_layout_2.xml

@@ -1,102 +1,102 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <YogaLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:yoga="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="60dp"
-    app:yg_flexDirection="column"
-    app:yg_alignItems="stretch"
+    yoga:yg_flexDirection="column"
+    yoga:yg_alignItems="stretch"
     >
   <View
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:background="@color/yoga_blue"
-      app:yg_flex="1"
+      yoga:yg_flex="1"
       />
   <VirtualYogaLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      app:height="40dp"
-      app:yg_flexDirection="row"
-      app:yg_alignItems="stretch"
+      yoga:height="40dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="stretch"
       >
     <View
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@color/yoga_blue"
-        app:yg_marginAll="10dp"
-        app:yg_aspectRatio="1"
+        yoga:yg_marginAll="10dp"
+        yoga:yg_aspectRatio="1"
         />
     <VirtualYogaLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:height="40dp"
-        app:yg_flexDirection="column"
-        app:yg_alignItems="stretch"
-        app:yg_flex="1"
-        app:yg_justifyContent="space_around"
+        yoga:height="40dp"
+        yoga:yg_flexDirection="column"
+        yoga:yg_alignItems="stretch"
+        yoga:yg_flex="1"
+        yoga:yg_justifyContent="space_around"
         >
       <VirtualYogaLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-           app:height="8dp"
-           app:yg_flexDirection="row"
-           app:yg_alignItems="stretch"
+           yoga:height="8dp"
+           yoga:yg_flexDirection="row"
+           yoga:yg_alignItems="stretch"
            >
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/child_1_text"
             android:textSize="5sp"
-            app:yg_flex="1"
+            yoga:yg_flex="1"
             />
         <View
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@color/yoga_blue"
-            app:yg_aspectRatio="1"
+            yoga:yg_aspectRatio="1"
             />
       </VirtualYogaLayout>
       <VirtualYogaLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-           app:height="8dp"
-           app:yg_flexDirection="row"
-           app:yg_alignItems="stretch"
+           yoga:height="8dp"
+           yoga:yg_flexDirection="row"
+           yoga:yg_alignItems="stretch"
            >
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/child_1_text"
             android:textSize="5sp"
-            app:yg_flex="1"
+            yoga:yg_flex="1"
             />
         <View
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@color/yoga_blue"
-            app:yg_aspectRatio="1"
+            yoga:yg_aspectRatio="1"
             />
       </VirtualYogaLayout>
       <VirtualYogaLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-           app:height="8dp"
-           app:yg_flexDirection="row"
-           app:yg_alignItems="stretch"
+           yoga:height="8dp"
+           yoga:yg_flexDirection="row"
+           yoga:yg_alignItems="stretch"
            >
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/child_1_text"
             android:textSize="5sp"
-            app:yg_flex="1"
+            yoga:yg_flex="1"
             />
         <View
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@color/yoga_blue"
-            app:yg_aspectRatio="1"
+            yoga:yg_aspectRatio="1"
             />
       </VirtualYogaLayout>
     </VirtualYogaLayout>

android/sample/res/layout/benchmark_layout_2_linear.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:yoga="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="60dp"
     android:orientation="vertical"

android/sample/res/layout/benchmark_layout_3.xml

@@ -1,192 +1,192 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <YogaLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:yoga="http://schemas.android.com/apk/res-auto"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    app:yg_alignItems="center"
-    app:yg_flexDirection="row"
-    app:yg_justifyContent="center"
+    yoga:yg_alignItems="center"
+    yoga:yg_flexDirection="row"
+    yoga:yg_justifyContent="center"
     >
   <TextView
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:background="@color/yoga_blue"
-      app:yg_marginLeft="10dp"
+      yoga:yg_marginLeft="10dp"
       />
   <VirtualYogaLayout
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
-      app:yg_flexDirection="column"
-      app:yg_flex="1"
+      yoga:yg_flexDirection="column"
+      yoga:yg_flex="1"
       >
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@color/yoga_grey"
-        app:yg_marginLeft="10dp"
+        yoga:yg_marginLeft="10dp"
         />
     <VirtualYogaLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:yg_flexDirection="row"
-        app:yg_flex="1"
+        yoga:yg_flexDirection="row"
+        yoga:yg_flex="1"
         >
       <TextView
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
           android:background="@color/yoga_grey"
-          app:yg_marginLeft="10dp"
+          yoga:yg_marginLeft="10dp"
           />
       <VirtualYogaLayout
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          app:yg_flexDirection="row"
-          app:yg_flex="1"
+          yoga:yg_flexDirection="row"
+          yoga:yg_flex="1"
           >
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:background="@color/yoga_blue"
-            app:yg_marginLeft="10dp"
+            yoga:yg_marginLeft="10dp"
             />
         <VirtualYogaLayout
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:yg_flexDirection="row"
-            app:yg_flex="1"
+            yoga:yg_flexDirection="row"
+            yoga:yg_flex="1"
             >
           <TextView
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
               android:background="@color/yoga_grey"
-              app:yg_marginLeft="10dp"
+              yoga:yg_marginLeft="10dp"
               />
           <VirtualYogaLayout
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              app:yg_flexDirection="row"
-              app:yg_flex="1"
+              yoga:yg_flexDirection="row"
+              yoga:yg_flex="1"
               >
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:background="@color/yoga_grey"
-                app:yg_marginLeft="10dp"
+                yoga:yg_marginLeft="10dp"
                 />
             <VirtualYogaLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                app:yg_flexDirection="column"
-                app:yg_flex="1"
+                yoga:yg_flexDirection="column"
+                yoga:yg_flex="1"
                 >
               <TextView
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:background="@color/yoga_blue"
-                  app:yg_marginLeft="10dp"
+                  yoga:yg_marginLeft="10dp"
                   />
               <VirtualYogaLayout
                   android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
-                  app:yg_flexDirection="row"
-                  app:yg_flex="1"
+                  yoga:yg_flexDirection="row"
+                  yoga:yg_flex="1"
                   >
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:background="@color/yoga_grey"
-                    app:yg_marginLeft="10dp"
+                    yoga:yg_marginLeft="10dp"
                     />
                 <VirtualYogaLayout
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    app:yg_flexDirection="row"
-                    app:yg_flex="1"
+                    yoga:yg_flexDirection="row"
+                    yoga:yg_flex="1"
                     >
                   <TextView
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
                       android:background="@color/yoga_grey"
-                      app:yg_marginLeft="10dp"
+                      yoga:yg_marginLeft="10dp"
                       />
                   <VirtualYogaLayout
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"
-                      app:yg_flexDirection="row"
-                      app:yg_flex="1"
+                      yoga:yg_flexDirection="row"
+                      yoga:yg_flex="1"
                       >
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:background="@color/yoga_blue"
-                        app:yg_marginLeft="10dp"
+                        yoga:yg_marginLeft="10dp"
                         />
                     <VirtualYogaLayout
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        app:yg_flexDirection="row"
-                        app:yg_flex="1"
+                        yoga:yg_flexDirection="row"
+                        yoga:yg_flex="1"
                         >
                       <TextView
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:background="@color/yoga_grey"
-                          app:yg_marginLeft="10dp"
+                          yoga:yg_marginLeft="10dp"
                           />
                       <VirtualYogaLayout
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          app:yg_flexDirection="column"
-                          app:yg_flex="1"
+                          yoga:yg_flexDirection="column"
+                          yoga:yg_flex="1"
                           >
                         <TextView
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:background="@color/yoga_grey"
-                            app:yg_marginLeft="10dp"
+                            yoga:yg_marginLeft="10dp"
                             />
                         <VirtualYogaLayout
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            app:yg_flexDirection="row"
-                            app:yg_flex="1"
+                            yoga:yg_flexDirection="row"
+                            yoga:yg_flex="1"
                             >
                           <TextView
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
                               android:background="@color/yoga_blue"
-                              app:yg_marginLeft="10dp"
+                              yoga:yg_marginLeft="10dp"
                               />
                           <VirtualYogaLayout
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
-                              app:yg_flexDirection="row"
-                              app:yg_flex="1"
+                              yoga:yg_flexDirection="row"
+                              yoga:yg_flex="1"
                               >
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:background="@color/yoga_grey"
-                                app:yg_marginLeft="10dp"
+                                yoga:yg_marginLeft="10dp"
                                 />
                             <VirtualYogaLayout
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
-                                app:yg_flexDirection="row"
-                                app:yg_flex="1"
+                                yoga:yg_flexDirection="row"
+                                yoga:yg_flex="1"
                                 >
                               <TextView
                                   android:layout_width="wrap_content"
                                   android:layout_height="wrap_content"
                                   android:background="@color/yoga_grey"
-                                  app:yg_marginLeft="10dp"
+                                  yoga:yg_marginLeft="10dp"
                                   />
                               <VirtualYogaLayout
                                   android:layout_width="wrap_content"
                                   android:layout_height="wrap_content"
-                                  app:yg_flexDirection="row"
-                                  app:yg_flex="1"
+                                  yoga:yg_flexDirection="row"
+                                  yoga:yg_flex="1"
                                   >
                               </VirtualYogaLayout>
                             </VirtualYogaLayout>

android/sample/res/layout/benchmark_select_layout.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8" ?>
-<androidx.viewpager.widget.ViewPager
+<android.support.v4.view.ViewPager
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/viewpager"
         android:layout_width="match_parent"

android/sample/res/layout/main_layout.xml

@@ -10,7 +10,7 @@
 
 <YogaLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:yoga="http://schemas.android.com/apk/res/com.facebook.samples.yoga"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     >
@@ -18,120 +18,120 @@
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      app:yg_marginHorizontal="10dp"
-      app:yg_marginTop="5dp"
-      app:yg_flexDirection="row"
-      app:yg_alignItems="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        app:yg_flex="0"
+        yoga:yg_flex="0"
         />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_1_text"
         android:textColor="@color/children_text"
-        app:yg_flex="1"
-        app:yg_marginStart="8dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="8dp"
         />
   </YogaLayout>
   <YogaLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      app:yg_marginHorizontal="10dp"
-      app:yg_marginTop="5dp"
-      app:yg_flexDirection="row"
-      app:yg_alignItems="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        app:yg_flex="0"
+        yoga:yg_flex="0"
         />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_2_text"
         android:textColor="@color/children_text"
-        app:yg_flex="1"
-        app:yg_marginStart="8dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="8dp"
         />
   </YogaLayout>
   <YogaLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      app:yg_marginHorizontal="10dp"
-      app:yg_marginTop="5dp"
-      app:yg_flexDirection="row"
-      app:yg_alignItems="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        app:yg_flex="0"
+        yoga:yg_flex="0"
         />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_3_text"
         android:textColor="@color/children_text"
-        app:yg_flex="1"
-        app:yg_marginStart="8dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="8dp"
         />
   </YogaLayout>
   <YogaLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      app:yg_marginHorizontal="10dp"
-      app:yg_marginTop="5dp"
-      app:yg_flexDirection="row"
-      app:yg_alignItems="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        app:yg_flex="0"
+        yoga:yg_flex="0"
         />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_4_text"
         android:textColor="@color/children_text"
-        app:yg_flex="1"
-        app:yg_marginStart="8dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="8dp"
         />
   </YogaLayout>
   <YogaLayout
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
       android:background="@drawable/sample_children_background"
-      app:yg_marginHorizontal="10dp"
-      app:yg_marginTop="5dp"
-      app:yg_flexDirection="row"
-      app:yg_alignItems="center"
+      yoga:yg_marginHorizontal="10dp"
+      yoga:yg_marginTop="5dp"
+      yoga:yg_flexDirection="row"
+      yoga:yg_alignItems="center"
       >
     <ImageView
         android:layout_width="50dp"
         android:layout_height="50dp"
         android:src="@drawable/ic_launcher"
-        app:yg_flex="0"
+        yoga:yg_flex="0"
     />
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="@string/child_5_text"
         android:textColor="@color/children_text"
-        app:yg_flex="1"
-        app:yg_marginStart="10dp"
+        yoga:yg_flex="1"
+        yoga:yg_marginStart="10dp"
         />
   </YogaLayout>
 </YogaLayout>

android/sample/res/menu/action_bar_benchmark.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  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.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+  <item
+      android:id="@+id/action_home"
+      android:title="Home"
+      android:showAsAction="always"
+      />
+</menu>

android/sample/res/menu/action_bar_home.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  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.
+-->
+
+<menu
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    >
+  <item
+      android:id="@+id/action_benchmark"
+      android:title="Benchmark"
+      android:showAsAction="always"
+      />
+</menu>

android/sample/res/values/strings.xml

@@ -30,6 +30,4 @@
       name="child_5_text"
       description="Placeholder text for the fifth element in the layout"
       >Who are you?</string>
-  <string name="home">Home</string>
-  <string name="benchmark">Benchmark</string>
 </resources>

android/src/main/AndroidManifest.xml

@@ -7,7 +7,16 @@
   LICENSE file in the root directory of this source tree.
 -->
 
-<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+<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"
+    />
 
   <application/>
 

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

@@ -0,0 +1,22 @@
+# 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"]),
+    autoglob = False,
+    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) Meta Platforms, Inc. and affiliates.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * 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.

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

@@ -130,14 +130,8 @@
     <attr name="yg_positionAll" format="dimension|string"/>
 
     <attr name="yg_positionType" format="enum">
-      <!-- "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"/>
+      <enum name="relative" value="0"/>
+      <enum name="absolute" value="1"/>
     </attr>
 
     <attr name="yg_width" format="dimension|string"/>

benchmark/BUCK

@@ -0,0 +1,24 @@
+# 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"),
+    ],
+)