Release GitHub actions workflow (#1088 )

Summary: Pull Request resolved: https://github.com/facebook/yoga/pull/1088 Reviewed By: mweststrate Differential Revision: D28604872 Pulled By: passy fbshipit-source-id: e77578d44557420be9b782dc90f047af697b7cb9
Maven release docs (#1087 )
2021-05-21 11:41:13 -07:00 · 2021-05-21 11:41:13 -07:00 · 2021-05-21 11:41:12 -07:00 · 2021-05-21 11:15:18 -07:00 · 2021-05-21 10:11:37 -07:00 · 2021-05-20 21:24:14 -07:00
296 changed files with 6323 additions and 4877 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,58 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  website:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup Node.js
+        uses: actions/setup-node@v1
+        with:
+          node-version: 8.x
+      - name: Install dependencies
+        run: yarn install --frozen-lockfile --ignore-scripts
+        working-directory: website
+      - name: Build
+        run: yarn build
+        working-directory: website
+      - name: Deploy
+        if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/master' }}
+        uses: peaceiris/actions-gh-pages@v3
+        with:
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+          publish_branch: gh-pages
+          publish_dir: website/public
+          cname: yogalayout.com
+          keep_files: true
+          user_name: 'Yoga-bot'
+          user_email: 'yogabot@fb.com'
+  android:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - name: set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Install NDK 21
+        run: echo "y" | sudo /usr/local/lib/android/sdk/tools/bin/sdkmanager --install "ndk;21.0.6113669" "ndk;20.0.5594570" --sdk_root=${ANDROID_SDK_ROOT}
+      - name: Install dependencies
+        run: |
+          if [[ -n "${{ secrets.encrypted_d27e803291ff_iv }}" ]]; then
+            openssl aes-256-cbc -K ${{ secrets.encrypted_d27e803291ff_key }} -iv {{ secrets.encrypted_d27e803291ff_iv }} -in scripts/setup-keys.enc -d >> gradle.properties;
+          fi
+          sudo apt-get update
+          sudo apt-get install -y ninja-build
+          pushd $HOME
+          git clone --depth 1 https://github.com/facebook/buck.git
+          cd buck
+          ant
+          popd
+          echo "$HOME/buck/bin" >> $GITHUB_PATH
+          export PATH=$PATH:$HOME/buck/bin/
+          buck --version
+      - name: Build
+        # TODO: Run the tests here again. They're currently crashing the JVM in GitHub Actions for some reason.
+        run: ./gradlew :yoga-layout:assembleDebug && scripts/publish-snapshot.sh
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -0,0 +1,32 @@
+name: Publish
+
+on:
+  release:
+    types:
+      - created
+  workflow_dispatch:
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Install dependencies
+      run: source scripts/android-setup.sh && installAndroidSDK
+    - name: Write GPG Sec Ring
+      run: echo '${{ secrets.GPG_KEY_CONTENTS }}' | base64 -d > /tmp/secring.gpg
+    - name: Update gradle.properties
+      run: echo -e "signing.secretKeyRingFile=/tmp/secring.gpg\nsigning.keyId=${{ secrets.SIGNING_KEY_ID }}\nsigning.password=${{ secrets.SIGNING_PASSWORD }}\nmavenCentralPassword=${{ secrets.SONATYPE_NEXUS_PASSWORD }}\nmavenCentralUsername=${{ secrets.SONATYPE_NEXUS_USERNAME }}" >> gradle.properties
+    - name: Upload Android Archives
+      run: ./gradlew :yoga:assembleRelease publish --info
+    - name: Release and close
+      run: ./gradlew closeAndReleaseRepository
+    - name: Clean secrets
+      if: always()
+      run: rm /tmp/secring.gpg
--- a/.gitignore
+++ b/.gitignore
@@ -6,6 +6,9 @@
 /.buckd
 /gentest/test.html
 .buckversion
+.cxx
+.idea
+/local.properties

 # Jekyll
 /.sass-cache/
--- a/.swift-version
+++ b/.swift-version
@@ -1 +0,0 @@
-4.0
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,77 +0,0 @@
-language: java
-os: linux
-dist: trusty
-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
--- a/31
+++ b/31
@@ -2,7 +2,7 @@
 #
 # 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")
+load("//tools/build_defs/oss:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "LIBRARY_COMPILER_FLAGS", "YOGA_ROOTS", "subdir_glob", "yoga_cxx_library", "yoga_cxx_test", "yoga_dep", "yoga_prebuilt_cxx_library")

 GMOCK_OVERRIDE_FLAGS = [
    # gmock does not mark mocked methods as override, ignore the warnings in tests
@@ -14,6 +14,18 @@ TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + [
    "-DYG_ENABLE_EVENTS",
 ]

+yoga_prebuilt_cxx_library(
+    name = "ndklog",
+    exported_platform_linker_flags = [
+        (
+            "^android.*",
+            ["-llog"],
+        ),
+    ],
+    header_only = True,
+    visibility = YOGA_ROOTS,
+)
+
 yoga_cxx_library(
    name = "yoga",
    srcs = glob(["yoga/**/*.cpp"]),
@@ -24,7 +36,21 @@ yoga_cxx_library(
    tests = [":YogaTests"],
    visibility = ["PUBLIC"],
    deps = [
-        yoga_dep("lib/fb:ndklog"),
+        ":ndklog",
+    ],
+)
+
+yoga_cxx_library(
+    name = "yoga-static",
+    srcs = glob(["yoga/**/*.cpp"]),
+    compiler_flags = LIBRARY_COMPILER_FLAGS,
+    preferred_linkage = "static",
+    public_include_directories = ["."],
+    raw_headers = glob(["yoga/**/*.h"]),
+    tests = [":YogaTests"],
+    visibility = ["PUBLIC"],
+    deps = [
+        ":ndklog",
    ],
 )

@@ -39,7 +65,6 @@ yoga_cxx_library(
    visibility = ["PUBLIC"],
    deps = [
        ":yoga",
-        yoga_dep("lib/fb:ndklog"),
    ],
 )

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,14 +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.
-#

 cmake_minimum_required(VERSION 3.4.1)

 set(CMAKE_VERBOSE_MAKEFILE on)

+add_compile_options(
+    -fno-omit-frame-pointer
+    -fexceptions
+    -fvisibility=hidden
+    -ffunction-sections
+    -fdata-sections
+    -Wall
+    -std=c++11)
+
 file(GLOB_RECURSE yogacore_SRC yoga/*.cpp)
 add_library(yogacore STATIC ${yogacore_SRC})

--- a/README.md
+++ b/README.md
@@ -46,3 +46,29 @@ This will now only run the standalone webpack build upon install.
 | node           | Builds node js version.                         |
 | standalone     | Runs webpack.                                   |
 | none           | Does nothing. You can use the prepackaged libs. |
+
+## Maintainer Release Guide
+
+To publish a new release, follow these steps:
+
+1. Ensure you have your GPG key set up and your [OSS Sonatype](https://oss.sonatype.org/) credentials handy.
+2. Add the follow entries to either your local `gradle.properties` (don't forget to revert) or your global `~/.gradle/gradle.properties`:
+
+```
+# You get these from https://oss.sonatype.org/#profile;User%20Token
+mavenCentralRepositoryUsername=<username>
+mavenCentralRepositoryPassword=<password>
+
+# You can get the keyId (in GPG 1.4 format) by running `gpg1 --list-keys`.
+signing.secretKeyRingFile=</path/to/secring.gpg>
+signing.keyId=<key_id>
+signing.password=<key_password>
+```
+
+3. Change the `VERSION_NAME` in `gradle.properties` to a non-SNAPSHOT release.
+4. Commit and land the version change.
+5. Run `./gradlew publishToMaven`.
+6. Run `./gradlew closeAndReleaseRepository`.
+7. Change the `VERSION_NAME` in `gradle.properties` back to a new SNAPSHOT release.
+8. Commit and land the version change.
+9. Celebrate! You've made a release!
--- a/ReactYoga.xcodeproj/project.pbxproj
+++ b/ReactYoga.xcodeproj/project.pbxproj
@@ -191,7 +191,6 @@
 		27595AD71E575C7800CCE2B1 /* SampleCxxModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D41E03699D0018521A /* SampleCxxModule.h */; };
 		27595AD81E575C7800CCE2B1 /* SystraceSection.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D92B0D51E03699D0018521A /* SystraceSection.h */; };
 		2D0EB9F32021067800CAF88A /* RCTUIUtils.m in Sources */ = {isa = PBXBuildFile; fileRef = F1EFDA4E201F660F00EE6E4C /* RCTUIUtils.m */; };
-		2D16E68E1FA4FD3900B85C8A /* RCTTVNavigationEventEmitter.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */; };
 		2D1D83CE1F74E2DA00615550 /* libdouble-conversion.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 3D383D621EBD27B9005632C8 /* libdouble-conversion.a */; };
 		2D3B5E931D9B087300451313 /* RCTErrorInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = 3EDCA8A41D3591E700450C31 /* RCTErrorInfo.m */; };
 		2D3B5E941D9B087900451313 /* RCTBundleURLProvider.m in Sources */ = {isa = PBXBuildFile; fileRef = 68EFE4ED1CF6EB3900A1DE13 /* RCTBundleURLProvider.m */; };
@@ -269,8 +268,6 @@
 		3D0B842A1EC0B49400B2BD8E /* RCTTVRemoteHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0B84281EC0B49400B2BD8E /* RCTTVRemoteHandler.h */; };
 		3D0B842B1EC0B49400B2BD8E /* RCTTVRemoteHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D0B84291EC0B49400B2BD8E /* RCTTVRemoteHandler.m */; };
 		3D0B842C1EC0B4EA00B2BD8E /* RCTTVView.m in Sources */ = {isa = PBXBuildFile; fileRef = 130443D71E401AD800D93A67 /* RCTTVView.m */; };
-		3D0B842F1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */; };
-		3D0B84301EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m in Sources */ = {isa = PBXBuildFile; fileRef = 3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */; };
 		3D0E378A1F1CC40000DCAC9F /* RCTWebSocketModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
 		3D0E378E1F1CC59100DCAC9F /* RCTWebSocketModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
 		3D0E378F1F1CC5CF00DCAC9F /* RCTWebSocketModule.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = 3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */; };
