[bugfix] rm duplication process dimension

.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/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

.swift-version

@@ -0,0 +1 @@
+4.0

.travis.yml

@@ -0,0 +1,76 @@
+language: java
+os: linux
+addons:
+  apt:
+    sources:
+      - llvm-toolchain-trusty-6.0
+      - ubuntu-toolchain-r-test
+    packages:
+      - clang-6.0
+
+env:
+  - TARGET: website
+  - TARGET: android
+
+install:
+- cd website
+- yarn --ignore-scripts
+- cd ..
+
+cache:
+  directories:
+    - $HOME/buck
+    - $HOME/.gradle
+
+before_install:
+  - |
+    if [[ -n "$encrypted_d27e803291ff_iv" ]]; then
+      openssl aes-256-cbc -K $encrypted_d27e803291ff_key -iv $encrypted_d27e803291ff_iv -in scripts/setup-keys.enc -d >> gradle.properties;
+    fi
+  # Android
+  - |
+    if [[ $TARGET = "android" ]]; then
+      pushd $HOME
+      git clone --depth 1 https://github.com/facebook/buck.git
+      cd buck
+      ant
+      popd
+      export PATH=$PATH:$HOME/buck/bin/
+      buck --version
+      export TERMINAL=dumb
+      source scripts/android-setup.sh && installAndroidSDK
+      export ANDROID_SDK=$ANDROID_HOME
+      export ANDROID_NDK_REPOSITORY=$HOME/android-ndk
+      export ANDROID_NDK_HOME=$ANDROID_NDK_REPOSITORY/android-ndk-r15c
+    fi
+  # Website
+  - |
+    if [[ $TARGET = "website" ]]; then
+      nvm install 8
+      nvm use 8
+    fi
+
+script:
+  - |
+    if [[ $TARGET = "android" ]]; then
+      ./gradlew testDebugUnit && scripts/publish-snapshot.sh
+    fi
+  - |
+    if [[ $TARGET = "website" ]]; then
+      pushd website
+      yarn build
+      popd
+    fi
+
+deploy:
+  provider: pages
+  skip-cleanup: true
+  github-token: $GITHUB_TOKEN
+  fqdn: yogalayout.com
+  local-dir: website/public
+  email: yogabot@fb.com
+  name: Yoga-bot
+  keep-history: true
+  on:
+    branch: master
+    condition: $TARGET = website

.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,57 @@
+# 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", "subdir_glob", "yoga_cxx_library", "yoga_cxx_test", "yoga_dep")
+
+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_cxx_library(
+    name = "yoga",
+    srcs = glob(["yoga/**/*.cpp"]),
+    header_namespace = "",
+    exported_headers = subdir_glob([("", "yoga/**/*.h")]),
+    compiler_flags = LIBRARY_COMPILER_FLAGS,
+    soname = "libyogacore.$(ext)",
+    tests = [":YogaTests"],
+    visibility = ["PUBLIC"],
+    deps = [
+        yoga_dep("lib/fb:ndklog"),
+    ],
+)
+
+yoga_cxx_library(
+    name = "yogaForDebug",
+    srcs = glob(["yoga/**/*.cpp"]),
+    header_namespace = "",
+    exported_headers = subdir_glob([("", "yoga/**/*.h")]),
+    compiler_flags = TEST_COMPILER_FLAGS,
+    soname = "libyogacore.$(ext)",
+    tests = [":YogaTests"],
+    visibility = ["PUBLIC"],
+    deps = [
+        yoga_dep("lib/fb:ndklog"),
+    ],
+)
+
+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,16 @@
-# 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.4.1)
 
-cmake_minimum_required(VERSION 3.13...3.26)
-project(yoga-all)
 set(CMAKE_VERBOSE_MAKEFILE on)
 
-include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/project-defaults.cmake)
+file(GLOB yogacore_SRC yoga/*.cpp)
+add_library(yogacore STATIC ${yogacore_SRC})
 
-add_subdirectory(yoga)
+target_link_libraries(yogacore android log)
-add_subdirectory(tests)
+set_target_properties(yogacore PROPERTIES CXX_STANDARD 11)
-
-# cmake install config
-include(GNUInstallDirs)
-include(CMakePackageConfigHelpers)
-
-# declare target to install
-install(TARGETS yogacore EXPORT yoga-targets
-    LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
-    INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-)
-
-# install header files
-install(DIRECTORY
-    "${CMAKE_CURRENT_LIST_DIR}/yoga"
-    DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
-    FILES_MATCHING PATTERN "*.h"
-)
-
-# install target config
-install(EXPORT yoga-targets
-    FILE yogaTargets.cmake
-    NAMESPACE yoga::
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/yoga
-)
-
-
-# generate config file
-configure_package_config_file(
-    ${CMAKE_CURRENT_SOURCE_DIR}/cmake/yoga-config.cmake.in
-    ${CMAKE_CURRENT_BINARY_DIR}/yogaConfig.cmake
-    INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/yoga
-)
-
-# install config file
-install(FILES
-    ${CMAKE_CURRENT_BINARY_DIR}/yogaConfig.cmake
-    DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/yoga
-)

CODE_OF_CONDUCT.md

@@ -1,76 +1,3 @@
 # Code of Conduct
 
-## Our Pledge
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies within all project spaces, and it also applies when
-an individual is representing the project or its community in public spaces.
-Examples of representing a project or community include using an official
-project e-mail address, posting via an official social media account, or acting
-as an appointed representative at an online or offline event. Representation of
-a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at <opensource-conduct@fb.com>. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-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 [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![bintray](https://img.shields.io/bintray/v/facebook/maven/com.facebook.yoga:yoga.svg)](https://bintray.com/facebook/maven/com.facebook.yoga%3Ayoga/_latestVersion) [![NuGet](https://img.shields.io/nuget/v/Facebook.Yoga.svg)](https://www.nuget.org/packages/Facebook.Yoga)
-
-Yoga is an embeddable and performant flexbox layout engine with bindings for multiple languages.
-
 
 ## 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
+## Testing
-./unit_tests <Debug|Release>
+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.
+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.
-
-
-
-## Adding Tests
-
-Many of Yoga's tests are automatically generated, using HTML fixtures describing node structure. These are rendered in Chrome to generate an expected layout result for the tree. New fixtures can be added to `gentest/fixtures`.
 
 ```html
 <div id="my_test" style="width: 100px; height: 100px; align-items: center;">
@@ -26,11 +16,33 @@ Many of Yoga's tests are automatically generated, using HTML fixtures describing
 </div>
 ```
 
-To generate new tests from added fixtures:
+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.
-1. Run `bundle install` in the `gentest` directory to install dependencies of the test generator.
-2. Run `ruby gentest.rb` in the `gentest` directory.
 
+You may need to install the latest watir-webdriver gem (`gem install watir-webdriver`) and [ChromeDriver](https://sites.google.com/a/chromium.org/chromedriver/) to run `gentest/gentest.rb` Ruby script.
 
-## 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,25 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
-# This source code is licensed under the MIT license found in the
+#  Copyright (c) Facebook, Inc. and its affiliates.
-# LICENSE file in the root directory of this source tree.
+#
-
+#  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.0'
+  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.platforms = { :ios => "8.0", :osx => "10.7", :tvos => "10.0", :watchos => "2.0" }
-  spec.ios.deployment_target = "13.4"
-
   spec.module_name = 'yoga'
   spec.requires_arc = false
   spec.pod_target_xcconfig = {
@@ -31,11 +30,10 @@ Pod::Spec.new do |spec|
       '-fexceptions',
       '-Wall',
       '-Werror',
-      '-Wextra',
+      '-std=c++1y',
-      '-std=c++14',
       '-fPIC'
   ]
-  spec.source_files = 'yoga/**/*.{h,cpp}'
+  spec.source_files = 'yoga/**/*.{c,h,cpp}'
   spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
-  spec.swift_version = '5.1'
+
 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,32 +1,33 @@
-# Copyright (c) Meta Platforms, Inc. and affiliates.
 #
-# This source code is licensed under the MIT license found in the
+#  Copyright (c) Facebook, Inc. and its affiliates.
-# LICENSE file in the root directory of this source tree.
+#
-
+#  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.0'
+  spec.version = '1.14.0'
   spec.license =  { :type => 'MIT', :file => "LICENSE" }
-  spec.homepage = 'https://yogalayout.com/'
+  spec.homepage = 'https://facebook.github.io/yoga/'
-  spec.documentation_url = 'https://yogalayout.com/docs'
+  spec.documentation_url = 'https://facebook.github.io/yoga/docs/'
-  spec.deprecated = true
 
-  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 => spec.version.to_s,
   }
 
-  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', '~> 1.14'
-  spec.dependency 'Yoga', "~> #{spec.version.to_s}"
   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'
-  spec.swift_version = '5.1'
+  spec.swift_version = '4.0'
 end
 
 # See https://github.com/facebook/yoga/pull/366

YogaKit/.swift-version

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

YogaKit/BUCK

@@ -0,0 +1,64 @@
+# 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/Foundation.framework",
+        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
+    ],
+    header_path_prefix = "",
+    link_whole = True,
+    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,33 +1,31 @@
 /*
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
-#import <UIKit/UIKit.h>
 #import "YGLayout.h"
+#import <UIKit/UIKit.h>
 
 NS_ASSUME_NONNULL_BEGIN
 
-typedef void (^YGLayoutConfigurationBlock)(YGLayout* layout);
+typedef void (^YGLayoutConfigurationBlock)(YGLayout *layout);
 
 @interface UIView (Yoga)
 
 /**
  The YGLayout that is attached to this view. It is lazily created.
  */
-@property(nonatomic, readonly, strong) YGLayout* yoga;
+@property (nonatomic, readonly, strong) YGLayout *yoga;
 /**
  Indicates whether or not Yoga is enabled
  */