@@ -1275,7 +1272,6 @@
 				594F0A471FD233BD007FBE96 /* RCTSurfaceView.h in Copy Headers */,
 				594F0A481FD233BD007FBE96 /* RCTSurfaceHostingView.h in Copy Headers */,
 				594F0A491FD233BD007FBE96 /* RCTSurfaceSizeMeasureMode.h in Copy Headers */,
-				2D16E68E1FA4FD3900B85C8A /* RCTTVNavigationEventEmitter.h in Copy Headers */,
 				59500D481F71C67600B122B7 /* RCTUIManagerUtils.h in Copy Headers */,
 				3D0E37901F1CC5E100DCAC9F /* RCTWebSocketModule.h in Copy Headers */,
 				5960C1BF1F0804F50066FD5B /* RCTLayoutAnimation.h in Copy Headers */,
@@ -1876,8 +1872,6 @@
 		39C50FFA2046EE3500CEE534 /* RCTVersion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTVersion.m; sourceTree = "<group>"; };
 		3D0B84281EC0B49400B2BD8E /* RCTTVRemoteHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVRemoteHandler.h; sourceTree = "<group>"; };
 		3D0B84291EC0B49400B2BD8E /* RCTTVRemoteHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVRemoteHandler.m; sourceTree = "<group>"; };
-		3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTTVNavigationEventEmitter.h; sourceTree = "<group>"; };
-		3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTTVNavigationEventEmitter.m; sourceTree = "<group>"; };
 		3D0E37891F1CC40000DCAC9F /* RCTWebSocketModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = RCTWebSocketModule.h; path = WebSocket/RCTWebSocketModule.h; sourceTree = "<group>"; };
 		3D1E68D81CABD13900DD7465 /* RCTDisplayLink.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTDisplayLink.h; sourceTree = "<group>"; };
 		3D1E68D91CABD13900DD7465 /* RCTDisplayLink.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTDisplayLink.m; sourceTree = "<group>"; };
@@ -2346,8 +2340,6 @@
 				0EEEA8DE2239002200A8C82D /* RCTSurfacePresenterStub.m */,
 				13B07FED1A69327A00A75B9A /* RCTTiming.h */,
 				13B07FEE1A69327A00A75B9A /* RCTTiming.m */,
-				3D0B842D1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h */,
-				3D0B842E1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m */,
 				13E067481A70F434002CDEE1 /* RCTUIManager.h */,
 				13E067491A70F434002CDEE1 /* RCTUIManager.m */,
 				59EB6DB91EBD6FC90072A5E7 /* RCTUIManagerObserverCoordinator.h */,
@@ -2945,7 +2937,6 @@
 				3D302F311DF828F800D6DDAE /* RCTBundleURLProvider.h in Headers */,
 				3D302F321DF828F800D6DDAE /* RCTConvert.h in Headers */,
 				3D302F331DF828F800D6DDAE /* RCTDefines.h in Headers */,
-				3D0B842F1EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.h in Headers */,
 				3D302F341DF828F800D6DDAE /* RCTDisplayLink.h in Headers */,
 				3D302F351DF828F800D6DDAE /* RCTErrorCustomizer.h in Headers */,
 				3D302F361DF828F800D6DDAE /* RCTErrorInfo.h in Headers */,
@@ -3994,7 +3985,6 @@
 				2D3B5EC81D9B095800451313 /* RCTActivityIndicatorViewManager.m in Sources */,
 				3DCD185D1DF978E7007FE5A1 /* RCTReloadCommand.m in Sources */,
 				130443DB1E401ADD00D93A67 /* RCTConvert+Transform.m in Sources */,
-				3D0B84301EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m in Sources */,
 				2D3B5EC61D9B095000451313 /* RCTProfileTrampoline-x86_64.S in Sources */,
 				2D3B5EA61D9B08CA00451313 /* RCTTouchEvent.m in Sources */,
 				2D8C2E331DA40441000EE098 /* RCTMultipartStreamReader.m in Sources */,
--- a/Yoga.podspec
+++ b/Yoga.podspec
@@ -1,9 +1,8 @@
-#
 # 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.
-#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
 Pod::Spec.new do |spec|
  spec.name = 'Yoga'
  spec.version = '1.14.0'
@@ -34,6 +33,6 @@ Pod::Spec.new do |spec|
      '-fPIC'
  ]
  spec.source_files = 'yoga/**/*.{c,h,cpp}'
-  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGValue}.h'
+  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGNode,YGStyle,YGValue}.h'

 end
--- a/YogaKit.podspec
+++ b/YogaKit.podspec
@@ -1,12 +1,11 @@
-#
 # 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.
-#
+# 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 = '1.14.0'
+  spec.version = '1.18.1'
  spec.license =  { :type => 'MIT', :file => "LICENSE" }
  spec.homepage = 'https://facebook.github.io/yoga/'
  spec.documentation_url = 'https://facebook.github.io/yoga/docs/'
@@ -17,17 +16,22 @@ podspec = Pod::Spec.new do |spec|
  spec.authors = 'Facebook'
  spec.source = {
    :git => 'https://github.com/facebook/yoga.git',
-    :tag => spec.version.to_s,
+    :tag => "1.18.0",
  }

  spec.platform = :ios
  spec.ios.deployment_target = '8.0'
  spec.ios.frameworks = 'UIKit'
+  spec.module_name = 'YogaKit'
  spec.dependency 'Yoga', '~> 1.14'
+  # Fixes the bug related the xcode 11 not able to find swift related frameworks.
+  # https://github.com/Carthage/Carthage/issues/2825
+  # https://twitter.com/krzyzanowskim/status/1151549874653081601?s=21
+  spec.pod_target_xcconfig = {"LD_VERIFY_BITCODE": "NO"}
  spec.source_files = 'YogaKit/Source/*.{h,m,swift}'
  spec.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
  spec.private_header_files = 'YogaKit/Source/YGLayout+Private.h'
-  spec.swift_version = '4.0'
+  spec.swift_version = '5.1'
 end

 # See https://github.com/facebook/yoga/pull/366
--- a/YogaKit/BUCK
+++ b/YogaKit/BUCK
@@ -37,11 +37,14 @@ yoga_apple_library(
    ),
    compiler_flags = COMPILER_FLAGS,
    frameworks = [
+        "$SDKROOT/System/Library/Frameworks/CoreGraphics.framework",
        "$SDKROOT/System/Library/Frameworks/Foundation.framework",
        "$SDKROOT/System/Library/Frameworks/UIKit.framework",
    ],
    header_path_prefix = "",
    link_whole = True,
+    modular = True,
+    module_name = "YogaKit",
    visibility = ["PUBLIC"],
    deps = [
        yoga_dep(":yoga"),
--- a/YogaKit/Source/UIView+Yoga.h
+++ b/YogaKit/Source/UIView+Yoga.h
@@ -1,11 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
-#import "YGLayout.h"
+
 #import <UIKit/UIKit.h>
+#import "YGLayout.h"

 NS_ASSUME_NONNULL_BEGIN

@@ -23,9 +24,10 @@ typedef void (^YGLayoutConfigurationBlock)(YGLayout *layout);
@property(nonatomic, readonly, assign) BOOL isYogaEnabled;

 /**
- In ObjC land, every time you access `view.yoga.*` you are adding another `objc_msgSend`
- to your code. If you plan on making multiple changes to YGLayout, it's more performant
- to use this method, which uses a single objc_msgSend call.
+ In ObjC land, every time you access `view.yoga.*` you are adding another
+ `objc_msgSend` to your code. If you plan on making multiple changes to
+ YGLayout, it's more performant to use this method, which uses a single
+ objc_msgSend call.
 */
 - (void)configureLayoutWithBlock:(YGLayoutConfigurationBlock)block
    NS_SWIFT_NAME(configureLayout(block:));
--- a/YogaKit/Source/UIView+Yoga.m
+++ b/YogaKit/Source/UIView+Yoga.m
@@ -1,36 +1,34 @@
-/**
+/*
 * 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;

@implementation UIView (YogaKit)

- (YGLayout *)yoga
-{
+- (YGLayout*)yoga {
  YGLayout* yoga = objc_getAssociatedObject(self, kYGYogaAssociatedKey);
  if (!yoga) {
    yoga = [[YGLayout alloc] initWithView:self];
-    objc_setAssociatedObject(self, kYGYogaAssociatedKey, yoga, OBJC_ASSOCIATION_RETAIN_NONATOMIC);
+    objc_setAssociatedObject(
+        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);
  }
--- a/YogaKit/Source/YGLayout+Private.h
+++ b/YogaKit/Source/YGLayout+Private.h
@@ -1,11 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
-#import "YGLayout.h"
+
 #import <yoga/Yoga.h>
+#import "YGLayout.h"

@interface YGLayout ()

--- a/YogaKit/Source/YGLayout.h
+++ b/YogaKit/Source/YGLayout.h
@@ -1,20 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 #import <UIKit/UIKit.h>
 #import <yoga/YGEnums.h>
-#import <yoga/Yoga.h>
 #import <yoga/YGMacros.h>
+#import <yoga/Yoga.h>

 YG_EXTERN_C_BEGIN

-extern YGValue YGPointValue(CGFloat value)
-    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
-extern YGValue YGPercentValue(CGFloat value)
-    NS_SWIFT_UNAVAILABLE("Use the swift Int and FloatingPoint extensions instead");
+extern YGValue YGPointValue(CGFloat value) NS_SWIFT_UNAVAILABLE(
+    "Use the swift Int and FloatingPoint extensions instead");
+extern YGValue YGPercentValue(CGFloat value) NS_SWIFT_UNAVAILABLE(
+    "Use the swift Int and FloatingPoint extensions instead");

 YG_EXTERN_C_END

@@ -43,11 +44,12 @@ 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:) BOOL isIncludedInLayout;
+@property(nonatomic, readwrite, assign, setter=setIncludedInLayout:)
+    BOOL isIncludedInLayout;

 /**
- The property that decides during layout/sizing whether or not styling properties should be applied.
- Defaults to NO.
+ The property that decides during layout/sizing whether or not styling
+ properties should be applied. Defaults to NO.
 */
@property(nonatomic, readwrite, assign, setter=setEnabled:) BOOL isEnabled;

@@ -118,28 +120,31 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
@property(nonatomic, readonly, assign) YGDirection resolvedDirection;

 /**
- Perform a layout calculation and update the frames of the views in the hierarchy with the results.
- If the origin is not preserved, the root view's layout results will applied from {0,0}.
+ Perform a layout calculation and update the frames of the views in the
+ hierarchy with the results. If the origin is not preserved, the root view's
+ 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 hierarchy with the results.
- If the origin is not preserved, the root view's layout results will applied from {0,0}.
+ Perform a layout calculation and update the frames of the views in the
+ hierarchy with the results. If the origin is not preserved, the root view's
+ 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 equivalent to calling [self
- sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
+ Returns the size of the view if no constraints were given. This could
+ equivalent to calling [self sizeThatFits:CGSizeMake(CGFLOAT_MAX, CGFLOAT_MAX)];
 */
@property(nonatomic, readonly, assign) CGSize intrinsicSize;

 /**
-  Returns the size of the view based on provided constraints. Pass NaN for an unconstrained dimension.
+  Returns the size of the view based on provided constraints. Pass NaN for an
+  unconstrained dimension.
 */
 - (CGSize)calculateLayoutWithSize:(CGSize)size
    NS_SWIFT_NAME(calculateLayout(with:));
@@ -150,8 +155,8 @@ typedef NS_OPTIONS(NSInteger, YGDimensionFlexibility) {
@property(nonatomic, readonly, assign) NSUInteger numberOfChildren;

 /**
- Return a BOOL indiciating whether or not we this node contains any subviews that are included in
- Yoga's layout.
+ Return a BOOL indiciating whether or not we this node contains any subviews
+ that are included in Yoga's layout.
 */
@property(nonatomic, readonly, assign) BOOL isLeaf;

--- a/YogaKit/Source/YGLayout.m
+++ b/YogaKit/Source/YGLayout.m
@@ -1,32 +1,28 @@
-/**
+/*
 * 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 "YGLayout+Private.h"
 #import "UIView+Yoga.h"
+#import "YGLayout+Private.h"

 #define YG_PROPERTY(type, lowercased_name, capitalized_name)      \
- (type)lowercased_name                                         \
-{                                                               \
+  -(type)lowercased_name {                                        \
    return YGNodeStyleGet##capitalized_name(self.node);           \
  }                                                               \
                                                                  \
- (void)set##capitalized_name:(type)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                                                         \
-{                                                                                  \
+  -(YGValue)lowercased_name {                                               \
    return YGNodeStyleGet##capitalized_name(self.node);                     \
  }                                                                         \
                                                                            \
- (void)set##capitalized_name:(YGValue)lowercased_name                             \
-{                                                                                  \
+  -(void)set##capitalized_name : (YGValue)lowercased_name {                 \
    switch (lowercased_name.unit) {                                         \
      case YGUnitUndefined:                                                 \
        YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value); \
@@ -35,7 +31,8 @@
        YGNodeStyleSet##capitalized_name(self.node, lowercased_name.value); \
        break;                                                              \
      case YGUnitPercent:                                                   \
-      YGNodeStyleSet##capitalized_name##Percent(self.node, lowercased_name.value); \
+        YGNodeStyleSet##capitalized_name##Percent(                          \
+            self.node, lowercased_name.value);                              \
        break;                                                              \
      default:                                                              \
        NSAssert(NO, @"Not implemented");                                   \
@@ -43,19 +40,18 @@
  }

 #define YG_AUTO_VALUE_PROPERTY(lowercased_name, capitalized_name)           \
- (YGValue)lowercased_name                                                         \
-{                                                                                  \
+  -(YGValue)lowercased_name {                                               \
    return YGNodeStyleGet##capitalized_name(self.node);                     \
  }                                                                         \
                                                                            \
- (void)set##capitalized_name:(YGValue)lowercased_name                             \
-{                                                                                  \
+  -(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); \
+        YGNodeStyleSet##capitalized_name##Percent(                          \
+            self.node, lowercased_name.value);                              \
        break;                                                              \
      case YGUnitAuto:                                                      \
        YGNodeStyleSet##capitalized_name##Auto(self.node);                  \
@@ -65,25 +61,26 @@
    }                                                                       \
  }

-#define YG_EDGE_PROPERTY_GETTER(type, lowercased_name, capitalized_name, property, edge) \
- (type)lowercased_name                                                                  \
-{                                                                                        \
+#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                             \
-{                                                                                  \
+#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_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                                 \
-{                                                                                                \
+#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); \
@@ -92,35 +89,70 @@ YG_EDGE_PROPERTY_SETTER(lowercased_name, capitalized_name, property, edge)
        YGNodeStyleSet##c_name(self.node, edge, objc_lowercased_name.value); \
        break;                                                               \
      case YGUnitPercent:                                                    \
-      YGNodeStyleSet##c_name##Percent(self.node, edge, objc_lowercased_name.value);              \
+        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_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)
+  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)
-{
+YGValue YGPointValue(CGFloat value) {
  return (YGValue){.value = value, .unit = YGUnitPoint};
 }

-YGValue YGPercentValue(CGFloat value)
-{
+YGValue YGPercentValue(CGFloat value) {
  return (YGValue){.value = value, .unit = YGUnitPercent};
 }

@@ -139,15 +171,14 @@ static YGConfigRef globalConfig;
@synthesize isIncludedInLayout = _isIncludedInLayout;
@synthesize node = _node;

-+ (void)initialize
-{
+ (void)initialize {
  globalConfig = YGConfigNew();
-  YGConfigSetExperimentalFeatureEnabled(globalConfig, YGExperimentalFeatureWebFlexBasis, true);
+  YGConfigSetExperimentalFeatureEnabled(
+      globalConfig, YGExperimentalFeatureWebFlexBasis, true);
  YGConfigSetPointScaleFactor(globalConfig, [UIScreen mainScreen].scale);
 }

- (instancetype)initWithView:(UIView*)view
-{
+- (instancetype)initWithView:(UIView*)view {
  if (self = [super init]) {
    _view = view;
    _node = YGNodeNewWithConfig(globalConfig);
@@ -160,18 +191,15 @@ 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;
  }
@@ -187,14 +215,14 @@ static YGConfigRef globalConfig;
  YGNodeMarkDirty(node);
 }

- (NSUInteger)numberOfChildren
-{
+- (NSUInteger)numberOfChildren {
  return YGNodeGetChildCount(self.node);
 }

- (BOOL)isLeaf
-{
-  NSAssert([NSThread isMainThread], @"This method must be called on the main thread.");
+- (BOOL)isLeaf {
+  NSAssert(
+      [NSThread isMainThread],
+      @"This method must be called on the main thread.");
  if (self.isEnabled) {
    for (UIView* subview in self.view.subviews) {
      YGLayout* const yoga = subview.yoga;
@@ -209,13 +237,11 @@ 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);
 }

@@ -261,25 +287,23 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)

 #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 dimensionFlexibility:(YGDimensionFlexibility)dimensionFlexibility
-{
+- (void)applyLayoutPreservingOrigin:(BOOL)preserveOrigin
+               dimensionFlexibility:
+                   (YGDimensionFlexibility)dimensionFlexibility {
  CGSize size = self.view.bounds.size;
  if (dimensionFlexibility & YGDimensionFlexibilityFlexibleWidth) {
    size.width = YGUndefined;
@@ -291,9 +315,7 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
  YGApplyLayoutToViewHierarchy(self.view, preserveOrigin);
 }

-
- (CGSize)intrinsicSize
-{
+- (CGSize)intrinsicSize {
  const CGSize constrainedSize = {
      .width = YGUndefined,
      .height = YGUndefined,
@@ -301,8 +323,7 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)
  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.");

@@ -310,10 +331,7 @@ YG_PROPERTY(CGFloat, aspectRatio, AspectRatio)

  const YGNodeRef node = self.node;
  YGNodeCalculateLayout(
-    node,
-    size.width,
-    size.height,
-    YGNodeStyleGetDirection(node));
+      node, size.width, size.height, YGNodeStyleGetDirection(node));

  return (CGSize){
      .width = YGNodeLayoutGetWidth(node),
@@ -328,10 +346,11 @@ static YGSize YGMeasureView(
    float width,
    YGMeasureMode widthMode,
    float height,
-  YGMeasureMode heightMode)
-{
-  const CGFloat constrainedWidth = (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
-  const CGFloat constrainedHeight = (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX: height;
+    YGMeasureMode heightMode) {
+  const CGFloat constrainedWidth =
+      (widthMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : width;
+  const CGFloat constrainedHeight =
+      (heightMode == YGMeasureModeUndefined) ? CGFLOAT_MAX : height;

  UIView* view = (__bridge UIView*)YGNodeGetContext(node);
  CGSize sizeThatFits = CGSizeZero;
@@ -350,16 +369,17 @@ static YGSize YGMeasureView(
  }

  return (YGSize){
-    .width = YGSanitizeMeasurement(constrainedWidth, sizeThatFits.width, widthMode),
-    .height = YGSanitizeMeasurement(constrainedHeight, sizeThatFits.height, heightMode),
+      .width = YGSanitizeMeasurement(
+          constrainedWidth, sizeThatFits.width, widthMode),
+      .height = YGSanitizeMeasurement(
+          constrainedHeight, sizeThatFits.height, heightMode),
  };
 }

 static CGFloat YGSanitizeMeasurement(
    CGFloat constrainedSize,
    CGFloat measuredSize,
-  YGMeasureMode measureMode)
-{
+    YGMeasureMode measureMode) {
  CGFloat result;
  if (measureMode == YGMeasureModeExactly) {
    result = constrainedSize;
@@ -372,8 +392,9 @@ static CGFloat YGSanitizeMeasurement(
  return result;
 }

-static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *subviews)
-{
+static BOOL YGNodeHasExactSameChildren(
+    const YGNodeRef node,
+    NSArray<UIView*>* subviews) {
  if (YGNodeGetChildCount(node) != subviews.count) {
    return NO;
  }
@@ -387,8 +408,7 @@ static BOOL YGNodeHasExactSameChildren(const YGNodeRef node, NSArray<UIView *> *
  return YES;
 }

-static void YGAttachNodesFromViewHierachy(UIView *const view)
-{
+static void YGAttachNodesFromViewHierachy(UIView* const view) {
  YGLayout* const yoga = view.yoga;
  const YGNodeRef node = yoga.node;

@@ -399,7 +419,8 @@ static void YGAttachNodesFromViewHierachy(UIView *const view)
  } else {
    YGNodeSetMeasureFunc(node, NULL);

-    NSMutableArray<UIView *> *subviewsToInclude = [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
+    NSMutableArray<UIView*>* subviewsToInclude =
+        [[NSMutableArray alloc] initWithCapacity:view.subviews.count];
    for (UIView* subview in view.subviews) {
      if (subview.yoga.isEnabled && subview.yoga.isIncludedInLayout) {
        [subviewsToInclude addObject:subview];
@@ -419,8 +440,7 @@ static void YGAttachNodesFromViewHierachy(UIView *const view)
  }
 }

-static void YGRemoveAllChildren(const YGNodeRef node)
-{
+static void YGRemoveAllChildren(const YGNodeRef node) {
  if (node == NULL) {
    return;
  }
@@ -428,8 +448,7 @@ 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, ^() {
@@ -439,9 +458,10 @@ static CGFloat YGRoundPixelValue(CGFloat value)
  return roundf(value * scale) / scale;
 }

-static void YGApplyLayoutToViewHierarchy(UIView *view, BOOL preserveOrigin)
-{
-  NSCAssert([NSThread isMainThread], @"Framesetting should only be done on the main thread.");
+static void YGApplyLayoutToViewHierarchy(UIView* view, BOOL preserveOrigin) {
+  NSCAssert(
+      [NSThread isMainThread],
+      @"Framesetting should only be done on the main thread.");

  const YGLayout* yoga = view.yoga;

@@ -462,13 +482,17 @@ static void YGApplyLayoutToViewHierarchy(UIView *view, BOOL preserveOrigin)

  const CGPoint origin = preserveOrigin ? view.frame.origin : CGPointZero;
  view.frame = (CGRect){
-    .origin = {
+      .origin =
+          {
              .x = YGRoundPixelValue(topLeft.x + origin.x),
              .y = YGRoundPixelValue(topLeft.y + origin.y),
          },
-    .size = {
-      .width = YGRoundPixelValue(bottomRight.x) - YGRoundPixelValue(topLeft.x),
-      .height = YGRoundPixelValue(bottomRight.y) - YGRoundPixelValue(topLeft.y),
+      .size =
+          {
+              .width = YGRoundPixelValue(bottomRight.x) -
+                  YGRoundPixelValue(topLeft.x),
+              .height = YGRoundPixelValue(bottomRight.y) -
+                  YGRoundPixelValue(topLeft.y),
          },
  };

--- a/YogaKit/Source/YGLayoutExtensions.swift
+++ b/YogaKit/Source/YGLayoutExtensions.swift
@@ -1,10 +1,11 @@
-/**
+/*
 * 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 {
--- a/YogaKit/Tests/YogaKitTests.m
+++ b/YogaKit/Tests/YogaKitTests.m
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -16,15 +16,13 @@

@implementation YogaKitTests

- (void)testConfigureLayoutIsNoOpWithNilBlock
-{
+- (void)testConfigureLayoutIsNoOpWithNilBlock {
  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) {
    XCTAssertNotNil(layout);
@@ -36,8 +34,7 @@
  XCTAssertEqual(view.yoga.width.value, 25);
 }

- (void)testNodesAreDeallocedWithSingleView
-{
+- (void)testNodesAreDeallocedWithSingleView {
  __weak YGLayout* layoutRef = nil;

  @autoreleasepool {
@@ -53,8 +50,7 @@
  XCTAssertNil(layoutRef);
 }

- (void)testNodesAreDeallocedCascade
-{
+- (void)testNodesAreDeallocedCascade {
  __weak YGLayout* topLayout = nil;
  __weak YGLayout* subviewLayout = nil;

@@ -74,8 +70,7 @@
  XCTAssertNil(subviewLayout);
 }

- (void)testIsEnabled
-{
+- (void)testIsEnabled {
  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
  XCTAssertFalse(view.yoga.isEnabled);

@@ -86,23 +81,24 @@
  XCTAssertFalse(view.yoga.isEnabled);
 }

- (void)testSizeThatFitsAsserts
-{
+- (void)testSizeThatFitsAsserts {
  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
-  dispatch_sync(dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL), ^(void){
+  dispatch_sync(
+      dispatch_queue_create("com.facebook.Yoga.testing", DISPATCH_QUEUE_SERIAL),
+      ^(void) {
        XCTAssertThrows(view.yoga.intrinsicSize);
      });
 }

- (void)testSizeThatFitsSmoke
-{
+- (void)testSizeThatFitsSmoke {
  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
  container.yoga.isEnabled = YES;
  container.yoga.flexDirection = YGFlexDirectionRow;
  container.yoga.alignItems = YGAlignFlexStart;

  UILabel* longTextLabel = [[UILabel alloc] initWithFrame:CGRectZero];
-  longTextLabel.text = @"This is a very very very very very very very very long piece of text.";
+  longTextLabel.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;
@@ -124,7 +120,9 @@
  const CGSize longTextLabelSize = longTextLabel.yoga.intrinsicSize;

  XCTAssertEqual(longTextLabelSize.height, containerSize.height);
-  XCTAssertEqual(longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width, containerSize.width);
+  XCTAssertEqual(
+      longTextLabelSize.width + textBadgeView.yoga.intrinsicSize.width,
+      containerSize.width);
 }

 - (void)testSizeThatFitsEmptyView {
@@ -136,8 +134,7 @@
  XCTAssertEqual(viewSize.width, 0);
 }

- (void)testPreservingOrigin
-{
+- (void)testPreservingOrigin {
  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 50, 75)];
  container.yoga.isEnabled = YES;

@@ -161,8 +158,7 @@
  XCTAssertEqual(25, view2.frame.origin.y);
 }

- (void)testContainerWithFlexibleWidthGetsCorrectlySized
-{
+- (void)testContainerWithFlexibleWidthGetsCorrectlySized {
  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
  container.yoga.isEnabled = YES;

@@ -172,13 +168,14 @@
  view.yoga.height = YGPointValue(100);
  [container addSubview:view];

-  [container.yoga applyLayoutPreservingOrigin:YES dimensionFlexibility:YGDimensionFlexibilityFlexibleWidth];
+  [container.yoga
+      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)];
  container.yoga.isEnabled = YES;

@@ -195,8 +192,7 @@
  XCTAssertEqual(100, container.frame.size.height);
 }

- (void)testContainerWithFlexibleWidthAndHeightGetsCorrectlySized
-{
+- (void)testContainerWithFlexibleWidthAndHeightGetsCorrectlySized {
  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 200, 200)];
  container.yoga.isEnabled = YES;

@@ -214,8 +210,7 @@
  XCTAssertEqual(100, container.frame.size.height);
 }

- (void)testMarkingDirtyOnlyWorksOnLeafNodes
-{
+- (void)testMarkingDirtyOnlyWorksOnLeafNodes {
  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
  container.yoga.isEnabled = YES;

@@ -232,8 +227,7 @@
  XCTAssertTrue(subview.yoga.isDirty);
 }

- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation
-{
+- (void)testThatMarkingLeafsAsDirtyWillTriggerASizeRecalculation {
  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 500, 50)];
  container.yoga.isEnabled = YES;
  container.yoga.flexDirection = YGFlexDirectionRow;
@@ -257,11 +251,12 @@
  XCTAssertFalse(CGSizeEqualToSize(view.frame.size, viewSizeAfterFirstPass));
 }

- (void)testFrameAndOriginPlacement
-{
+- (void)testFrameAndOriginPlacement {
  const CGSize containerSize = CGSizeMake(320, 50);

-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
+  UIView* container = [[UIView alloc]
+      initWithFrame:CGRectMake(
+                        0, 0, containerSize.width, containerSize.height)];
  container.yoga.isEnabled = YES;
  container.yoga.flexDirection = YGFlexDirectionRow;

@@ -282,22 +277,30 @@

  [container.yoga applyLayoutPreservingOrigin:YES];

-  XCTAssertEqualWithAccuracy(subview2.frame.origin.x, CGRectGetMaxX(subview1.frame), FLT_EPSILON);
-  XCTAssertEqualWithAccuracy(subview3.frame.origin.x, CGRectGetMaxX(subview2.frame), FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(
+      subview2.frame.origin.x, CGRectGetMaxX(subview1.frame), FLT_EPSILON);
+  XCTAssertEqualWithAccuracy(
+      subview3.frame.origin.x, CGRectGetMaxX(subview2.frame), FLT_EPSILON);

  CGFloat totalWidth = 0;
  for (UIView* view in container.subviews) {
    totalWidth += view.bounds.size.width;
  }

-  XCTAssertEqual(containerSize.width, totalWidth, @"The container's width is %.6f, the subviews take up %.6f", containerSize.width, totalWidth);
+  XCTAssertEqual(
+      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] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
+  UIView* container = [[UIView alloc]
+      initWithFrame:CGRectMake(
+                        0, 0, containerSize.width, containerSize.height)];
  container.yoga.isEnabled = YES;
  container.yoga.flexDirection = YGFlexDirectionRow;

@@ -333,11 +336,12 @@
  XCTAssertTrue(CGRectEqualToRect(subview2.frame, CGRectMake(100, 0, 100, 50)));
 }

- (void)testThatWeRespectIncludeInLayoutFlag
-{
+- (void)testThatWeRespectIncludeInLayoutFlag {
  const CGSize containerSize = CGSizeMake(300, 50);

-  UIView *container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, containerSize.width, containerSize.height)];
+  UIView* container = [[UIView alloc]
+      initWithFrame:CGRectMake(
+                        0, 0, containerSize.width, containerSize.height)];
  container.yoga.isEnabled = YES;
  container.yoga.flexDirection = YGFlexDirectionRow;

@@ -368,12 +372,12 @@
  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 previously at.
+  // We don't set the frame to zero, so, it should be set to what it was
+  // previously at.
  XCTAssertEqual(subview3.bounds.size.width, 100);
 }

- (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews
-{
+- (void)testThatNumberOfChildrenIsCorrectWhenWeIgnoreSubviews {
  UIView* container = [[UIView alloc] initWithFrame:CGRectZero];
  container.yoga.isEnabled = YES;
  container.yoga.flexDirection = YGFlexDirectionRow;
@@ -401,8 +405,7 @@
  XCTAssertEqual(container.yoga.numberOfChildren, 2);
 }

- (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond
-{
+- (void)testThatViewNotIncludedInFirstLayoutPassAreIncludedInSecond {
  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
  container.yoga.isEnabled = YES;
  container.yoga.flexDirection = YGFlexDirectionRow;
@@ -437,8 +440,7 @@
  XCTAssertEqual(subview3.bounds.size.width, 100);
 }

- (void)testIsLeafFlag
-{
+- (void)testIsLeafFlag {
  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];
  XCTAssertTrue(view.yoga.isLeaf);

@@ -458,8 +460,7 @@
  XCTAssertFalse(view.yoga.isLeaf);
 }

- (void)testThatWeCorrectlyAttachNestedViews
-{
+- (void)testThatWeCorrectlyAttachNestedViews {
  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
  container.yoga.isEnabled = YES;
  container.yoga.flexDirection = YGFlexDirectionColumn;
@@ -516,8 +517,7 @@
  }
 }

- (void)testThatANonLeafNodeCanBecomeALeafNode
-{
+- (void)testThatANonLeafNodeCanBecomeALeafNode {
  UIView* container = [[UIView alloc] initWithFrame:CGRectMake(0, 0, 300, 50)];
  container.yoga.isEnabled = YES;

@@ -534,16 +534,14 @@
  [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];

  view.yoga.left = YGPointValue(1);
@@ -589,8 +587,7 @@
  XCTAssertEqual(view.yoga.end.unit, YGUnitPercent);
 }

- (void)testMarginPropertiesWork
-{
+- (void)testMarginPropertiesWork {
  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];

  view.yoga.margin = YGPointValue(1);
@@ -657,8 +654,7 @@
  XCTAssertEqual(view.yoga.marginEnd.unit, YGUnitPercent);
 }

- (void)testPaddingPropertiesWork
-{
+- (void)testPaddingPropertiesWork {
  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];

  view.yoga.padding = YGPointValue(1);
@@ -725,8 +721,7 @@
  XCTAssertEqual(view.yoga.paddingEnd.unit, YGUnitPercent);
 }

- (void)testBorderWidthPropertiesWork
-{
+- (void)testBorderWidthPropertiesWork {
  UIView* view = [[UIView alloc] initWithFrame:CGRectZero];

  view.yoga.borderWidth = 1;
--- a/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift
@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */

 import Foundation
--- a/YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift
@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */

 import UIKit
--- a/YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift
@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */

 import UIKit
--- a/YogaKit/YogaKitSample/YogaKitSample/ViewController.m
+++ b/YogaKit/YogaKitSample/YogaKitSample/ViewController.m
@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */

 #import "ViewController.h"
@@ -12,8 +11,7 @@

@implementation ViewController

- (void)viewDidLoad
-{
+- (void)viewDidLoad {
  UIView* root = self.view;
  root.backgroundColor = [UIColor redColor];
  root.yoga.isEnabled = YES;
@@ -34,8 +32,7 @@
      .size = {
          .width = 200,
          .height = 100,
-        }
-    };
+      }};

  UIView* child3 = [UIView new];
  child3.backgroundColor = [UIColor yellowColor];
@@ -43,8 +40,7 @@
      .size = {
          .width = 100,
          .height = 100,
-        }
-    };
+      }};

  [child2 addSubview:child3];
  [root addSubview:child1];