-@property(nonatomic, readonly, assign) BOOL isYogaEnabled;
+@property (nonatomic, readonly, assign) BOOL isYogaEnabled;
 
 /**
- In ObjC land, every time you access `view.yoga.*` you are adding another
+ In ObjC land, every time you access `view.yoga.*` you are adding another `objc_msgSend`
- `objc_msgSend` to your code. If you plan on making multiple changes to
+ to your code. If you plan on making multiple changes to YGLayout, it's more performant
- YGLayout, it's more performant to use this method, which uses a single
+ to use this method, which uses a single objc_msgSend call.
- objc_msgSend call.
  */
 - (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
     NS_SWIFT_NAME(configureLayout(block:));

YogaKit/Source/UIView+Yoga.m

@@ -1,34 +1,36 @@
-/*
+/**
- * 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.
  */
 
-#import <objc/runtime.h>
 #import "UIView+Yoga.h"
 #import "YGLayout+Private.h"
+#import <objc/runtime.h>
 
-static const void* kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
+static const void *kYGYogaAssociatedKey = &kYGYogaAssociatedKey;
 
 @implementation UIView (YogaKit)
 
-- (YGLayout*)yoga {
+- (YGLayout *)yoga
-  YGLayout* yoga = objc_getAssociatedObject(self, kYGYogaAssociatedKey);
+{
+  YGLayout *yoga = objc_getAssociatedObject(self, kYGYogaAssociatedKey);
   if (!yoga) {
     yoga = [[YGLayout alloc] initWithView:self];
-    objc_setAssociatedObject(
+    objc_setAssociatedObject(self, kYGYogaAssociatedKey, yoga, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
-        self, kYGYogaAssociatedKey, yoga, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
   }
 
   return yoga;
 }
 
-- (BOOL)isYogaEnabled {
+- (BOOL)isYogaEnabled
+{
   return objc_getAssociatedObject(self, kYGYogaAssociatedKey) != nil;
 }
 
-- (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block {
+- (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
+{
   if (block != nil) {
     block(self.yoga);
   }

YogaKit/Source/YGLayout+Private.h

@@ -1,17 +1,16 @@
 /*
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
-#import <yoga/Yoga.h>
 #import "YGLayout.h"
+#import <yoga/Yoga.h>
 
 @interface YGLayout ()
 
-@property(nonatomic, assign, readonly) YGNodeRef node;
+@property (nonatomic, assign, readonly) YGNodeRef node;
 
-- (instancetype)initWithView:(UIView*)view;
+- (instancetype)initWithView:(UIView *)view;
 
 @end

YogaKit/Source/YGLayout.h

@@ -1,21 +1,20 @@
 /*
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
 #import <UIKit/UIKit.h>
 #import <yoga/YGEnums.h>
-#import <yoga/YGMacros.h>
 #import <yoga/Yoga.h>
+#import <yoga/YGMacros.h>
 
 YG_EXTERN_C_BEGIN
 
-extern YGValue YGPointValue(CGFloat value) NS_SWIFT_UNAVAILABLE(
+extern YGValue YGPointValue(CGFloat value)
-    "Use the swift Int and FloatingPoint extensions instead");
+    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
-extern YGValue YGPercentValue(CGFloat value) NS_SWIFT_UNAVAILABLE(
+extern YGValue YGPercentValue(CGFloat value)
-    "Use the swift Int and FloatingPoint extensions instead");
+    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
 
 YG_EXTERN_C_END
 
@@ -44,107 +43,103 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
   The property that decides if we should include this view when calculating
   layout. Defaults to YES.
  */
-@property(nonatomic, readwrite, assign, setter=setIncludedInLayout:)
+@property (nonatomic, readwrite, assign, setter=setIncludedInLayout:) BOOL isIncludedInLayout;
-    BOOL isIncludedInLayout;
 
 /**
- The property that decides during layout/sizing whether or not styling
+ The property that decides during layout/sizing whether or not styling properties should be applied.
- properties should be applied. Defaults to NO.
+ Defaults to NO.
  */
-@property(nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
+@property (nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;
 
-@property(nonatomic, readwrite, assign) YGDirection direction;
+@property (nonatomic, readwrite, assign) YGDirection direction;
-@property(nonatomic, readwrite, assign) YGFlexDirection flexDirection;
+@property (nonatomic, readwrite, assign) YGFlexDirection flexDirection;
-@property(nonatomic, readwrite, assign) YGJustify justifyContent;
+@property (nonatomic, readwrite, assign) YGJustify justifyContent;
-@property(nonatomic, readwrite, assign) YGAlign alignContent;
+@property (nonatomic, readwrite, assign) YGAlign alignContent;
-@property(nonatomic, readwrite, assign) YGAlign alignItems;
+@property (nonatomic, readwrite, assign) YGAlign alignItems;
-@property(nonatomic, readwrite, assign) YGAlign alignSelf;
+@property (nonatomic, readwrite, assign) YGAlign alignSelf;
-@property(nonatomic, readwrite, assign) YGPositionType position;
+@property (nonatomic, readwrite, assign) YGPositionType position;
-@property(nonatomic, readwrite, assign) YGWrap flexWrap;
+@property (nonatomic, readwrite, assign) YGWrap flexWrap;
-@property(nonatomic, readwrite, assign) YGOverflow overflow;
+@property (nonatomic, readwrite, assign) YGOverflow overflow;
-@property(nonatomic, readwrite, assign) YGDisplay display;
+@property (nonatomic, readwrite, assign) YGDisplay display;
 
-@property(nonatomic, readwrite, assign) CGFloat flex;
+@property (nonatomic, readwrite, assign) CGFloat flex;
-@property(nonatomic, readwrite, assign) CGFloat flexGrow;
+@property (nonatomic, readwrite, assign) CGFloat flexGrow;
-@property(nonatomic, readwrite, assign) CGFloat flexShrink;
+@property (nonatomic, readwrite, assign) CGFloat flexShrink;
-@property(nonatomic, readwrite, assign) YGValue flexBasis;
+@property (nonatomic, readwrite, assign) YGValue flexBasis;
 
-@property(nonatomic, readwrite, assign) YGValue left;
+@property (nonatomic, readwrite, assign) YGValue left;
-@property(nonatomic, readwrite, assign) YGValue top;
+@property (nonatomic, readwrite, assign) YGValue top;
-@property(nonatomic, readwrite, assign) YGValue right;
+@property (nonatomic, readwrite, assign) YGValue right;
-@property(nonatomic, readwrite, assign) YGValue bottom;
+@property (nonatomic, readwrite, assign) YGValue bottom;
-@property(nonatomic, readwrite, assign) YGValue start;
+@property (nonatomic, readwrite, assign) YGValue start;
-@property(nonatomic, readwrite, assign) YGValue end;
+@property (nonatomic, readwrite, assign) YGValue end;
 
-@property(nonatomic, readwrite, assign) YGValue marginLeft;
+@property (nonatomic, readwrite, assign) YGValue marginLeft;
-@property(nonatomic, readwrite, assign) YGValue marginTop;
+@property (nonatomic, readwrite, assign) YGValue marginTop;
-@property(nonatomic, readwrite, assign) YGValue marginRight;
+@property (nonatomic, readwrite, assign) YGValue marginRight;
-@property(nonatomic, readwrite, assign) YGValue marginBottom;
+@property (nonatomic, readwrite, assign) YGValue marginBottom;
-@property(nonatomic, readwrite, assign) YGValue marginStart;
+@property (nonatomic, readwrite, assign) YGValue marginStart;
-@property(nonatomic, readwrite, assign) YGValue marginEnd;
+@property (nonatomic, readwrite, assign) YGValue marginEnd;
-@property(nonatomic, readwrite, assign) YGValue marginHorizontal;
+@property (nonatomic, readwrite, assign) YGValue marginHorizontal;
-@property(nonatomic, readwrite, assign) YGValue marginVertical;
+@property (nonatomic, readwrite, assign) YGValue marginVertical;
-@property(nonatomic, readwrite, assign) YGValue margin;
+@property (nonatomic, readwrite, assign) YGValue margin;
 
-@property(nonatomic, readwrite, assign) YGValue paddingLeft;
+@property (nonatomic, readwrite, assign) YGValue paddingLeft;
-@property(nonatomic, readwrite, assign) YGValue paddingTop;
+@property (nonatomic, readwrite, assign) YGValue paddingTop;
-@property(nonatomic, readwrite, assign) YGValue paddingRight;
+@property (nonatomic, readwrite, assign) YGValue paddingRight;
-@property(nonatomic, readwrite, assign) YGValue paddingBottom;
+@property (nonatomic, readwrite, assign) YGValue paddingBottom;
-@property(nonatomic, readwrite, assign) YGValue paddingStart;
+@property (nonatomic, readwrite, assign) YGValue paddingStart;
-@property(nonatomic, readwrite, assign) YGValue paddingEnd;
+@property (nonatomic, readwrite, assign) YGValue paddingEnd;
-@property(nonatomic, readwrite, assign) YGValue paddingHorizontal;
+@property (nonatomic, readwrite, assign) YGValue paddingHorizontal;
-@property(nonatomic, readwrite, assign) YGValue paddingVertical;
+@property (nonatomic, readwrite, assign) YGValue paddingVertical;
-@property(nonatomic, readwrite, assign) YGValue padding;
+@property (nonatomic, readwrite, assign) YGValue padding;
 
-@property(nonatomic, readwrite, assign) CGFloat borderLeftWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderLeftWidth;
-@property(nonatomic, readwrite, assign) CGFloat borderTopWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderTopWidth;
-@property(nonatomic, readwrite, assign) CGFloat borderRightWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderRightWidth;
-@property(nonatomic, readwrite, assign) CGFloat borderBottomWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderBottomWidth;
-@property(nonatomic, readwrite, assign) CGFloat borderStartWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderStartWidth;
-@property(nonatomic, readwrite, assign) CGFloat borderEndWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderEndWidth;
-@property(nonatomic, readwrite, assign) CGFloat borderWidth;
+@property (nonatomic, readwrite, assign) CGFloat borderWidth;
 
-@property(nonatomic, readwrite, assign) YGValue width;
+@property (nonatomic, readwrite, assign) YGValue width;
-@property(nonatomic, readwrite, assign) YGValue height;
+@property (nonatomic, readwrite, assign) YGValue height;
-@property(nonatomic, readwrite, assign) YGValue minWidth;
+@property (nonatomic, readwrite, assign) YGValue minWidth;
-@property(nonatomic, readwrite, assign) YGValue minHeight;
+@property (nonatomic, readwrite, assign) YGValue minHeight;
-@property(nonatomic, readwrite, assign) YGValue maxWidth;
+@property (nonatomic, readwrite, assign) YGValue maxWidth;
-@property(nonatomic, readwrite, assign) YGValue maxHeight;
+@property (nonatomic, readwrite, assign) YGValue maxHeight;
 
 // Yoga specific properties, not compatible with flexbox specification
-@property(nonatomic, readwrite, assign) CGFloat aspectRatio;
+@property (nonatomic, readwrite, assign) CGFloat aspectRatio;
 
 /**
  Get the resolved direction of this node. This won't be YGDirectionInherit
  */
-@property(nonatomic, readonly, assign) YGDirection resolvedDirection;
+@property (nonatomic, readonly, assign) YGDirection resolvedDirection;
 
 /**
- Perform a layout calculation and update the frames of the views in the
+ Perform a layout calculation and update the frames of the views in the hierarchy with the results.
- hierarchy with the results. If the origin is not preserved, the root view's
+ If the origin is not preserved, the root view's layout results will applied from {0,0}.
- layout results will applied from {0,0}.
  */
 - (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
     NS_SWIFT_NAME(applyLayout(preservingOrigin:));
 
 /**
- Perform a layout calculation and update the frames of the views in the
+ Perform a layout calculation and update the frames of the views in the hierarchy with the results.
- hierarchy with the results. If the origin is not preserved, the root view's
+ If the origin is not preserved, the root view's layout results will applied from {0,0}.
- layout results will applied from {0,0}.
  */
 - (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
                dimensionFlexibility:(YGDimensionFlexibility)dimensionFlexibility
     NS_SWIFT_NAME(applyLayout(preservingOrigin:dimensionFlexibility:));
 
 /**
- Returns the size of the view if no constraints were given. This could
+ Returns the size of the view if no constraints were given. This could equivalent to calling [self
- equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+ sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
  */
-@property(nonatomic, readonly, assign) CGSize intrinsicSize;
+@property (nonatomic, readonly, assign) CGSize intrinsicSize;
 
 /**
-  Returns the size of the view based on provided constraints. Pass NaN for an
+  Returns the size of the view based on provided constraints. Pass NaN for an unconstrained dimension.
-  unconstrained dimension.
  */
 - (CGSize)calculateLayoutWithSize:(CGSize)size
     NS_SWIFT_NAME(calculateLayout(with:));
@@ -152,19 +147,19 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
 /**
  Returns the number of children that are using Flexbox.
  */
-@property(nonatomic, readonly, assign) NSUInteger numberOfChildren;
+@property (nonatomic, readonly, assign) NSUInteger numberOfChildren;
 
 /**
- Return a BOOL indiciating whether or not we this node contains any subviews
+ Return a BOOL indiciating whether or not we this node contains any subviews that are included in
- that are included in Yoga's layout.
+ Yoga's layout.
  */
-@property(nonatomic, readonly, assign) BOOL isLeaf;
+@property (nonatomic, readonly, assign) BOOL isLeaf;
 
 /**
  Return's a BOOL indicating if a view is dirty. When a node is dirty
  it usually indicates that it will be remeasured on the next layout pass.
  */
-@property(nonatomic, readonly, assign) BOOL isDirty;
+@property (nonatomic, readonly, assign) BOOL isDirty;
 
 /**
  Mark that a view's layout needs to be recalculated. Only works for leaf views.

YogaKit/Source/YGLayout.m

@@ -1,189 +1,157 @@
-/*
+/**
- * 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.
  */
 
-#import "UIView+Yoga.h"
 #import "YGLayout+Private.h"
+#import "UIView+Yoga.h"
 
-#define YG_PROPERTY(type, lowercased_name, capitalized_name)      \
+#define YG_PROPERTY(type, lowercased_name, capitalized_name)    \
-  -(type)lowercased_name {                                        \
+- (type)lowercased_name                                         \
-    return YGNodeStyleGet##capitalized_name(self.node);           \
+{                                                               \
-  }                                                               \
+  return YGNodeStyleGet##capitalized_name(self.node);           \
-                                                                  \
+}                                                               \
-  -(void)set##capitalized_name : (type)lowercased_name {          \
+                                                                \
-    YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
+- (void)set##capitalized_name:(type)lowercased_name             \
-  }
+{                                                               \
-
+  YGNodeStyleSet##capitalized_name(self.node, lowercased_name); \
-#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)                \
-  -(YGValue)lowercased_name {                                               \
-    return YGNodeStyleGet##capitalized_name(self.node);                     \
-  }                                                                         \
-                                                                            \
-  -(void)set##capitalized_name : (YGValue)lowercased_name {                 \
-    switch (lowercased_name.unit) {                                         \
-      case YGUnitUndefined:                                                 \
-        YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value); \
-        break;                                                              \
-      case YGUnitPoint:                                                     \
-        YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value); \
-        break;                                                              \
-      case YGUnitPercent:                                                   \
-        YGNodeStyleSet##capitalized_name##Percent(                          \
-            self.node, lowercased_name.value);                              \
-        break;                                                              \
-      default:                                                              \
-        NSAssert(NO, @"Not implemented");                                   \
-    }                                                                       \
-  }
-
-#define YG_AUTO_VALUE_PROPERTY(lowercased_name, capitalized_name)           \
-  -(YGValue)lowercased_name {                                               \
-    return YGNodeStyleGet##capitalized_name(self.node);                     \
-  }                                                                         \
-                                                                            \
-  -(void)set##capitalized_name : (YGValue)lowercased_name {                 \
-    switch (lowercased_name.unit) {                                         \
-      case YGUnitPoint:                                                     \
-        YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value); \
-        break;                                                              \
-      case YGUnitPercent:                                                   \
-        YGNodeStyleSet##capitalized_name##Percent(                          \
-            self.node, lowercased_name.value);                              \
-        break;                                                              \
-      case YGUnitAuto:                                                      \
-        YGNodeStyleSet##capitalized_name##Auto(self.node);                  \
-        break;                                                              \
-      default:                                                              \
-        NSAssert(NO, @"Not implemented");                                   \
-    }                                                                       \
-  }
-
-#define YG_EDGE_PROPERTY_GETTER(                             \
-    type, lowercased_name, capitalized_name, property, edge) \
-  -(type)lowercased_name {                                   \
-    return YGNodeStyleGet##property(self.node, edge);        \
-  }
-
-#define YG_EDGE_PROPERTY_SETTER(                                \
-    lowercased_name, capitalized_name, property, edge)          \
-  -(void)set##capitalized_name : (CGFloat)lowercased_name {     \
-    YGNodeStyleSet##property(self.node, edge, lowercased_name); \
-  }
-
-#define YG_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge) \
-  YG_EDGE_PROPERTY_GETTER(                                                  \
-      CGFloat, lowercased_name, capitalized_name, property, edge)           \
-  YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
-
-#define YG_VALUE_EDGE_PROPERTY_SETTER(                                       \
-    objc_lowercased_name, objc_capitalized_name, c_name, edge)               \
-  -(void)set##objc_capitalized_name : (YGValue)objc_lowercased_name {        \
-    switch (objc_lowercased_name.unit) {                                     \
-      case YGUnitUndefined:                                                  \
-        YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name.value); \
-        break;                                                               \
-      case YGUnitPoint:                                                      \
-        YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name.value); \
-        break;                                                               \
-      case YGUnitPercent:                                                    \
-        YGNodeStyleSet##c_name##Percent(                                     \
-            self.node, edge, objc_lowercased_name.value);                    \
-        break;                                                               \
-      default:                                                               \
-        NSAssert(NO, @"Not implemented");                                    \
-    }                                                                        \
-  }
-
-#define YG_VALUE_EDGE_PROPERTY(                                   \
-    lowercased_name, capitalized_name, property, edge)            \
-  YG_EDGE_PROPERTY_GETTER(                                        \
-      YGValue, lowercased_name, capitalized_name, property, edge) \
-  YG_VALUE_EDGE_PROPERTY_SETTER(                                  \
-      lowercased_name, capitalized_name, property, edge)
-
-#define YG_VALUE_EDGES_PROPERTIES(lowercased_name, capitalized_name) \
-  YG_VALUE_EDGE_PROPERTY(                                            \
-      lowercased_name##Left,                                         \
-      capitalized_name##Left,                                        \
-      capitalized_name,                                              \
-      YGEdgeLeft)                                                    \
-  YG_VALUE_EDGE_PROPERTY(                                            \
-      lowercased_name##Top,                                          \
-      capitalized_name##Top,                                         \
-      capitalized_name,                                              \
-      YGEdgeTop)                                                     \
-  YG_VALUE_EDGE_PROPERTY(                                            \
-      lowercased_name##Right,                                        \
-      capitalized_name##Right,                                       \
-      capitalized_name,                                              \
-      YGEdgeRight)                                                   \
-  YG_VALUE_EDGE_PROPERTY(                                            \
-      lowercased_name##Bottom,                                       \
-      capitalized_name##Bottom,                                      \
-      capitalized_name,                                              \
-      YGEdgeBottom)                                                  \
-  YG_VALUE_EDGE_PROPERTY(                                            \
-      lowercased_name##Start,                                        \
-      capitalized_name##Start,                                       \
-      capitalized_name,                                              \
-      YGEdgeStart)                                                   \
-  YG_VALUE_EDGE_PROPERTY(                                            \
-      lowercased_name##End,                                          \
-      capitalized_name##End,                                         \
-      capitalized_name,                                              \
-      YGEdgeEnd)                                                     \
-  YG_VALUE_EDGE_PROPERTY(                                            \
-      lowercased_name##Horizontal,                                   \
-      capitalized_name##Horizontal,                                  \
-      capitalized_name,                                              \
-      YGEdgeHorizontal)                                              \
-  YG_VALUE_EDGE_PROPERTY(                                            \
-      lowercased_name##Vertical,                                     \
-      capitalized_name##Vertical,                                    \
-      capitalized_name,                                              \
-      YGEdgeVertical)                                                \
-  YG_VALUE_EDGE_PROPERTY(                                            \
-      lowercased_name, capitalized_name, capitalized_name, YGEdgeAll)
-
-YGValue YGPointValue(CGFloat value) {
-  return (YGValue){.value = value, .unit = YGUnitPoint};
 }
 