@@ -52,5 +48,4 @@
  [root.yoga applyLayoutPreservingOrigin:NO];
 }

-
@end
--- a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift
@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */

 import UIKit
--- a/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift
@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */

 import UIKit
--- a/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift
+++ b/YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift
@@ -1,9 +1,8 @@
-/**
- * Copyright 2014-present, Facebook, Inc.
- * All rights reserved.
+/*
+ * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */

 import UIKit
--- a/android/BUCK
+++ b/android/BUCK
@@ -3,10 +3,11 @@
 # 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")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "JAVA_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")

 yoga_android_aar(
    name = "android",
+    enable_relinker = True,
    manifest_skeleton = "src/main/AndroidManifest.xml",
    visibility = [
        "PUBLIC",
@@ -14,9 +15,8 @@ yoga_android_aar(
    deps = [
        ANDROID_JAVA_TARGET,
        ANDROID_RES_TARGET,
-        INFER_ANNOTATIONS_TARGET,
        JAVA_TARGET,
-        PROGRUARD_ANNOTATIONS_TARGET,
+        PROGUARD_ANNOTATIONS_TARGET,
    ],
 )

--- a/android/build.gradle
+++ b/android/build.gradle
@@ -1,21 +1,16 @@
-/**
+/*
 * 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.
 */

-apply plugin: 'com.jfrog.bintray'
 apply plugin: 'com.android.library'
-apply plugin: 'com.github.dcendents.android-maven'
-apply plugin: 'maven-publish'
-
-version = VERSION_NAME
-group = GROUP

 android {
    compileSdkVersion rootProject.compileSdkVersion
    buildToolsVersion rootProject.buildToolsVersion
+    ndkVersion rootProject.ndkVersion

    defaultConfig {
        minSdkVersion rootProject.minSdkVersion
@@ -32,21 +27,10 @@ dependencies {
    api project(':yoga')
 }

-task sourcesJar(type: Jar) {
-    classifier = 'source'
-    from android.sourceSets.main.java.srcDirs
+// We don't build Javadoc at this time as we can't disable "BUCK" files
+// from mistakenly getting parsed as Java.
+tasks.withType(Javadoc).all {
+  enabled = false
 }

-task javadoc(type: Javadoc) {
-    failOnError false
-    source = android.sourceSets.main.java.sourceFiles
-    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-    classpath += configurations.compile
-}
-
-task javadocJar(type: Jar, dependsOn: javadoc) {
-    classifier = 'javadoc'
-    from javadoc.destinationDir
-}
-
-apply from: rootProject.file('gradle/release.gradle')
+apply plugin: 'com.vanniktech.maven.publish'
--- a/android/sample/java/com/facebook/samples/yoga/BUCK
+++ b/android/sample/java/com/facebook/samples/yoga/BUCK
@@ -8,6 +8,7 @@ load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_SAM
 yoga_android_library(
    name = "yoga",
    srcs = glob(["**/*.java"]),
+    autoglob = False,
    visibility = [
        "PUBLIC",
    ],
--- a/android/sample/java/com/facebook/samples/yoga/BenchmarkActivity.java
+++ b/android/sample/java/com/facebook/samples/yoga/BenchmarkActivity.java
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 package com.facebook.samples.yoga;

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

 import java.io.File;
--- a/android/sample/java/com/facebook/samples/yoga/BenchmarkFragment.java
+++ b/android/sample/java/com/facebook/samples/yoga/BenchmarkFragment.java
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 package com.facebook.samples.yoga;


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

 import android.os.Bundle;
--- a/android/sample/java/com/facebook/samples/yoga/BenchmarkLayout.java
+++ b/android/sample/java/com/facebook/samples/yoga/BenchmarkLayout.java
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 package com.facebook.samples.yoga;

 import android.os.Bundle;
--- a/android/sample/java/com/facebook/samples/yoga/BenchmarkMeasure.java
+++ b/android/sample/java/com/facebook/samples/yoga/BenchmarkMeasure.java
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 package com.facebook.samples.yoga;

 import android.os.Bundle;
--- a/android/sample/java/com/facebook/samples/yoga/MainActivity.java
+++ b/android/sample/java/com/facebook/samples/yoga/MainActivity.java
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 package com.facebook.samples.yoga;

 import android.content.Intent;
--- a/android/src/main/java/com/facebook/yoga/android/BUCK
+++ b/android/src/main/java/com/facebook/yoga/android/BUCK
@@ -8,6 +8,7 @@ load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_RES_TARGET", "INFER_ANNOTA
 yoga_android_library(
    name = "android",
    srcs = glob(["**/*.java"]),
+    autoglob = False,
    visibility = [
        "PUBLIC",
    ],
--- a/android/src/main/java/com/facebook/yoga/android/VirtualYogaLayout.java
+++ b/android/src/main/java/com/facebook/yoga/android/VirtualYogaLayout.java
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 package com.facebook.yoga.android;

 import java.util.HashMap;
@@ -17,6 +18,7 @@ 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
@@ -32,7 +34,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 = YogaNode.create();
+  final private YogaNode mYogaNode = YogaNodeFactory.create();

  public VirtualYogaLayout(Context context) {
    super(context);
@@ -72,7 +74,7 @@ public class VirtualYogaLayout extends ViewGroup {
      return;
    }

-    YogaNode node = YogaNode.create();
+    YogaNode node = YogaNodeFactory.create();
    YogaLayout.LayoutParams lp = new YogaLayout.LayoutParams(params);
    YogaLayout.applyLayoutParams(lp, node, child);
    node.setData(child);
--- a/android/src/main/java/com/facebook/yoga/android/YogaLayout.java
+++ b/android/src/main/java/com/facebook/yoga/android/YogaLayout.java
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 package com.facebook.yoga.android;

 import android.content.Context;
@@ -28,6 +29,7 @@ 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;
@@ -77,7 +79,7 @@ public class YogaLayout extends ViewGroup {
  public YogaLayout(Context context, AttributeSet attrs, int defStyleAttr) {
    super(context, attrs, defStyleAttr);

-    mYogaNode = YogaNode.create();
+    mYogaNode = YogaNodeFactory.create();
    mYogaNodes = new HashMap<>();

    mYogaNode.setData(this);
@@ -154,7 +156,7 @@ public class YogaLayout extends ViewGroup {
      if(mYogaNodes.containsKey(child)) {
        childNode = mYogaNodes.get(child);
      } else {
-        childNode = YogaNode.create();
+        childNode = YogaNodeFactory.create();
      }

      childNode.setData(child);
--- a/android/src/main/java/com/facebook/yoga/android/YogaViewLayoutFactory.java
+++ b/android/src/main/java/com/facebook/yoga/android/YogaViewLayoutFactory.java
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 package com.facebook.yoga.android;

 import android.content.Context;
--- a/benchmark/YGBenchmark.c
+++ b/benchmark/YGBenchmark.c
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 #include <math.h>
 #include <stdint.h>
 #include <stdio.h>
--- a/build.gradle
+++ b/build.gradle
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
@@ -10,14 +10,11 @@
 buildscript {
    repositories {
        google()
-        jcenter()
-        maven { url 'https://maven.google.com/' }
+        mavenCentral()
    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.0'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
-
+        classpath 'com.android.tools.build:gradle:4.2.1'
+        classpath 'com.vanniktech:gradle-maven-publish-plugin:0.15.1'
        // NOTE: Do not place your application dependencies here; they belong
        // in the individual module build.gradle files
    }
@@ -26,15 +23,16 @@ buildscript {
 allprojects {
  repositories {
    google()
-    jcenter()
+    mavenCentral()
  }
 }

 ext {
    minSdkVersion = 14
-    targetSdkVersion = 25
-    compileSdkVersion = 26
-    buildToolsVersion = '26.0.2'
+    targetSdkVersion = 29
+    compileSdkVersion = 29
+    buildToolsVersion = '30.0.2'
+    ndkVersion = '21.3.6528147'
    sourceCompatibilityVersion = JavaVersion.VERSION_1_7
    targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }
--- a/csharp/Facebook.Yoga/MeasureOutput.cs
+++ b/csharp/Facebook.Yoga/MeasureOutput.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/Native.cs
+++ b/csharp/Facebook.Yoga/Native.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YGConfigHandle.cs
+++ b/csharp/Facebook.Yoga/YGConfigHandle.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YGNodeHandle.cs
+++ b/csharp/Facebook.Yoga/YGNodeHandle.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaAlign.cs
+++ b/csharp/Facebook.Yoga/YogaAlign.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaConfig.cs
+++ b/csharp/Facebook.Yoga/YogaConfig.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaConstants.cs
+++ b/csharp/Facebook.Yoga/YogaConstants.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaDimension.cs
+++ b/csharp/Facebook.Yoga/YogaDimension.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaDirection.cs
+++ b/csharp/Facebook.Yoga/YogaDirection.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaDisplay.cs
+++ b/csharp/Facebook.Yoga/YogaDisplay.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaEdge.cs
+++ b/csharp/Facebook.Yoga/YogaEdge.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaExperimentalFeature.cs
+++ b/csharp/Facebook.Yoga/YogaExperimentalFeature.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaFlexDirection.cs
+++ b/csharp/Facebook.Yoga/YogaFlexDirection.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaJustify.cs
+++ b/csharp/Facebook.Yoga/YogaJustify.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaLogLevel.cs
+++ b/csharp/Facebook.Yoga/YogaLogLevel.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaMeasureMode.cs
+++ b/csharp/Facebook.Yoga/YogaMeasureMode.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaNode.Spacing.cs
+++ b/csharp/Facebook.Yoga/YogaNode.Spacing.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaNode.cs
+++ b/csharp/Facebook.Yoga/YogaNode.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaNodeType.cs
+++ b/csharp/Facebook.Yoga/YogaNodeType.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaOverflow.cs
+++ b/csharp/Facebook.Yoga/YogaOverflow.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaPositionType.cs
+++ b/csharp/Facebook.Yoga/YogaPositionType.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaPrintOptions.cs
+++ b/csharp/Facebook.Yoga/YogaPrintOptions.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaUnit.cs
+++ b/csharp/Facebook.Yoga/YogaUnit.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaValue.cs
+++ b/csharp/Facebook.Yoga/YogaValue.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaValueExtensions.cs
+++ b/csharp/Facebook.Yoga/YogaValueExtensions.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Facebook.Yoga/YogaWrap.cs
+++ b/csharp/Facebook.Yoga/YogaWrap.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/Mac/run-tests.sh
+++ b/csharp/Mac/run-tests.sh
@@ -1,10 +1,7 @@
 #!/bin/sh
-
-#
 # 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.
-#

 ./csharp/Mac/Facebook.Yoga.Mac.Tests/bin/Release/Facebook.Yoga.Mac.Tests.app/Contents/MacOS/Facebook.Yoga.Mac.Tests
--- a/csharp/Windows/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs
+++ b/csharp/Windows/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs
@@ -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.
+ */
+
 using System;
 using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 using Facebook.Yoga;
--- a/csharp/Yoga/YGInterop.cpp
+++ b/csharp/Yoga/YGInterop.cpp
@@ -1,14 +1,16 @@
 /*
 * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 #include "YGInterop.h"

 static YGInteropLogger gManagedLogger;

-static int unmanagedLogger(const YGConfigRef config,
+static int unmanagedLogger(
+    const YGConfigRef config,
    const YGNodeRef node,
    YGLogLevel level,
    const char* format,
--- a/csharp/Yoga/YGInterop.h
+++ b/csharp/Yoga/YGInterop.h
@@ -1,16 +1,18 @@
 /*
 * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 #pragma once

 #include <yoga/Yoga.h>

 YG_EXTERN_C_BEGIN

-typedef int (*YGInteropLogger)(const void *unmanagedConfigPtr,
+typedef int (*YGInteropLogger)(
+    const void* unmanagedConfigPtr,
    const void* unmanagedNodePtr,
    YGLogLevel level,
    const char* message);
--- a/csharp/Yoga/Yoga.vcxproj
+++ b/csharp/Yoga/Yoga.vcxproj
@@ -36,7 +36,7 @@
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
@@ -48,7 +48,7 @@
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <PlatformToolset>v141</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -62,13 +62,13 @@
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>true</UseDebugLibraries>
    <PlatformToolset>v141</PlatformToolset>
    <CharacterSet>Unicode</CharacterSet>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
-    <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <ConfigurationType>StaticLibrary</ConfigurationType>
    <UseDebugLibraries>false</UseDebugLibraries>
    <PlatformToolset>v141</PlatformToolset>
    <WholeProgramOptimization>true</WholeProgramOptimization>
@@ -227,6 +227,8 @@
    </Link>
  </ItemDefinitionGroup>
  <ItemGroup>
+    <ClInclude Include="..\..\yoga\event\event.h" />
+    <ClInclude Include="..\..\yoga\log.h" />
    <ClInclude Include="..\..\yoga\Utils.h" />
    <ClInclude Include="..\..\yoga\YGConfig.h" />
    <ClInclude Include="..\..\yoga\YGEnums.h" />
@@ -236,6 +238,7 @@
    <ClInclude Include="..\..\yoga\YGNode.h" />
    <ClInclude Include="..\..\yoga\YGNodePrint.h" />
    <ClInclude Include="..\..\yoga\YGStyle.h" />
+    <ClInclude Include="..\..\yoga\YGValue.h" />
    <ClInclude Include="..\..\yoga\Yoga-internal.h" />
    <ClInclude Include="..\..\yoga\Yoga.h" />
    <ClInclude Include="resource.h" />
@@ -243,14 +246,16 @@
    <ClInclude Include="targetver.h" />
  </ItemGroup>
  <ItemGroup>
+    <ClCompile Include="..\..\yoga\event\event.cpp" />
+    <ClCompile Include="..\..\yoga\log.cpp" />
    <ClCompile Include="..\..\yoga\Utils.cpp" />
    <ClCompile Include="..\..\yoga\YGConfig.cpp" />
    <ClCompile Include="..\..\yoga\YGEnums.cpp" />
-    <ClCompile Include="..\..\yoga\YGFloatOptional.cpp" />
    <ClCompile Include="..\..\yoga\YGLayout.cpp" />
    <ClCompile Include="..\..\yoga\YGNode.cpp" />
    <ClCompile Include="..\..\yoga\YGNodePrint.cpp" />
    <ClCompile Include="..\..\yoga\YGStyle.cpp" />
+    <ClCompile Include="..\..\yoga\YGValue.cpp" />
    <ClCompile Include="..\..\yoga\Yoga.cpp" />
    <ClCompile Include="YGInterop.cpp" />
    <ClCompile Include="dllmain.cpp">
--- a/csharp/Yoga/Yoga.vcxproj.filters
+++ b/csharp/Yoga/Yoga.vcxproj.filters
@@ -57,6 +57,15 @@
    <ClInclude Include="..\..\yoga\YGConfig.h">
      <Filter>Header Files</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\yoga\YGValue.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\yoga\log.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\yoga\event\event.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="stdafx.cpp">
@@ -74,9 +83,6 @@
    <ClCompile Include="..\..\yoga\YGEnums.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\yoga\YGFloatOptional.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\yoga\YGLayout.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@@ -95,6 +101,15 @@
    <ClCompile Include="..\..\yoga\YGConfig.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\yoga\YGValue.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\event\event.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\yoga\log.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="Yoga.rc">
--- a/csharp/Yoga/dllmain.cpp
+++ b/csharp/Yoga/dllmain.cpp
@@ -1,13 +1,15 @@
 /*
 * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 // dllmain.cpp : Defines the entry point for the DLL application.
 #include "stdafx.h"

-BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
+BOOL APIENTRY
+DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserved) {
  switch (ul_reason_for_call) {
    case DLL_PROCESS_ATTACH:
    case DLL_THREAD_ATTACH:
--- a/csharp/Yoga/resource.h
+++ b/csharp/Yoga/resource.h
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by Yoga.rc
--- a/csharp/Yoga/stdafx.cpp
+++ b/csharp/Yoga/stdafx.cpp
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 // stdafx.cpp : source file that includes just the standard includes
 // Yoga.pch will be the pre-compiled header
 // stdafx.obj will contain the pre-compiled type information
--- a/csharp/Yoga/stdafx.h
+++ b/csharp/Yoga/stdafx.h
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 // stdafx.h : include file for standard system include files,
 // or project specific include files that are used frequently, but
 // are changed infrequently
--- a/csharp/Yoga/targetver.h
+++ b/csharp/Yoga/targetver.h
@@ -1,14 +1,16 @@
 /*
 * 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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 #pragma once

 // Including SDKDDKVer.h defines the highest available Windows platform.

-// If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
-// set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
+// If you wish to build your application for a previous Windows platform,
+// include WinSDKVer.h and set the _WIN32_WINNT macro to the platform you wish
+// to support before including SDKDDKVer.h.

 #include <SDKDDKVer.h>
--- a/csharp/build-native.sh
+++ b/csharp/build-native.sh
@@ -1,11 +1,8 @@
 #!/bin/sh
-
-#
 # 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.
-#

 cd `dirname "$0"`
 echo $ANDROID_SDK
--- a/csharp/tests/Facebook.Yoga/YGAlignBaselineTest.cs
+++ b/csharp/tests/Facebook.Yoga/YGAlignBaselineTest.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/tests/Facebook.Yoga/YGDisplayTest.cs
+++ b/csharp/tests/Facebook.Yoga/YGDisplayTest.cs
@@ -1,9 +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.
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
 */
+
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGDisplayTest.html

 using System;
@@ -333,5 +334,47 @@ namespace Facebook.Yoga
            Assert.AreEqual(0f, root_child1.LayoutHeight);
        }

+        [Test]
+        public void Test_display_none_with_position_absolute()
+        {
+            YogaConfig config = new YogaConfig();
+
+            YogaNode root = new YogaNode(config);
+            root.Width = 100;
+            root.Height = 100;
+
+            YogaNode root_child0 = new YogaNode(config);
+            root_child0.PositionType = YogaPositionType.Absolute;
+            root_child0.Width = 100;
+            root_child0.Height = 100;
+            root_child0.Display = YogaDisplay.None;
+            root.Insert(0, root_child0);
+            root.StyleDirection = YogaDirection.LTR;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+
+            root.StyleDirection = YogaDirection.RTL;
+            root.CalculateLayout();
+
+            Assert.AreEqual(0f, root.LayoutX);
+            Assert.AreEqual(0f, root.LayoutY);
+            Assert.AreEqual(100f, root.LayoutWidth);
+            Assert.AreEqual(100f, root.LayoutHeight);
+
+            Assert.AreEqual(0f, root_child0.LayoutX);
+            Assert.AreEqual(0f, root_child0.LayoutY);
+            Assert.AreEqual(0f, root_child0.LayoutWidth);
+            Assert.AreEqual(0f, root_child0.LayoutHeight);
+        }
+
    }
 }
--- a/csharp/tests/Facebook.Yoga/YogaConfigTest.cs
+++ b/csharp/tests/Facebook.Yoga/YogaConfigTest.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/tests/Facebook.Yoga/YogaNodeSpacingTest.cs
+++ b/csharp/tests/Facebook.Yoga/YogaNodeSpacingTest.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/tests/Facebook.Yoga/YogaNodeTest.cs
+++ b/csharp/tests/Facebook.Yoga/YogaNodeTest.cs
@@ -1,4 +1,4 @@
-/**
+/*
 * Copyright (c) Facebook, Inc. and its affiliates.
 *
 * This source code is licensed under the MIT license found in the
--- a/csharp/tests/Facebook.Yoga/test_macos.sh
+++ b/csharp/tests/Facebook.Yoga/test_macos.sh
@@ -1,4 +1,9 @@
 #!/bin/sh
+# 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.
+
 if mcs --version >/dev/null 2>&1 && mono --version >/dev/null 2>&1; then true; else
  echo "ERROR: Need to install Mono (brew install mono, or http://www.mono-project.com/download/)"
  exit 1
--- a/gentest/fixtures/YGDisplayTest.html
+++ b/gentest/fixtures/YGDisplayTest.html
@@ -25,3 +25,7 @@
 <div style="flex-grow: 1;"></div>
 <div style="flex-grow: 1; display:none; top: 10px;"></div>
 </div>
+
+<div id="display_none_with_position_absolute" style="width: 100px; height: 100px;">
+  <div style="display:none; position: absolute; width: 100px; height: 100px"></div>
+</div>
--- a/gentest/gentest-cs.js
+++ b/gentest/gentest-cs.js
@@ -120,8 +120,9 @@ CSEmitter.prototype = Object.create(Emitter.prototype, {
  YGOverflowHidden:{value:'YogaOverflow.Hidden'},
  YGOverflowVisible:{value:'YogaOverflow.Visible'},

-  YGPositionTypeAbsolute:{value:'YogaPositionType.Absolute'},
+  YGPositionTypeAbsolute:{value:'YogaPositionType.Static'},
  YGPositionTypeRelative:{value:'YogaPositionType.Relative'},
+  YGPositionTypeAbsolute:{value:'YogaPositionType.Absolute'},

  YGUndefined:{value:'YogaConstants.Undefined'},

--- a/gentest/gentest-java.js
+++ b/gentest/gentest-java.js
@@ -72,7 +72,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
    this.push('public void test_' + name + '() {');
    this.pushIndent();

-    this.push("YogaConfig config = new YogaConfig();")
+    this.push("YogaConfig config = YogaConfigFactory.create();")
    for (var i in experiments) {
      this.push('config.setExperimentalFeatureEnabled(YogaExperimentalFeature.' + toJavaUpper(experiments[i]) +', true);');
    }
--- a/gentest/gentest.js
+++ b/gentest/gentest.js
@@ -41,11 +41,11 @@ function assert(condition, message) {

 function printTest(e, LTRContainer, RTLContainer, genericContainer) {
  e.push([
-    '/**',
+    '/*',
    ' * 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.',
+    ' * This source code is licensed under the MIT license found in the',
+    ' * LICENSE file in the root directory of this source tree.',
    ' */',
    '// @Generated by gentest/gentest.rb from gentest/fixtures/' + document.title + '.html',
    '',
--- a/gentest/gentest.rb
+++ b/gentest/gentest.rb
@@ -1,15 +1,20 @@
 #!/usr/bin/env ruby
+# 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.

 require 'watir'
 require 'fileutils'

-caps = Selenium::WebDriver::Remote::Capabilities.chrome(
-  "loggingPrefs"=>{
+browser = Watir::Browser.new(:chrome, "goog:loggingPrefs" => {
    "browser" => "ALL",
    "performance" => "ALL"
-  }
-)
-browser = Watir::Browser.new(:chrome, :desired_capabilities => caps, :switches => ['--force-device-scale-factor=1', '--window-position=0,0'])
+  },
+  "chromeOptions" => {
+    "w3c" => "false"
+  },
+  :switches => ['--force-device-scale-factor=1', '--window-position=0,0'])

 Dir.chdir(File.dirname($0))

--- a/gradle.properties
+++ b/gradle.properties
@@ -9,7 +9,7 @@

 org.gradle.jvmargs=-Xmx1536M

-VERSION_NAME=1.16.0
+VERSION_NAME=1.19.0
 POM_URL=https://github.com/facebook/yoga
 POM_SCM_URL=https://github.com/facebook/yoga.git
 POM_SCM_CONNECTION=scm:git:https://github.com/facebook/yoga.git
@@ -17,5 +17,8 @@ POM_SCM_DEV_CONNECTION=scm:git:git@github.com:facebook/yoga.git
 POM_LICENSE_NAME=MIT License
 POM_LICENSE_URL=https://github.com/facebook/yoga/blob/master/LICENSE
 POM_LICENSE_DIST=repo
+POM_LICENCE_NAME=MIT License
+POM_LICENCE_URL=https://github.com/facebook/yoga/blob/master/LICENSE
+POM_LICENCE_DIST=repo
 POM_DEVELOPER_ID=facebook
 POM_DEVELOPER_NAME=facebook
--- a/gradle/android-maven-install.gradle
+++ b/gradle/android-maven-install.gradle
@@ -1,37 +0,0 @@
-// Configure the Android maven publication
-
-apply plugin: 'com.github.dcendents.android-maven'
-
-version = VERSION_NAME
-group = GROUP
-// Set the .aar / .jar base file name to match the artifact ID
-// in case the module has a different name
-project.archivesBaseName = POM_ARTIFACT_ID
-
-install {
-    repositories.mavenInstaller {
-        // This generates POM.xml with proper parameters
-        pom.project {
-            name POM_NAME
-            artifactId POM_ARTIFACT_ID
-            packaging POM_PACKAGING
-            description POM_DESCRIPTION
-            url projectUrl
-
-            scm {
-                url scmUrl
-                connection scmConnection
-                developerConnection scmDeveloperConnection
-            }
-
-            licenses projectLicenses
-
-            developers {
-                developer {
-                    id developerId
-                    name developerName
-                }
-            }
-        }
-    }
-}
--- a/gradle/android-tasks.gradle
+++ b/gradle/android-tasks.gradle
@@ -1,47 +0,0 @@
-// Android tasks for Javadoc and sources.jar generation
-
-afterEvaluate { project ->
-    if (POM_PACKAGING == 'aar') {
-        task androidJavadoc(type: Javadoc) {
-            source = android.sourceSets.main.java.srcDirs
-            exclude '**/pom.xml'
-            exclude '**/proguard_annotations.pro'
-            classpath += files(android.bootClasspath)
-        }
-
-        task androidJavadocJar(type: Jar) {
-            classifier = 'javadoc'
-            from androidJavadoc.destinationDir
-        }
-
-        task androidSourcesJar(type: Jar) {
-            classifier = 'sources'
-            from android.sourceSets.main.java.srcDirs
-        }
-
-        android.libraryVariants.all { variant ->
-            def name = variant.name.capitalize()
-            task "jar${name}"(type: Jar, dependsOn: variant.javaCompile) {
-                from variant.javaCompile.destinationDir
-            }
-        }
-
-        artifacts.add('archives', androidJavadocJar)
-        artifacts.add('archives', androidSourcesJar)
-    }
-
-    if (POM_PACKAGING == 'jar') {
-        task javadocJar(type: Jar, dependsOn: javadoc) {
-            classifier = 'javadoc'
-            from javadoc.destinationDir
-        }
-
-        task sourcesJar(type: Jar, dependsOn: classes) {
-            classifier = 'sources'
-            from sourceSets.main.allSource
-        }
-
-        artifacts.add('archives', javadocJar)
-        artifacts.add('archives', sourcesJar)
-    }
-}
--- a/gradle/bintray.gradle
+++ b/gradle/bintray.gradle
@@ -1,63 +0,0 @@
-// Upload to Bintray
-apply plugin: 'com.jfrog.bintray'
-
-def getBintrayUsername() {
-    return project.hasProperty('bintrayUsername') ? property('bintrayUsername') : System.getenv('BINTRAY_USERNAME')
-}
-
-def getBintrayApiKey() {
-    return project.hasProperty('bintrayApiKey') ? property('bintrayApiKey') : System.getenv('BINTRAY_API_KEY')
-}
-
-def getBintrayGpgPassword() {
-    return project.hasProperty('bintrayGpgPassword') ? property('bintrayGpgPassword') : System.getenv('BINTRAY_GPG_PASSWORD')
-}
-
-def getMavenCentralUsername() {
-    return project.hasProperty('mavenCentralUsername') ? property('mavenCentralUsername') : System.getenv('MAVEN_CENTRAL_USERNAME')
-}
-
-def getMavenCentralPassword() {
-    return project.hasProperty('mavenCentralPassword') ? property('mavenCentralPassword') : System.getenv('MAVEN_CENTRAL_PASSWORD')
-}
-
-def shouldSyncWithMavenCentral() {
-    return project.hasProperty('syncWithMavenCentral') ? property('syncWithMavenCentral').toBoolean() : false
-}
-
-def dryRunOnly() {
-    return project.hasProperty('dryRun') ? property('dryRun').toBoolean() : false
-}
-
-bintray {
-    user = getBintrayUsername()
-    key = getBintrayApiKey()
-    configurations = ['archives']
-    pkg {
-        repo = bintrayRepo
-        userOrg =  bintrayUserOrg
-        name = bintrayName
-        desc = bintrayDescription
-        websiteUrl = projectUrl
-        issueTrackerUrl = issuesUrl
-        vcsUrl = scmUrl
-        licenses = projectLicenses
-        dryRun = dryRunOnly()
-        override = true
-        publish = true
-        publicDownloadNumbers = true
-        version {
-            desc = bintrayDescription
-            gpg {
-                sign = true
-                passphrase = getBintrayGpgPassword()
-            }
-            mavenCentralSync {
-                sync = shouldSyncWithMavenCentral()
-                user = getMavenCentralUsername()
-                password = getMavenCentralPassword()
-                close = '1' // If set to 0, you have to manually click release
-            }
-        }
-    }
-}
--- a/gradle/gradle-mvn-push.gradle
+++ b/gradle/gradle-mvn-push.gradle
@@ -1,96 +0,0 @@
-/*
- * Copyright 2013 Chris Banes
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-apply plugin: 'signing'
-
-version = VERSION_NAME
-group = GROUP
-
-def isReleaseBuild() {
-  return VERSION_NAME.contains('SNAPSHOT') == false
-}
-
-def getReleaseRepositoryUrl() {
-  return hasProperty('RELEASE_REPOSITORY_URL') ? RELEASE_REPOSITORY_URL
-      : "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
-}
-
-def getSnapshotRepositoryUrl() {
-  return hasProperty('SNAPSHOT_REPOSITORY_URL') ? SNAPSHOT_REPOSITORY_URL
-      : "https://oss.sonatype.org/content/repositories/snapshots/"
-}
-
-def getRepositoryUsername() {
-  return hasProperty('SONATYPE_NEXUS_USERNAME') ? SONATYPE_NEXUS_USERNAME : ""
-}
-
-def getRepositoryPassword() {
-  return hasProperty('SONATYPE_NEXUS_PASSWORD') ? SONATYPE_NEXUS_PASSWORD : ""
-}
-
-afterEvaluate { project ->
-  uploadArchives {
-    repositories {
-      mavenDeployer {
-        beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
-
-        pom.groupId = GROUP
-        pom.artifactId = POM_ARTIFACT_ID
-        pom.version = VERSION_NAME
-
-        repository(url: getReleaseRepositoryUrl()) {
-          authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-        }
-        snapshotRepository(url: getSnapshotRepositoryUrl()) {
-          authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-        }
-
-        pom.project {
-          name POM_NAME
-          packaging POM_PACKAGING
-          description POM_DESCRIPTION
-          url POM_URL
-
-          scm {
-            url POM_SCM_URL
-            connection POM_SCM_CONNECTION
-            developerConnection POM_SCM_DEV_CONNECTION
-          }
-
-          licenses {
-            license {
-              name POM_LICENSE_NAME
-              url POM_LICENSE_URL
-              distribution POM_LICENSE_DIST
-            }
-          }
-
-          developers {
-            developer {
-              id POM_DEVELOPER_ID
-              name POM_DEVELOPER_NAME
-            }
-          }
-        }
-      }
-    }
-  }
-
-  signing {
-    required { isReleaseBuild() && gradle.taskGraph.hasTask('uploadArchives') }
-    sign configurations.archives
-  }
-}
--- a/gradle/release-bintray.gradle
+++ b/gradle/release-bintray.gradle
@@ -1,33 +0,0 @@
-// Set up everything required for releasing on Bintray
-ext {
-    bintrayRepo = 'maven'
-    bintrayUserOrg = 'facebook'
-    bintrayName = "${GROUP}:${POM_ARTIFACT_ID}"
-    bintrayDescription = POM_DESCRIPTION
-    projectUrl = POM_URL
-    issuesUrl = 'https://github.com/facebook/yoga/issues'
-    scmUrl = POM_SCM_URL
-    scmConnection = POM_SCM_CONNECTION
-    scmDeveloperConnection = POM_SCM_DEV_CONNECTION
-
-    publishedGroupId = GROUP
-    libraryName = 'yoga'
-    artifact = 'yoga'
-
-    developerId = POM_DEVELOPER_ID
-    developerName = POM_DEVELOPER_NAME
-
-    projectLicenses = {
-        license {
-            name = POM_LICENSE_NAME
-            url = POM_LICENSE_URL
-            distribution = POM_LICENSE_DIST
-        }
-    }
-}
-
-// Set up the Android Maven publication (POM etc.)
-apply from: rootProject.file('gradle/android-maven-install.gradle')
-
-// Upload to Bintray
-apply from: rootProject.file('gradle/bintray.gradle')
--- a/gradle/release.gradle
+++ b/gradle/release.gradle
@@ -1,8 +0,0 @@
-// Common Android tasks for all releases that generate Javadocs, sources, etc.
-apply from: rootProject.file('gradle/android-tasks.gradle')
-
-// Upload to Bintray
-apply from: rootProject.file('gradle/release-bintray.gradle')
-
-// Upload directly to standard Maven Central (for SNAPSHOTs)
-apply from: rootProject.file('gradle/gradle-mvn-push.gradle')
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
--- a/java/BUCK
+++ b/java/BUCK
@@ -3,13 +3,31 @@
 # 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", "CXX_LIBRARY_WHITELIST", "FBJNI_JAVA_TARGET", "FBJNI_TARGET", "INFER_ANNOTATIONS_TARGET", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "yoga_cxx_lib", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "YOGA_ROOTS", "yoga_cxx_lib", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test", "yoga_prebuilt_cxx_library")

 CXX_LIBRARY_WHITELIST_FOR_TESTS = CXX_LIBRARY_WHITELIST + [
    yoga_cxx_lib("testutil:jni"),
-    yoga_cxx_lib("testutil:testutil"),
+    yoga_cxx_lib("testutil:testutil-jni"),
 ]

+YOGA_JAVA_IMPLEMENTATION_FILES = [
+    "com/facebook/yoga/*JNI*.java",
+    "com/facebook/yoga/*Factory.java",
+    "com/facebook/yoga/YogaNative.java",
+]
+
+yoga_prebuilt_cxx_library(
+    name = "ndklog",
+    exported_platform_linker_flags = [
+        (
+            "^android.*",
+            ["-llog"],
+        ),
+    ],
+    header_only = True,
+    visibility = YOGA_ROOTS,
+)
+
 yoga_cxx_library(
    name = "jni",
    srcs = glob(["jni/*.cpp"]),
@@ -19,6 +37,9 @@ yoga_cxx_library(
    compiler_flags = [
        "-fno-omit-frame-pointer",
        "-fexceptions",
+        "-fvisibility=hidden",
+        "-ffunction-sections",
+        "-fdata-sections",
        "-fPIC",
        "-Wall",
        "-Werror",
@@ -32,15 +53,45 @@ yoga_cxx_library(
    soname = "libyoga.$(ext)",
    visibility = ["PUBLIC"],
    deps = [
-        FBJNI_TARGET,
        JNI_TARGET,
-        yoga_dep(":yoga"),
+        yoga_dep(":yoga-static"),
+        ":ndklog",
+    ],
+)
+
+yoga_java_library(
+    name = "java-interface",
+    srcs = glob(
+        ["com/facebook/yoga/*.java"],
+        exclude = YOGA_JAVA_IMPLEMENTATION_FILES,
+    ),
+    required_for_source_only_abi = True,
+    source = "1.7",
+    target = "1.7",
+    visibility = ["PUBLIC"],
+    deps = [
+        JSR_305_TARGET,
+        PROGUARD_ANNOTATIONS_TARGET,
+    ],
+)
+
+yoga_java_library(
+    name = "java-impl",
+    srcs = glob(YOGA_JAVA_IMPLEMENTATION_FILES),
+    required_for_source_only_abi = True,
+    source = "1.7",
+    target = "1.7",
+    deps = [
+        ":java-interface",
+        ":jni",
+        JSR_305_TARGET,
+        PROGUARD_ANNOTATIONS_TARGET,
+        SOLOADER_TARGET,
    ],
 )

 yoga_java_library(
    name = "java",
-    srcs = glob(["com/facebook/yoga/*.java"]),
    required_for_source_only_abi = True,
    source = "1.7",
    target = "1.7",
@@ -48,19 +99,16 @@ yoga_java_library(
        yoga_dep("java:tests"),
    ],
    visibility = ["PUBLIC"],
-    deps = [
-        ":jni",
-        FBJNI_JAVA_TARGET,
-        INFER_ANNOTATIONS_TARGET,
-        JSR_305_TARGET,
-        PROGRUARD_ANNOTATIONS_TARGET,
-        SOLOADER_TARGET,
+    exported_deps = [
+        ":java-impl",
+        ":java-interface",
    ],
 )

 yoga_java_test(
    name = "tests",
    srcs = glob(["tests/**/*.java"]),
+    contacts = ["oncall+yoga@xmail.facebook.com"],
    cxx_library_whitelist = CXX_LIBRARY_WHITELIST_FOR_TESTS,
    use_cxx_libraries = True,
    visibility = ["PUBLIC"],
@@ -75,6 +123,5 @@ yoga_java_binary(
    name = "yoga",
    deps = [
        ":java",
-        FBJNI_JAVA_TARGET,
    ],
 )
--- a/Show More
+++ b/Show More