-YGValue YGPercentValue(CGFloat value) {
+#define YG_VALUE_PROPERTY(lowercased_name, capitalized_name)                       \
-  return (YGValue){.value = value, .unit = YGUnitPercent};
+- (YGValue)lowercased_name                                                         \
+{                                                                                  \
+  return YGNodeStyleGet##capitalized_name(self.node);                              \
+}                                                                                  \
+                                                                                   \
+- (void)set##capitalized_name:(YGValue)lowercased_name                             \
+{                                                                                  \
+  switch (lowercased_name.unit) {                                                  \
+     case YGUnitUndefined:                                                         \
+      YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value);          \
+      break;                                                                       \
+    case YGUnitPoint:                                                              \
+      YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value);          \
+      break;                                                                       \
+    case YGUnitPercent:                                                            \
+      YGNodeStyleSet##capitalized_name##Percent(self.node, lowercased_name.value); \
+      break;                                                                       \
+    default:                                                                       \
+      NSAssert(NO, @"Not implemented");                                            \
+  }                                                                                \
+}
+
+#define YG_AUTO_VALUE_PROPERTY(lowercased_name, capitalized_name)                  \
+- (YGValue)lowercased_name                                                         \
+{                                                                                  \
+  return YGNodeStyleGet##capitalized_name(self.node);                              \
+}                                                                                  \
+                                                                                   \
+- (void)set##capitalized_name:(YGValue)lowercased_name                             \
+{                                                                                  \
+  switch (lowercased_name.unit) {                                                  \
+    case YGUnitPoint:                                                              \
+      YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value);          \
+      break;                                                                       \
+    case YGUnitPercent:                                                            \
+      YGNodeStyleSet##capitalized_name##Percent(self.node, lowercased_name.value); \
+      break;                                                                       \
+    case YGUnitAuto:                                                               \
+      YGNodeStyleSet##capitalized_name##Auto(self.node);                           \
+      break;                                                                       \
+    default:                                                                       \
+      NSAssert(NO, @"Not implemented");                                            \
+  }                                                                                \
+}
+
+#define YG_EDGE_PROPERTY_GETTER(type, lowercased_name, capitalized_name, property, edge) \
+- (type)lowercased_name                                                                  \
+{                                                                                        \
+  return YGNodeStyleGet##property(self.node, edge);                                      \
+}
+
+#define YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge) \
+- (void)set##capitalized_name:(CGFloat)lowercased_name                             \
+{                                                                                  \
+  YGNodeStyleSet##property(self.node, edge, lowercased_name);                      \
+}
+
+#define YG_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge)         \
+YG_EDGE_PROPERTY_GETTER(CGFloat, lowercased_name, capitalized_name, property, edge) \
+YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
+
+#define YG_VALUE_EDGE_PROPERTY_SETTER(objc_lowercased_name, objc_capitalized_name, c_name, edge) \
+- (void)set##objc_capitalized_name:(YGValue)objc_lowercased_name                                 \
+{                                                                                                \
+  switch (objc_lowercased_name.unit) {                                                           \
+    case YGUnitUndefined:                                                                        \
+      YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name.value);                       \
+      break;                                                                                     \
+    case YGUnitPoint:                                                                            \
+      YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name.value);                       \
+      break;                                                                                     \
+    case YGUnitPercent:                                                                          \
+      YGNodeStyleSet##c_name##Percent(self.node, edge, objc_lowercased_name.value);              \
+      break;                                                                                     \
+    default:                                                                                     \
+      NSAssert(NO, @"Not implemented");                                                          \
+  }                                                                                              \
+}
+
+#define YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, property, edge)   \
+YG_EDGE_PROPERTY_GETTER(YGValue, lowercased_name, capitalized_name, property, edge) \
+YG_VALUE_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
+
+#define YG_VALUE_EDGES_PROPERTIES(lowercased_name, capitalized_name)                                                  \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Left, capitalized_name##Left, capitalized_name, YGEdgeLeft)                   \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Top, capitalized_name##Top, capitalized_name, YGEdgeTop)                      \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Right, capitalized_name##Right, capitalized_name, YGEdgeRight)                \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Bottom, capitalized_name##Bottom, capitalized_name, YGEdgeBottom)             \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Start, capitalized_name##Start, capitalized_name, YGEdgeStart)                \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##End, capitalized_name##End, capitalized_name, YGEdgeEnd)                      \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Horizontal, capitalized_name##Horizontal, capitalized_name, YGEdgeHorizontal) \
+YG_VALUE_EDGE_PROPERTY(lowercased_name##Vertical, capitalized_name##Vertical, capitalized_name, YGEdgeVertical)       \
+YG_VALUE_EDGE_PROPERTY(lowercased_name, capitalized_name, capitalized_name, YGEdgeAll)
+
+YGValue YGPointValue(CGFloat value)
+{
+  return (YGValue) { .value = value, .unit = YGUnitPoint };
+}
+
+YGValue YGPercentValue(CGFloat value)
+{
+  return (YGValue) { .value = value, .unit = YGUnitPercent };
 }
 
 static YGConfigRef globalConfig;
 
 @interface YGLayout ()
 
-@property(nonatomic, weak, readonly) UIView* view;
+@property (nonatomic, weak, readonly) UIView *view;
 @property(nonatomic, assign, readonly) BOOL isUIView;
 
 @end
 
 @implementation YGLayout
 
-@synthesize isEnabled = _isEnabled;
+@synthesize isEnabled=_isEnabled;
-@synthesize isIncludedInLayout = _isIncludedInLayout;
+@synthesize isIncludedInLayout=_isIncludedInLayout;
-@synthesize node = _node;
+@synthesize node=_node;
 
-+ (void)initialize {
++ (void)initialize
+{
   globalConfig = YGConfigNew();
-  YGConfigSetExperimentalFeatureEnabled(
+  YGConfigSetExperimentalFeatureEnabled(globalConfig, YGExperimentalFeatureWebFlexBasis, true);
-      globalConfig, YGExperimentalFeatureWebFlexBasis, true);
-  YGConfigSetErrata(globalConfig, YGErrataClassic);
   YGConfigSetPointScaleFactor(globalConfig, [UIScreen mainScreen].scale);
 }
 
-- (instancetype)initWithView:(UIView*)view {
+- (instancetype)initWithView:(UIView*)view
+{
   if (self = [super init]) {
     _view = view;
     _node = YGNodeNewWithConfig(globalConfig);
-    YGNodeSetContext(_node, (__bridge void*)view);
+    YGNodeSetContext(_node, (__bridge void *) view);
     _isEnabled = NO;
     _isIncludedInLayout = YES;
     _isUIView = [view isMemberOfClass:[UIView class]];
@@ -192,15 +160,18 @@ static YGConfigRef globalConfig;
   return self;
 }
 
-- (void)dealloc {
+- (void)dealloc
+{
   YGNodeFree(self.node);
 }
 
-- (BOOL)isDirty {
+- (BOOL)isDirty
+{
   return YGNodeIsDirty(self.node);
 }
 
-- (void)markDirty {
+- (void)markDirty
+{
   if (self.isDirty || !self.isLeaf) {
     return;
   }
@@ -209,24 +180,24 @@ static YGConfigRef globalConfig;
   // the measure function. Since we already know that this is a leaf,
   // this *should* be fine. Forgive me Hack Gods.
   const YGNodeRef node = self.node;
-  if (!YGNodeHasMeasureFunc(node)) {
+  if (YGNodeHasMeasureFunc(node)) {
     YGNodeSetMeasureFunc(node, YGMeasureView);
   }
 
   YGNodeMarkDirty(node);
 }
 
-- (NSUInteger)numberOfChildren {
+- (NSUInteger)numberOfChildren
+{
   return YGNodeGetChildCount(self.node);
 }
 
-- (BOOL)isLeaf {
+- (BOOL)isLeaf
-  NSAssert(
+{
-      [NSThread isMainThread],
+  NSAssert([NSThread isMainThread], @"This method must be called on the main thread.");
-      @"This method must be called on the main thread.");
   if (self.isEnabled) {
-    for (UIView* subview in self.view.subviews) {
+    for (UIView *subview in self.view.subviews) {
-      YGLayout* const yoga = subview.yoga;
+      YGLayout *const yoga = subview.yoga;
       if (yoga.isEnabled && yoga.isIncludedInLayout) {
         return NO;
       }
@@ -238,11 +209,13 @@ static YGConfigRef globalConfig;
 
 #pragma mark - Style
 
-- (YGPositionType)position {
+- (YGPositionType)position
+{
   return YGNodeStyleGetPositionType(self.node);
 }
 
-- (void)setPosition:(YGPositionType)position {
+- (void)setPosition:(YGPositionType)position
+{
   YGNodeStyleSetPositionType(self.node, position);
 }
 
@@ -286,29 +259,27 @@ 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 {
+- (YGDirection)resolvedDirection
+{
   return YGNodeLayoutGetDirection(self.node);
 }
 
-- (void)applyLayout {
+- (void)applyLayout
+{
   [self calculateLayoutWithSize:self.view.bounds.size];
   YGApplyLayoutToViewHierarchy(self.view, NO);
 }
 
-- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin {
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
+{
   [self calculateLayoutWithSize:self.view.bounds.size];
   YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
 }
 
-- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin dimensionFlexibility:(YGDimensionFlexibility)dimensionFlexibility
-               dimensionFlexibility:
+{
-                   (YGDimensionFlexibility)dimensionFlexibility {
   CGSize size = self.view.bounds.size;
   if (dimensionFlexibility & YGDimensionFlexibilityFlexibleWidth) {
     size.width = YGUndefined;
@@ -320,15 +291,18 @@ YG_EDGE_PROPERTY(gap, Gap, Gap, YGGutterAll)
   YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
 }
 
-- (CGSize)intrinsicSize {
+
+- (CGSize)intrinsicSize
+{
   const CGSize constrainedSize = {
-      .width = YGUndefined,
+    .width = YGUndefined,
-      .height = YGUndefined,
+    .height = YGUndefined,
   };
   return [self calculateLayoutWithSize:constrainedSize];
 }
 
-- (CGSize)calculateLayoutWithSize:(CGSize)size {
+- (CGSize)calculateLayoutWithSize:(CGSize)size
+{
   NSAssert([NSThread isMainThread], @"Yoga calculation must be done on main.");
   NSAssert(self.isEnabled, @"Yoga is not enabled for this view.");
 
@@ -336,28 +310,30 @@ YG_EDGE_PROPERTY(gap, Gap, Gap, YGGutterAll)
 
   const YGNodeRef node = self.node;
   YGNodeCalculateLayout(
-      node, size.width, size.height, YGNodeStyleGetDirection(node));
+    node,
+    size.width,
+    size.height,
+    YGNodeStyleGetDirection(node));
 
-  return (CGSize){
+  return (CGSize) {
-      .width = YGNodeLayoutGetWidth(node),
+    .width = YGNodeLayoutGetWidth(node),
-      .height = YGNodeLayoutGetHeight(node),
+    .height = YGNodeLayoutGetHeight(node),
   };
 }
 
 #pragma mark - Private
 
 static YGSize YGMeasureView(
-    YGNodeRef node,
+  YGNodeRef node,
-    float width,
+  float width,
-    YGMeasureMode widthMode,
+  YGMeasureMode widthMode,
-    float height,
+  float height,
-    YGMeasureMode heightMode) {
+  YGMeasureMode heightMode)
-  const CGFloat constrainedWidth =
+{
-      (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
+  const CGFloat constrainedWidth = (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
-  const CGFloat constrainedHeight =
+  const CGFloat constrainedHeight = (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX: height;
-      (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : height;
 
-  UIView* view = (__bridge UIView*)YGNodeGetContext(node);
+  UIView *view = (__bridge UIView*) YGNodeGetContext(node);
   CGSize sizeThatFits = CGSizeZero;
 
   // The default implementation of sizeThatFits: returns the existing size of
@@ -373,18 +349,17 @@ static YGSize YGMeasureView(
                                       }];
   }
 
-  return (YGSize){
+  return (YGSize) {
-      .width = YGSanitizeMeasurement(
+    .width = YGSanitizeMeasurement(constrainedWidth, sizeThatFits.width, widthMode),
-          constrainedWidth, sizeThatFits.width, widthMode),
+    .height = YGSanitizeMeasurement(constrainedHeight, sizeThatFits.height, heightMode),
-      .height = YGSanitizeMeasurement(
-          constrainedHeight, sizeThatFits.height, heightMode),
   };
 }
 
 static CGFloat YGSanitizeMeasurement(
-    CGFloat constrainedSize,
+  CGFloat constrainedSize,
-    CGFloat measuredSize,
+  CGFloat measuredSize,
-    YGMeasureMode measureMode) {
+  YGMeasureMode measureMode)
+{
   CGFloat result;
   if (measureMode == YGMeasureModeExactly) {
     result = constrainedSize;
@@ -397,14 +372,13 @@ static CGFloat YGSanitizeMeasurement(
   return result;
 }
 
-static BOOL YGNodeHasExactSameChildren(
+static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *subviews)
-    const YGNodeRef node,
+{
-    NSArray<UIView*>* subviews) {
   if (YGNodeGetChildCount(node) != subviews.count) {
     return NO;
   }
 
-  for (int i = 0; i < subviews.count; i++) {
+  for (int i=0; i<subviews.count; i++) {
     if (YGNodeGetChild(node, i) != subviews[i].yoga.node) {
       return NO;
     }
@@ -413,8 +387,9 @@ static BOOL YGNodeHasExactSameChildren(
   return YES;
 }
 
-static void YGAttachNodesFromViewHierachy(UIView* const view) {
+static void YGAttachNodesFromViewHierachy(UIView *const view)
-  YGLayout* const yoga = view.yoga;
+{
+  YGLayout *const yoga = view.yoga;
   const YGNodeRef node = yoga.node;
 
   // Only leaf nodes should have a measure function
@@ -424,9 +399,8 @@ static void YGAttachNodesFromViewHierachy(UIView* const view) {
   } else {
     YGNodeSetMeasureFunc(node, NULL);
 
-    NSMutableArray<UIView*>* subviewsToInclude =
+    NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
-        [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
+    for (UIView *subview in view.subviews) {
-    for (UIView* subview in view.subviews) {
       if (subview.yoga.isEnabled && subview.yoga.isIncludedInLayout) {
         [subviewsToInclude addObject:subview];
       }
@@ -434,18 +408,19 @@ static void YGAttachNodesFromViewHierachy(UIView* const view) {
 
     if (!YGNodeHasExactSameChildren(node, subviewsToInclude)) {
       YGRemoveAllChildren(node);
-      for (int i = 0; i < subviewsToInclude.count; i++) {
+      for (int i=0; i<subviewsToInclude.count; i++) {
         YGNodeInsertChild(node, subviewsToInclude[i].yoga.node, i);
       }
     }
 
-    for (UIView* const subview in subviewsToInclude) {
+    for (UIView *const subview in subviewsToInclude) {
       YGAttachNodesFromViewHierachy(subview);
     }
   }
 }
 
-static void YGRemoveAllChildren(const YGNodeRef node) {
+static void YGRemoveAllChildren(const YGNodeRef node)
+{
   if (node == NULL) {
     return;
   }
@@ -453,56 +428,52 @@ static void YGRemoveAllChildren(const YGNodeRef node) {
   YGNodeRemoveAllChildren(node);
 }
 
-static CGFloat YGRoundPixelValue(CGFloat value) {
+static CGFloat YGRoundPixelValue(CGFloat value)
+{
   static CGFloat scale;
   static dispatch_once_t onceToken;
-  dispatch_once(&onceToken, ^() {
+  dispatch_once(&onceToken, ^(){
     scale = [UIScreen mainScreen].scale;
   });
 
   return roundf(value * scale) / scale;
 }
 
-static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
+static void YGApplyLayoutToViewHierarchy(UIView *view, BOOL preserveOrigin)
-  NSCAssert(
+{
-      [NSThread isMainThread],
+  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
-      @"Framesetting should only be done on the main thread.");
 
-  const YGLayout* yoga = view.yoga;
+  const YGLayout *yoga = view.yoga;
 
   if (!yoga.isIncludedInLayout) {
-    return;
+     return;
   }
 
   YGNodeRef node = yoga.node;
   const CGPoint topLeft = {
-      YGNodeLayoutGetLeft(node),
+    YGNodeLayoutGetLeft(node),
-      YGNodeLayoutGetTop(node),
+    YGNodeLayoutGetTop(node),
   };
 
   const CGPoint bottomRight = {
-      topLeft.x + YGNodeLayoutGetWidth(node),
+    topLeft.x + YGNodeLayoutGetWidth(node),
-      topLeft.y + YGNodeLayoutGetHeight(node),
+    topLeft.y + YGNodeLayoutGetHeight(node),
   };
 
   const CGPoint origin = preserveOrigin ? view.frame.origin : CGPointZero;
-  view.frame = (CGRect){
+  view.frame = (CGRect) {
-      .origin =
+    .origin = {
-          {
+      .x = YGRoundPixelValue(topLeft.x + origin.x),
-              .x = YGRoundPixelValue(topLeft.x + origin.x),
+      .y = YGRoundPixelValue(topLeft.y + origin.y),
-              .y = YGRoundPixelValue(topLeft.y + origin.y),
+    },
-          },
+    .size = {
-      .size =
+      .width = YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x),
-          {
+      .height = YGRoundPixelValue(bottomRight.y) - YGRoundPixelValue(topLeft.y),
-              .width = YGRoundPixelValue(bottomRight.x) -
+    },
-                  YGRoundPixelValue(topLeft.x),
-              .height = YGRoundPixelValue(bottomRight.y) -
-                  YGRoundPixelValue(topLeft.y),
-          },
   };
 
   if (!yoga.isLeaf) {
-    for (NSUInteger i = 0; i < view.subviews.count; i++) {
+    for (NSUInteger i=0; i<view.subviews.count; i++) {
       YGApplyLayoutToViewHierarchy(view.subviews[i], NO);
     }
   }

YogaKit/Source/YGLayoutExtensions.swift

@@ -1,11 +1,10 @@
-/*
+/**
- * 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.
  */
 
-import yoga;
 postfix operator %
 
 extension Int {

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.
@@ -16,15 +16,17 @@
 
 @implementation YogaKitTests
 
-- (void)testConfigureLayoutIsNoOpWithNilBlock {
+- (void)testConfigureLayoutIsNoOpWithNilBlock
-  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   id block = nil;
   XCTAssertNoThrow([view configureLayoutWithBlock:block]);
 }
 
-- (void)testConfigureLayoutBlockWorksWithValidBlock {
+- (void)testConfigureLayoutBlockWorksWithValidBlock
-  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+{
-  [view configureLayoutWithBlock:^(YGLayout* layout) {
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
+  [view configureLayoutWithBlock:^(YGLayout *layout){
     XCTAssertNotNil(layout);
     layout.isEnabled = YES;
     layout.width = YGPointValue(25);
@@ -34,11 +36,12 @@
   XCTAssertEqual(view.yoga.width.value, 25);
 }
 
-- (void)testNodesAreDeallocedWithSingleView {
+- (void)testNodesAreDeallocedWithSingleView
-  __weak YGLayout* layoutRef = nil;
+{
+  __weak YGLayout *layoutRef = nil;
 
   @autoreleasepool {
-    UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
     view.yoga.flexBasis = YGPointValue(1);
 
     layoutRef = view.yoga;
@@ -50,16 +53,17 @@
   XCTAssertNil(layoutRef);
 }
 
-- (void)testNodesAreDeallocedCascade {
+- (void)testNodesAreDeallocedCascade
-  __weak YGLayout* topLayout = nil;
+{
-  __weak YGLayout* subviewLayout = nil;
+  __weak YGLayout *topLayout = nil;
+  __weak YGLayout *subviewLayout = nil;
 
   @autoreleasepool {
-    UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
     topLayout = view.yoga;
     topLayout.flexBasis = YGPointValue(1);
 
-    UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
     subviewLayout = subview.yoga;
     subviewLayout.flexBasis = YGPointValue(1);
 
@@ -70,8 +74,9 @@
   XCTAssertNil(subviewLayout);
 }
 
-- (void)testIsEnabled {
+- (void)testIsEnabled
-  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   XCTAssertFalse(view.yoga.isEnabled);
 
   view.yoga.isEnabled = YES;
@@ -81,31 +86,30 @@
   XCTAssertFalse(view.yoga.isEnabled);
 }
 
-- (void)testSizeThatFitsAsserts {
+- (void)testSizeThatFitsAsserts
-  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+{
-  dispatch_sync(
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
-      dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL),
+  dispatch_sync(dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL), ^(void){
-      ^(void) {
+    XCTAssertThrows(view.yoga.intrinsicSize);
-        XCTAssertThrows(view.yoga.intrinsicSize);
+  });
-      });
 }
 
-- (void)testSizeThatFitsSmoke {
+- (void)testSizeThatFitsSmoke
-  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
   container.yoga.alignItems = YGAlignFlexStart;
 
-  UILabel* longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
+  UILabel *longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
-  longTextLabel.text =
+  longTextLabel.text = @"This is a very very very very very very very very long piece of text.";
-      @"This is a very very very very very very very very long piece of text.";
   longTextLabel.lineBreakMode = NSLineBreakByTruncatingTail;
   longTextLabel.numberOfLines = 1;
   longTextLabel.yoga.isEnabled = YES;
   longTextLabel.yoga.flexShrink = 1;
   [container addSubview:longTextLabel];
 
-  UIView* textBadgeView = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *textBadgeView = [[UIView alloc] initWithFrame:CGRectZero];
   textBadgeView.yoga.isEnabled = YES;
   textBadgeView.yoga.margin = YGPointValue(0);
   textBadgeView.yoga.width = YGPointValue(10);
@@ -120,9 +124,7 @@
   const CGSize longTextLabelSize = longTextLabel.yoga.intrinsicSize;
 
   XCTAssertEqual(longTextLabelSize.height, containerSize.height);
-  XCTAssertEqual(
+  XCTAssertEqual(longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width, containerSize.width);
-      longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width,
-      containerSize.width);
 }
 
 - (void)testSizeThatFitsEmptyView {
@@ -134,17 +136,18 @@
   XCTAssertEqual(viewSize.width, 0);
 }
 
-- (void)testPreservingOrigin {
+- (void)testPreservingOrigin
-  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 50, 75)];
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,50,75)];
   container.yoga.isEnabled = YES;
 
-  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   view.yoga.isEnabled = YES;
   view.yoga.flexBasis = YGPointValue(0);
   view.yoga.flexGrow = 1;
   [container addSubview:view];
 
-  UIView* view2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *view2 = [[UIView alloc] initWithFrame:CGRectZero];
   view2.yoga.isEnabled = YES;
   view2.yoga.marginTop = YGPointValue(25);
   view2.yoga.flexBasis = YGPointValue(0);
@@ -158,28 +161,28 @@
   XCTAssertEqual(25, view2.frame.origin.y);
 }
 
-- (void)testContainerWithFlexibleWidthGetsCorrectlySized {
+- (void)testContainerWithFlexibleWidthGetsCorrectlySized
-  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
   container.yoga.isEnabled = YES;
 
-  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   view.yoga.isEnabled = YES;
   view.yoga.width = YGPointValue(100);
   view.yoga.height = YGPointValue(100);
   [container addSubview:view];
 
-  [container.yoga
+  [container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth];
-      applyLayoutPreservingOrigin:YES
-             dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth];
   XCTAssertEqual(100, container.frame.size.width);
   XCTAssertEqual(200, container.frame.size.height);
 }
 
-- (void)testContainerWithFlexibleHeightGetsCorrectlySized {
+- (void)testContainerWithFlexibleHeightGetsCorrectlySized
-  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
   container.yoga.isEnabled = YES;
 
-  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   view.yoga.isEnabled = YES;
   view.yoga.width = YGPointValue(100);
   view.yoga.height = YGPointValue(100);
@@ -192,11 +195,12 @@
   XCTAssertEqual(100, container.frame.size.height);
 }
 
-- (void)testContainerWithFlexibleWidthAndHeightGetsCorrectlySized {
+- (void)testContainerWithFlexibleWidthAndHeightGetsCorrectlySized
-  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0,0,200,200)];
   container.yoga.isEnabled = YES;
 
-  UIView* view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
+  UIView *view = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 100, 100)];
   view.yoga.isEnabled = YES;
   view.yoga.width = YGPointValue(100);
   view.yoga.height = YGPointValue(100);
@@ -210,11 +214,12 @@
   XCTAssertEqual(100, container.frame.size.height);
 }
 
-- (void)testMarkingDirtyOnlyWorksOnLeafNodes {
+- (void)testMarkingDirtyOnlyWorksOnLeafNodes
-  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
   container.yoga.isEnabled = YES;
 
-  UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
   subview.yoga.isEnabled = YES;
   [container addSubview:subview];
 
@@ -227,13 +232,14 @@
   XCTAssertTrue(subview.yoga.isDirty);
 }
 
-- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation {
+- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation
-  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 50)];
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 50)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
   container.yoga.alignItems = YGAlignFlexStart;
 
-  UILabel* view = [[UILabel alloc] initWithFrame:CGRectZero];
+  UILabel *view = [[UILabel alloc] initWithFrame:CGRectZero];
   view.text = @"This is a short text.";
   view.numberOfLines = 1;
   view.yoga.isEnabled = YES;
@@ -251,74 +257,61 @@
   XCTAssertFalse(CGSizeEqualToSize(view.frame.size, viewSizeAfterFirstPass));
 }
 
-- (void)testFrameAndOriginPlacement {
+- (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]
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
-      initWithFrame:CGRectMake(
-                        0, 0, containerSize.width, containerSize.height)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
   [container.yoga applyLayoutPreservingOrigin:YES];
 
-  XCTAssertEqualWithAccuracy(
+  XCTAssertEqualWithAccuracy(subview2.frame.origin.x, CGRectGetMaxX(subview1.frame), FLT_EPSILON);
-      subview2.frame.origin.x, CGRectGetMaxX(subview1.frame), FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(subview3.frame.origin.x, CGRectGetMaxX(subview2.frame), FLT_EPSILON);
-  XCTAssertEqualWithAccuracy(
-      subview3.frame.origin.x, CGRectGetMaxX(subview2.frame), FLT_EPSILON);
 
   CGFloat totalWidth = 0;
-  for (UIView* view in container.subviews) {
+  for (UIView *view in container.subviews) {
     totalWidth += view.bounds.size.width;
   }
 
-  XCTAssertEqual(
+  XCTAssertEqual(containerSize.width, totalWidth, @"The container's width is %.6f, the subviews take up %.6f", containerSize.width, totalWidth);
-      containerSize.width,
-      totalWidth,
-      @"The container's width is %.6f, the subviews take up %.6f",
-      containerSize.width,
-      totalWidth);
 }
 
-- (void)testThatLayoutIsCorrectWhenWeSwapViewOrder {
+- (void)testThatLayoutIsCorrectWhenWeSwapViewOrder
+{
   const CGSize containerSize = CGSizeMake(300, 50);
 
-  UIView* container = [[UIView alloc]
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
-      initWithFrame:CGRectMake(
-                        0, 0, containerSize.width, containerSize.height)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
@@ -340,33 +333,32 @@
   XCTAssertTrue(CGRectEqualToRect(subview2.frame, CGRectMake(100, 0, 100, 50)));
 }
 
-- (void)testThatWeRespectIncludeInLayoutFlag {
+- (void)testThatWeRespectIncludeInLayoutFlag
+{
   const CGSize containerSize = CGSizeMake(300, 50);
 
-  UIView* container = [[UIView alloc]
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
-      initWithFrame:CGRectMake(
-                        0, 0, containerSize.width, containerSize.height)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   [container addSubview:subview3];
 
   [container.yoga applyLayoutPreservingOrigin:YES];
 
-  for (UIView* subview in container.subviews) {
+  for (UIView *subview in container.subviews) {
     XCTAssertEqual(subview.bounds.size.width, 100);
   }
 
@@ -376,27 +368,27 @@
   XCTAssertEqual(subview1.bounds.size.width, 150);
   XCTAssertEqual(subview2.bounds.size.width, 150);
 
-  // We don't set the frame to zero, so, it should be set to what it was
+  // We don't set the frame to zero, so, it should be set to what it was previously at.
-  // previously at.
   XCTAssertEqual(subview3.bounds.size.width, 100);
 }
 
-- (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews {
+- (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews
-  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectZero];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.isIncludedInLayout = NO;
   [container addSubview:subview1];
 
-  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.isIncludedInLayout = NO;
   [container addSubview:subview2];
 
-  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.isIncludedInLayout = YES;
   [container addSubview:subview3];
@@ -409,22 +401,23 @@
   XCTAssertEqual(container.yoga.numberOfChildren, 2);
 }
 
-- (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond {
+- (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond
-  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+{
+  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
   container.yoga.isEnabled = YES;
   container.yoga.flexDirection = YGFlexDirectionRow;
 
-  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
   subview1.yoga.isEnabled = YES;
   subview1.yoga.flexGrow = 1;
   [container addSubview:subview1];
 
-  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
   subview2.yoga.isEnabled = YES;
   subview2.yoga.flexGrow = 1;
   [container addSubview:subview2];
 
-  UIView* subview3 = [[UIView alloc] initWithFrame:CGRectZero];
+  UIView *subview3 = [[UIView alloc] initWithFrame:CGRectZero];
   subview3.yoga.isEnabled = YES;
   subview3.yoga.flexGrow = 1;
   subview3.yoga.isIncludedInLayout = NO;
@@ -444,12 +437,13 @@
   XCTAssertEqual(subview3.bounds.size.width, 100);
 }
 
-- (void)testIsLeafFlag {
+- (void)testIsLeafFlag
-  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
   XCTAssertTrue(view.yoga.isLeaf);
 
-  for (int i = 0; i < 10; i++) {
+  for (int i=0; i<10; i++) {
-    UIView* subview = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView *subview = [[UIView alloc] initWithFrame:CGRectZero];
     [view addSubview:subview];
   }
   XCTAssertTrue(view.yoga.isLeaf);
@@ -458,95 +452,99 @@
   view.yoga.width = YGPointValue(50);
   XCTAssertTrue(view.yoga.isLeaf);
 
-  UIView* const subview = view.subviews[0];
+  UIView *const subview = view.subviews[0];
   subview.yoga.isEnabled = YES;
   subview.yoga.width = YGPointValue(50);
   XCTAssertFalse(view.yoga.isLeaf);
 }
 
-- (void)testThatWeCorrectlyAttachNestedViews {
+- (void)testThatWeCorrectlyAttachNestedViews
-  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+{
-  container.yoga.isEnabled = YES;
+    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
-  container.yoga.flexDirection = YGFlexDirectionColumn;
+    container.yoga.isEnabled = YES;
+    container.yoga.flexDirection = YGFlexDirectionColumn;
 
-  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-  subview1.yoga.isEnabled = YES;
+    subview1.yoga.isEnabled = YES;
-  subview1.yoga.width = YGPointValue(100);
+    subview1.yoga.width = YGPointValue(100);
-  subview1.yoga.flexGrow = 1;
+    subview1.yoga.flexGrow = 1;
-  subview1.yoga.flexDirection = YGFlexDirectionColumn;
+    subview1.yoga.flexDirection = YGFlexDirectionColumn;
-  [container addSubview:subview1];
+    [container addSubview:subview1];
 
-  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-  subview2.yoga.isEnabled = YES;
+    subview2.yoga.isEnabled = YES;
-  subview2.yoga.width = YGPointValue(150);
+    subview2.yoga.width = YGPointValue(150);
-  subview2.yoga.flexGrow = 1;
+    subview2.yoga.flexGrow = 1;
-  subview2.yoga.flexDirection = YGFlexDirectionColumn;
+    subview2.yoga.flexDirection = YGFlexDirectionColumn;
-  [container addSubview:subview2];
+    [container addSubview:subview2];
 
-  for (UIView* view in @[ subview1, subview2 ]) {
+    for (UIView *view in @[subview1, subview2]) {
-    UIView* someView = [[UIView alloc] initWithFrame:CGRectZero];
+        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
-    someView.yoga.isEnabled = YES;
+        someView.yoga.isEnabled = YES;
-    someView.yoga.flexGrow = 1;
+        someView.yoga.flexGrow = 1;
-    [view addSubview:someView];
+        [view addSubview:someView];
-  }
+    }
-  [container.yoga applyLayoutPreservingOrigin:YES];
+    [container.yoga applyLayoutPreservingOrigin:YES];
 
-  // Add the same amount of new views, reapply layout.
+    // Add the same amount of new views, reapply layout.
-  for (UIView* view in @[ subview1, subview2 ]) {
+    for (UIView *view in @[subview1, subview2]) {
-    UIView* someView = [[UIView alloc] initWithFrame:CGRectZero];
+        UIView *someView = [[UIView alloc] initWithFrame:CGRectZero];
-    someView.yoga.isEnabled = YES;
+        someView.yoga.isEnabled = YES;
-    someView.yoga.flexGrow = 1;
+        someView.yoga.flexGrow = 1;
-    [view addSubview:someView];
+        [view addSubview:someView];
-  }
+    }
-  [container.yoga applyLayoutPreservingOrigin:YES];
+    [container.yoga applyLayoutPreservingOrigin:YES];
 
-  XCTAssertEqual(subview1.bounds.size.width, 100);
+    XCTAssertEqual(subview1.bounds.size.width, 100);
-  XCTAssertEqual(subview1.bounds.size.height, 25);
+    XCTAssertEqual(subview1.bounds.size.height, 25);
-  for (UIView* subview in subview1.subviews) {
+    for (UIView *subview in subview1.subviews) {
-    const CGSize subviewSize = subview.bounds.size;
+        const CGSize subviewSize = subview.bounds.size;
-    XCTAssertNotEqual(subviewSize.width, 0);
+        XCTAssertNotEqual(subviewSize.width, 0);
-    XCTAssertNotEqual(subviewSize.height, 0);
+        XCTAssertNotEqual(subviewSize.height, 0);
-    XCTAssertFalse(isnan(subviewSize.height));
+        XCTAssertFalse(isnan(subviewSize.height));
-    XCTAssertFalse(isnan(subviewSize.width));
+        XCTAssertFalse(isnan(subviewSize.width));
-  }
+    }
 
-  XCTAssertEqual(subview2.bounds.size.width, 150);
+    XCTAssertEqual(subview2.bounds.size.width, 150);
-  XCTAssertEqual(subview2.bounds.size.height, 25);
+    XCTAssertEqual(subview2.bounds.size.height, 25);
-  for (UIView* subview in subview2.subviews) {
+    for (UIView *subview in subview2.subviews) {
-    const CGSize subviewSize = subview.bounds.size;
+        const CGSize subviewSize = subview.bounds.size;
-    XCTAssertNotEqual(subviewSize.width, 0);
+        XCTAssertNotEqual(subviewSize.width, 0);
-    XCTAssertNotEqual(subviewSize.height, 0);
+        XCTAssertNotEqual(subviewSize.height, 0);
-    XCTAssertFalse(isnan(subviewSize.height));
+        XCTAssertFalse(isnan(subviewSize.height));
-    XCTAssertFalse(isnan(subviewSize.width));
+        XCTAssertFalse(isnan(subviewSize.width));
-  }
+    }
 }
 
-- (void)testThatANonLeafNodeCanBecomeALeafNode {
+- (void)testThatANonLeafNodeCanBecomeALeafNode
-  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+{
-  container.yoga.isEnabled = YES;
+    UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
+    container.yoga.isEnabled = YES;
 
-  UIView* subview1 = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView *subview1 = [[UIView alloc] initWithFrame:CGRectZero];
-  subview1.yoga.isEnabled = YES;
+    subview1.yoga.isEnabled = YES;
-  [container addSubview:subview1];
+    [container addSubview:subview1];
 
-  UIView* subview2 = [[UIView alloc] initWithFrame:CGRectZero];
+    UIView *subview2 = [[UIView alloc] initWithFrame:CGRectZero];
-  subview2.yoga.isEnabled = YES;
+    subview2.yoga.isEnabled = YES;
-  [subview1 addSubview:subview2];
+    [subview1 addSubview:subview2];
 
-  [container.yoga applyLayoutPreservingOrigin:YES];
+    [container.yoga applyLayoutPreservingOrigin:YES];
-  [subview2 removeFromSuperview];
+    [subview2 removeFromSuperview];
-  [container.yoga applyLayoutPreservingOrigin:YES];
+    [container.yoga applyLayoutPreservingOrigin:YES];
 }
 
-- (void)testPointPercent {
+- (void)testPointPercent
+{
   XCTAssertEqual(YGPointValue(1).value, 1);
   XCTAssertEqual(YGPointValue(1).unit, YGUnitPoint);
   XCTAssertEqual(YGPercentValue(2).value, 2);
   XCTAssertEqual(YGPercentValue(2).unit, YGUnitPercent);
 }
 
-- (void)testPositionalPropertiesWork {
+- (void)testPositionalPropertiesWork
-  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.left = YGPointValue(1);
   XCTAssertEqual(view.yoga.left.value, 1);
@@ -591,8 +589,9 @@
   XCTAssertEqual(view.yoga.end.unit, YGUnitPercent);
 }
 
-- (void)testMarginPropertiesWork {
+- (void)testMarginPropertiesWork
-  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.margin = YGPointValue(1);
   XCTAssertEqual(view.yoga.margin.value, 1);
@@ -658,8 +657,9 @@
   XCTAssertEqual(view.yoga.marginEnd.unit, YGUnitPercent);
 }
 
-- (void)testPaddingPropertiesWork {
+- (void)testPaddingPropertiesWork
-  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.padding = YGPointValue(1);
   XCTAssertEqual(view.yoga.padding.value, 1);
@@ -725,8 +725,9 @@
   XCTAssertEqual(view.yoga.paddingEnd.unit, YGUnitPercent);
 }
 
-- (void)testBorderWidthPropertiesWork {
+- (void)testBorderWidthPropertiesWork
-  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
+{
+  UIView *view = [[UIView alloc] initWithFrame:CGRectZero];
 
   view.yoga.borderWidth = 1;
   XCTAssertEqual(view.yoga.borderWidth, 1);

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', '~> 2.1.0'
-  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
 end

YogaKit/YogaKitSample/Podfile.lock

@@ -1,33 +1,26 @@
 PODS:
-  - IGListDiffKit (4.0.0)
+  - IGListKit (2.1.0):
-  - IGListKit (4.0.0):
+    - IGListKit/Default (= 2.1.0)
-    - IGListDiffKit (= 4.0.0)
+  - IGListKit/Default (2.1.0):
-  - Yoga (2.0.0-beta.1)
+    - IGListKit/Diffing
-  - YogaKit (2.0.0-beta.1):
+  - IGListKit/Diffing (2.1.0)
-    - Yoga (~> 2.0.0-beta.1)
+  - Yoga (1.7.0)
+  - YogaKit (1.7.0):
+    - Yoga (~> 1.7)
 
 DEPENDENCIES:
-  - IGListKit (~> 4.0.0)
+  - IGListKit (~> 2.1.0)
-  - Yoga (from `../../Yoga.podspec`)
   - 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: b826c68ef7a4ae1626c09d4d3e1ea7a169e6c36e
-  IGListKit: fd5a5d21935298f5849fa49d426843cff97b77c7
+  Yoga: 2ed1d7accfef3610a67f58c0cf101a0662137f2c
-  Yoga: 090c6851e548d085d6211b5466b57ba8f4013a90
+  YogaKit: 31576530e8fcae3175469719ec3212397403330b
-  YogaKit: 5ae1939cd7516fdf6c343abb4b4aa381c9911ccf
 
-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,8 +1,9 @@
-/*
+/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * This source code is licensed under the MIT license found in the
+ * This source code is licensed under the license found in the
- * LICENSE file in the root directory of this source tree.
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import Foundation

YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift

@@ -1,8 +1,9 @@
-/*
+/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * This source code is licensed under the MIT license found in the
+ * This source code is licensed under the license found in the
- * LICENSE file in the root directory of this source tree.
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import UIKit
@@ -18,12 +19,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 +32,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 +60,16 @@ final class ExamplesViewController: UIViewController, ListAdapterDataSource, Lis
 
     //MARK: IGListAdapterDataSource
 
-    func objects(for listAdapter: ListAdapter) -> [ListDiffable] {
+    func objects(for listAdapter: IGListAdapter) -> [IGListDiffable] {
-        return models as [ListDiffable]
+        return models as [IGListDiffable]
     }
 
-    func listAdapter(_ listAdapter: ListAdapter, sectionControllerFor object: Any) -> ListSectionController {
+    func listAdapter(_ listAdapter: IGListAdapter, sectionControllerFor object: Any) -> IGListSectionController {
-        let sizeBlock: ListSingleSectionCellSizeBlock = { (model, context) in
+        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 +77,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,8 +1,9 @@
-/*
+/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * This source code is licensed under the MIT license found in the
+ * This source code is licensed under the license found in the
- * LICENSE file in the root directory of this source tree.
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -1,8 +1,9 @@
-/*
+/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * This source code is licensed under the MIT license found in the
+ * This source code is licensed under the license found in the
- * LICENSE file in the root directory of this source tree.
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 #import "ViewController.h"
@@ -11,41 +12,45 @@
 
 @implementation ViewController
 
-- (void)viewDidLoad {
+- (void)viewDidLoad
-  UIView* root = self.view;
+{
-  root.backgroundColor = [UIColor redColor];
+    UIView *root = self.view;
-  root.yoga.isEnabled = YES;
+    root.backgroundColor = [UIColor redColor];
-  root.yoga.width = YGPointValue(self.view.bounds.size.width);
+    root.yoga.isEnabled = YES;
-  root.yoga.height = YGPointValue(self.view.bounds.size.height);
+    root.yoga.width = YGPointValue(self.view.bounds.size.width);
-  root.yoga.alignItems = YGAlignCenter;
+    root.yoga.height = YGPointValue(self.view.bounds.size.height);
-  root.yoga.justifyContent = YGJustifyCenter;
+    root.yoga.alignItems = YGAlignCenter;
+    root.yoga.justifyContent = YGJustifyCenter;
 
-  UIView* child1 = [UIView new];
+    UIView *child1 = [UIView new];
-  child1.backgroundColor = [UIColor blueColor];
+    child1.backgroundColor = [UIColor blueColor];
-  child1.yoga.isEnabled = YES;
+    child1.yoga.isEnabled = YES;
-  child1.yoga.width = YGPointValue(100);
+    child1.yoga.width = YGPointValue(100);
-  child1.yoga.height = YGPointValue(100);
+    child1.yoga.height = YGPointValue(100);
 
-  UIView* child2 = [UIView new];
+    UIView *child2 = [UIView new];
-  child2.backgroundColor = [UIColor greenColor];
+    child2.backgroundColor = [UIColor greenColor];
-  child2.frame = (CGRect){
+    child2.frame = (CGRect) {
-      .size = {
+        .size = {
-          .width = 200,
+            .width = 200,
-          .height = 100,
+            .height = 100,
-      }};
+        }
+    };
 
-  UIView* child3 = [UIView new];
+    UIView *child3 = [UIView new];
-  child3.backgroundColor = [UIColor yellowColor];
+    child3.backgroundColor = [UIColor yellowColor];
-  child3.frame = (CGRect){
+    child3.frame = (CGRect) {
-      .size = {
+        .size = {
-          .width = 100,
+            .width = 100,
-          .height = 100,
+            .height = 100,
-      }};
+        }
+    };
 
-  [child2 addSubview:child3];
+    [child2 addSubview:child3];
-  [root addSubview:child1];
+    [root addSubview:child1];
-  [root addSubview:child2];
+    [root addSubview:child2];
-  [root.yoga applyLayoutPreservingOrigin:NO];
+    [root.yoga applyLayoutPreservingOrigin:NO];
 }
 
+
 @end

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -1,8 +1,9 @@
-/*
+/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * This source code is licensed under the MIT license found in the
+ * This source code is licensed under the license found in the
- * LICENSE file in the root directory of this source tree.
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import UIKit
@@ -10,11 +11,11 @@ import YogaKit
 
 final class BasicViewController: UIViewController {
     override func viewDidLoad() {
-        super.viewDidLoad()
         let containerSize = self.view.bounds.size
 
-        view.backgroundColor = UIColor.systemBackground
+        let root = self.view!
-        view.configureLayout { (layout) in
+        root.backgroundColor = .white
+        root.configureLayout { (layout) in
             layout.isEnabled = true
             layout.width = YGValue(containerSize.width)
             layout.height = YGValue(containerSize.height)
@@ -30,29 +31,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,8 +1,9 @@
-/*
+/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * This source code is licensed under the MIT license found in the
+ * This source code is licensed under the license found in the
- * LICENSE file in the root directory of this source tree.
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import UIKit
@@ -14,7 +15,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 +52,9 @@ final class LayoutInclusionViewController: UIViewController {
         }
         contentView.addSubview(disappearingView)
 
-        button.setTitle("Add Blue View", for: .selected)
+        button.setTitle("Add Blue View", for: UIControlState.selected)
-        button.setTitle("Remove Blue View", for: .normal)
+        button.setTitle("Remove Blue View", for: UIControlState.normal)
-        button.addTarget(self, action: #selector(buttonWasTapped), for: .touchUpInside)
+        button.addTarget(self, action: #selector(buttonWasTapped), for: UIControlEvents.touchUpInside)
         button.configureLayout { (layout) in
             layout.isEnabled = true
             layout.height = 300
@@ -67,7 +67,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,8 +1,9 @@
-/*
+/**
- * Copyright (c) Meta Platforms, Inc. and affiliates.
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * This source code is licensed under the MIT license found in the
+ * This source code is licensed under the license found in the
- * LICENSE file in the root directory of this source tree.
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import UIKit

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", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
+
+yoga_android_aar(
+    name = "android",
+    manifest_skeleton = "src/main/AndroidManifest.xml",
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        ANDROID_JAVA_TARGET,
+        ANDROID_RES_TARGET,
+        INFER_ANNOTATIONS_TARGET,
+        JAVA_TARGET,
+        PROGRUARD_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 {
+apply plugin: 'com.jfrog.bintray'
-    id("com.android.library")
+apply plugin: 'com.android.library'
-    id("publish")
+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,21 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the license found in the
+# LICENSE-examples file in the root directory of this source tree.
+
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "ANDROID_SUPPORT_TARGET", "APPCOMPAT_TARGET", "SOLOADER_TARGET", "yoga_android_library")
+
+yoga_android_library(
+    name = "yoga",
+    srcs = glob(["**/*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        ANDROID_JAVA_TARGET,
+        ANDROID_SAMPLE_RES_TARGET,
+        ANDROID_SUPPORT_TARGET,
+        APPCOMPAT_TARGET,
+        SOLOADER_TARGET,
+    ],
+)

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

@@ -1,27 +1,26 @@
-/*
+/**
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
+package com.facebook.samples.yoga;
-package com.facebook.yoga.sample;
 
 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 com.facebook.samples.yoga.R;
-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.yoga.android.YogaViewLayoutFactory;
 
 public class BenchmarkActivity extends AppCompatActivity {
@@ -33,24 +32,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,20 @@
-/*
+/**
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
+package com.facebook.samples.yoga;
-package com.facebook.yoga.sample;
 
 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,28 @@
-/*
+/**
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
+package com.facebook.samples.yoga;
-package com.facebook.yoga.sample;
 
 
+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;
 
@@ -59,17 +57,17 @@ public class BenchmarkFragment extends Fragment implements AdapterView.OnItemSel
 
   @Override
   public View onCreateView(
-          LayoutInflater inflater,
+      LayoutInflater inflater,
-          ViewGroup container,
+      ViewGroup container,
-          Bundle savedInstanceState) {
+      Bundle savedInstanceState) {
     mInflater = inflater;
 
     rootLayout = (YogaLayout) inflater.inflate(
-            R.layout.benchmark_fragment,
+        R.layout.benchmark_fragment,
-            container,
+        container,
-            false);
+        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,11 +103,11 @@ 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);
+    View v  = mInflater.inflate(yogaLayout, rootLayout, false);
     v.setLayoutParams(new LinearLayout.LayoutParams(
-            LinearLayout.LayoutParams.MATCH_PARENT,
+        LinearLayout.LayoutParams.MATCH_PARENT,
-            LinearLayout.LayoutParams.MATCH_PARENT));
+        LinearLayout.LayoutParams.MATCH_PARENT));
     previewLayout.removeAllViews();
     previewLayout.addView(v);
   }

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

@@ -1,35 +1,43 @@
-/*
+/**
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
+package com.facebook.samples.yoga;
-package com.facebook.yoga.sample;
 
 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);
+    Button b = (Button) rootLayout.findViewById(R.id.btn);
-    b.setOnClickListener(v -> startBenchmark());
+    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,14 +56,14 @@ public class BenchmarkInflate extends BenchmarkFragment {
     }
 
     textView.setText(
-            yogaInflationAggregator.toString() +
+        yogaInflationAggregator.toString()+
-                    "\n" +
+            "\n"+
-                    linearInflationAggregator.toString());
+            linearInflationAggregator.toString());
     Log.i(
-            "YogaLayoutBenchmark",
+      "YogaLayoutBenchmark",
-            yogaInflationAggregator.toString() +
+      yogaInflationAggregator.toString()+
-                    "\n" +
+        "\n"+
-                    linearInflationAggregator.toString());
+        linearInflationAggregator.toString());
     rootLayout.invalidate();
   }
 }

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

@@ -1,11 +1,10 @@
-/*
+/**
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
+package com.facebook.samples.yoga;
-package com.facebook.yoga.sample;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -14,25 +13,34 @@ 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 {
 
   @Override
   public View onCreateView(
-          LayoutInflater inflater,
+    LayoutInflater inflater,
-          ViewGroup container,
+    ViewGroup container,
-          Bundle savedInstanceState) {
+    Bundle savedInstanceState) {
     super.onCreateView(inflater, container, savedInstanceState);
 
-    Button b = rootLayout.findViewById(R.id.btn);
+    Button b = (Button) rootLayout.findViewById(R.id.btn);
-    b.setOnClickListener(v -> startBenchmark());
+    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;
 
@@ -44,11 +52,11 @@ public class BenchmarkLayout extends BenchmarkFragment {
       randomizeText(yogaView);
       randomizeText(linearView);
       yogaView.measure(
-              View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
-              View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
       linearView.measure(
-              View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
-              View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
       yogaInflationAggregator.startTrace();
       yogaView.layout(0, 0, yogaView.getMeasuredWidth(), yogaView.getMeasuredHeight());
       yogaInflationAggregator.endTrace();
@@ -58,13 +66,13 @@ public class BenchmarkLayout extends BenchmarkFragment {
     }
 
     textView.setText(
-            yogaInflationAggregator +
+        yogaInflationAggregator.toString()+
-                    "\n" +
+            "\n"+
-                    linearInflationAggregator);
+            linearInflationAggregator.toString());
     Log.i(
-            "YogaLayoutBenchmark",
+      "YogaLayoutBenchmark",
-            yogaInflationAggregator +
+      yogaInflationAggregator.toString()+
-                    "\n" +
+        "\n"+
-                    linearInflationAggregator);
+        linearInflationAggregator.toString());
   }
 }

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

@@ -1,11 +1,10 @@
-/*
+/**
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
+package com.facebook.samples.yoga;
-package com.facebook.yoga.sample;
 
 import android.os.Bundle;
 import android.util.Log;
@@ -14,6 +13,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;
 
@@ -21,13 +21,18 @@ public class BenchmarkMeasure extends BenchmarkFragment {
 
   @Override
   public View onCreateView(
-          LayoutInflater inflater,
+    LayoutInflater inflater,
-          ViewGroup container,
+    ViewGroup container,
-          Bundle savedInstanceState) {
+    Bundle savedInstanceState) {
     super.onCreateView(inflater, container, savedInstanceState);
 
-    Button b = rootLayout.findViewById(R.id.btn);
+    Button b = (Button) rootLayout.findViewById(R.id.btn);
-    b.setOnClickListener(v -> startBenchmark());
+    b.setOnClickListener(new View.OnClickListener() {
+      @Override
+      public void onClick(View v) {
+        startBenchmark();
+      }
+    });
 
     return rootLayout;
   }
@@ -48,25 +53,25 @@ public class BenchmarkMeasure extends BenchmarkFragment {
       randomizeText(linearView);
       yogaMeasureAggregator.startTrace();
       yogaView.measure(
-              View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
-              View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
       yogaMeasureAggregator.endTrace();
       linearMeasureAggregator.startTrace();
       linearView.measure(
-              View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY),
-              View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
+          View.MeasureSpec.makeMeasureSpec(1000, View.MeasureSpec.EXACTLY));
       linearMeasureAggregator.endTrace();
     }
 
     textView.setText(
-            yogaMeasureAggregator.toString() +
+        yogaMeasureAggregator.toString()+
-                    "\n" +
+            "\n"+
-                    linearMeasureAggregator.toString());
+            linearMeasureAggregator.toString());
     Log.i(
-            "YogaLayoutBenchmark",
+      "YogaLayoutBenchmark",
-            yogaMeasureAggregator.toString() +
+      yogaMeasureAggregator.toString()+
-                    "\n" +
+        "\n"+
-                    linearMeasureAggregator.toString());
+        linearMeasureAggregator.toString());
 
     yogaMeasureAggregator.dump(getActivity());
     linearMeasureAggregator.dump(getActivity());

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

@@ -1,27 +1,25 @@
-/*
+/**
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
+package com.facebook.samples.yoga;
-package com.facebook.yoga.sample;
 
 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 com.facebook.samples.yoga.R;
-import androidx.appcompat.app.AppCompatActivity;
-
 import com.facebook.soloader.SoLoader;
 import com.facebook.yoga.android.YogaViewLayoutFactory;
 
 /**
- * An activity to show off Yoga in Android. This activity shows a simple layout (defined in
+ * An activity to show off Yoga in Android.  This activity shows a simple layout (defined in
  * {@code main_layout.xml}) that shows off the awesome functionality of the Yoga layout engine
  * as well as some optimisations on layout systems that it facilitates.
  */
@@ -44,7 +42,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"
+      yoga:yg_flexDirection="row"
-      app:yg_height="50dp"
+      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"
+    yoga:yg_flexDirection="row"
-    app:yg_alignItems="center"
+    yoga:yg_alignItems="center"
     >
   <View
       android:layout_width="50dp"
       android:layout_height="50dp"
       android:background="@color/yoga_blue"
-      app:yg_flex="0"
+      yoga:yg_flex="0"
-      app:yg_marginAll="5dp"
+      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"
+      yoga:yg_flex="1"
-      app:yg_marginHorizontal="5dp"
+      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"
+    yoga:yg_flexDirection="column"
-    app:yg_alignItems="stretch"
+    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"
+      yoga:height="40dp"
-      app:yg_flexDirection="row"
+      yoga:yg_flexDirection="row"
-      app:yg_alignItems="stretch"
+      yoga:yg_alignItems="stretch"
       >
     <View
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:background="@color/yoga_blue"
-        app:yg_marginAll="10dp"
+        yoga:yg_marginAll="10dp"
-        app:yg_aspectRatio="1"
+        yoga:yg_aspectRatio="1"
         />
     <VirtualYogaLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:height="40dp"
+        yoga:height="40dp"
-        app:yg_flexDirection="column"
+        yoga:yg_flexDirection="column"
-        app:yg_alignItems="stretch"
+        yoga:yg_alignItems="stretch"
-        app:yg_flex="1"
+        yoga:yg_flex="1"
-        app:yg_justifyContent="space_around"
+        yoga:yg_justifyContent="space_around"
         >
       <VirtualYogaLayout
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
-           app:height="8dp"
+           yoga:height="8dp"
-           app:yg_flexDirection="row"
+           yoga:yg_flexDirection="row"
-           app:yg_alignItems="stretch"
+           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"
+           yoga:height="8dp"
-           app:yg_flexDirection="row"
+           yoga:yg_flexDirection="row"
-           app:yg_alignItems="stretch"
+           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"
+           yoga:height="8dp"
-           app:yg_flexDirection="row"
+           yoga:yg_flexDirection="row"
-           app:yg_alignItems="stretch"
+           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"
+    yoga:yg_alignItems="center"
-    app:yg_flexDirection="row"
+    yoga:yg_flexDirection="row"
-    app:yg_justifyContent="center"
+    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"
+      yoga:yg_flexDirection="column"
-      app:yg_flex="1"
+      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"
+        yoga:yg_flexDirection="row"
-        app:yg_flex="1"
+        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"
+          yoga:yg_flexDirection="row"
-          app:yg_flex="1"
+          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"
+            yoga:yg_flexDirection="row"
-            app:yg_flex="1"
+            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"
+              yoga:yg_flexDirection="row"
-              app:yg_flex="1"
+              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"
+                yoga:yg_flexDirection="column"
-                app:yg_flex="1"
+                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"
+                  yoga:yg_flexDirection="row"
-                  app:yg_flex="1"
+                  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"
+                    yoga:yg_flexDirection="row"
-                    app:yg_flex="1"
+                    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"
+                      yoga:yg_flexDirection="row"
-                      app:yg_flex="1"
+                      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"
+                        yoga:yg_flexDirection="row"
-                        app:yg_flex="1"
+                        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"
+                          yoga:yg_flexDirection="column"
-                          app:yg_flex="1"
+                          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"
+                            yoga:yg_flexDirection="row"
-                            app:yg_flex="1"
+                            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"
+                              yoga:yg_flexDirection="row"
-                              app:yg_flex="1"
+                              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"
+                                yoga:yg_flexDirection="row"
-                                app:yg_flex="1"
+                                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"
+                                  yoga:yg_flexDirection="row"
-                                  app:yg_flex="1"
+                                  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"
+      yoga:yg_marginHorizontal="10dp"
-      app:yg_marginTop="5dp"
+      yoga:yg_marginTop="5dp"
-      app:yg_flexDirection="row"
+      yoga:yg_flexDirection="row"
-      app:yg_alignItems="center"
+      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"
+        yoga:yg_flex="1"
-        app:yg_marginStart="8dp"
+        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"
+      yoga:yg_marginHorizontal="10dp"
-      app:yg_marginTop="5dp"
+      yoga:yg_marginTop="5dp"
-      app:yg_flexDirection="row"
+      yoga:yg_flexDirection="row"
-      app:yg_alignItems="center"
+      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"
+        yoga:yg_flex="1"
-        app:yg_marginStart="8dp"
+        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"
+      yoga:yg_marginHorizontal="10dp"
-      app:yg_marginTop="5dp"
+      yoga:yg_marginTop="5dp"
-      app:yg_flexDirection="row"
+      yoga:yg_flexDirection="row"
-      app:yg_alignItems="center"
+      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"
+        yoga:yg_flex="1"
-        app:yg_marginStart="8dp"
+        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"
+      yoga:yg_marginHorizontal="10dp"
-      app:yg_marginTop="5dp"
+      yoga:yg_marginTop="5dp"
-      app:yg_flexDirection="row"
+      yoga:yg_flexDirection="row"
-      app:yg_alignItems="center"
+      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"
+        yoga:yg_flex="1"
-        app:yg_marginStart="8dp"
+        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"
+      yoga:yg_marginHorizontal="10dp"
-      app:yg_marginTop="5dp"
+      yoga:yg_marginTop="5dp"
-      app:yg_flexDirection="row"
+      yoga:yg_flexDirection="row"
-      app:yg_alignItems="center"
+      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"
+        yoga:yg_flex="1"
-        app:yg_marginStart="10dp"
+        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,21 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "JSR_305_TARGET", "SOLOADER_TARGET", "yoga_android_library")
+
+yoga_android_library(
+    name = "android",
+    srcs = glob(["**/*.java"]),
+    visibility = [
+        "PUBLIC",
+    ],
+    deps = [
+        ANDROID_RES_TARGET,
+        INFER_ANNOTATIONS_TARGET,
+        JAVA_TARGET,
+        JSR_305_TARGET,
+        SOLOADER_TARGET,
+    ],
+)

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

@@ -1,10 +1,9 @@
-/*
+/**
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
 package com.facebook.yoga.android;
 
 import java.util.HashMap;
@@ -18,7 +17,6 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.facebook.yoga.YogaNode;
-import com.facebook.yoga.YogaNodeFactory;
 
 /**
  * Much like a {@link YogaLayout}, except this class does not render itself (the container) to the
@@ -34,7 +32,7 @@ public class VirtualYogaLayout extends ViewGroup {
 
   final private List<View> mChildren = new LinkedList<>();
   final private Map<View, YogaNode> mYogaNodes = new HashMap<>();
-  final private YogaNode mYogaNode = YogaNodeFactory.create();
+  final private YogaNode mYogaNode = YogaNode.create();
 
   public VirtualYogaLayout(Context context) {
     super(context);
@@ -74,7 +72,7 @@ public class VirtualYogaLayout extends ViewGroup {
       return;
     }
 
-    YogaNode node = YogaNodeFactory.create();
+    YogaNode node = YogaNode.create();
     YogaLayout.LayoutParams lp = new YogaLayout.LayoutParams(params);
     YogaLayout.applyLayoutParams(lp, node, child);
     node.setData(child);

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

@@ -1,10 +1,9 @@
-/*
+/**
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
 package com.facebook.yoga.android;
 
 import android.content.Context;
@@ -29,7 +28,6 @@ import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
 import com.facebook.yoga.YogaNode;
-import com.facebook.yoga.YogaNodeFactory;
 import com.facebook.yoga.YogaOverflow;
 import com.facebook.yoga.YogaPositionType;
 import com.facebook.yoga.YogaWrap;
@@ -79,7 +77,7 @@ public class YogaLayout extends ViewGroup {
   public YogaLayout(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
 
-    mYogaNode = YogaNodeFactory.create();
+    mYogaNode = YogaNode.create();
     mYogaNodes = new HashMap<>();
 
     mYogaNode.setData(this);
@@ -156,7 +154,7 @@ public class YogaLayout extends ViewGroup {
       if(mYogaNodes.containsKey(child)) {
         childNode = mYogaNodes.get(child);
       } else {
-        childNode = YogaNodeFactory.create();
+        childNode = YogaNode.create();
       }
 
       childNode.setData(child);

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

@@ -1,10 +1,9 @@
-/*
+/**
- * 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
+ * This source code is licensed under the MIT license found in the LICENSE
- * LICENSE file in the root directory of this source tree.
+ * file in the root directory of this source tree.
  */
-
 package com.facebook.yoga.android;
 
 import android.content.Context;

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="relative" value="0"/>
-      <enum name="static" value="0"/>
+      <enum name="absolute" value="1"/>
-      -->
-      <enum name="relative" value="1"/>
-      <enum name="absolute" value="2"/>
-      <enum name="position_static" value="0"/>
-      <enum name="position_relative" value="1"/>
-      <enum name="position_absolute" value="2"/>
     </attr>
 
     <attr name="yg_width" format="dimension|string"/>