[bugfix] rm duplication process dimension

.travis.yml

@@ -1,6 +1,5 @@
 language: java
 os: linux
-dist: trusty
 addons:
   apt:
     sources:

BUCK

@@ -17,9 +17,9 @@ TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + [
 yoga_cxx_library(
     name = "yoga",
     srcs = glob(["yoga/**/*.cpp"]),
+    header_namespace = "",
+    exported_headers = subdir_glob([("", "yoga/**/*.h")]),
     compiler_flags = LIBRARY_COMPILER_FLAGS,
-    public_include_directories = ["."],
-    raw_headers = glob(["yoga/**/*.h"]),
     soname = "libyogacore.$(ext)",
     tests = [":YogaTests"],
     visibility = ["PUBLIC"],
@@ -31,14 +31,13 @@ yoga_cxx_library(
 yoga_cxx_library(
     name = "yogaForDebug",
     srcs = glob(["yoga/**/*.cpp"]),
+    header_namespace = "",
+    exported_headers = subdir_glob([("", "yoga/**/*.h")]),
     compiler_flags = TEST_COMPILER_FLAGS,
-    public_include_directories = ["."],
-    raw_headers = glob(["yoga/**/*.h"]),
     soname = "libyogacore.$(ext)",
     tests = [":YogaTests"],
     visibility = ["PUBLIC"],
     deps = [
-        ":yoga",
         yoga_dep("lib/fb:ndklog"),
     ],
 )

CMakeLists.txt

@@ -1,24 +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.
+#
 
 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)
+file(GLOB yogacore_SRC yoga/*.cpp)
 add_library(yogacore STATIC ${yogacore_SRC})
 
-target_include_directories(yogacore PUBLIC .)
 target_link_libraries(yogacore android log)
 set_target_properties(yogacore PROPERTIES CXX_STANDARD 11)

CODE_OF_CONDUCT.md

@@ -1,77 +1,3 @@
 # Code of Conduct
 
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to make participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, sex characteristics, gender identity and expression,
-level of experience, education, socio-economic status, nationality, personal
-appearance, race, religion, or sexual identity and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies within all project spaces, and it also applies when
-an individual is representing the project or its community in public spaces.
-Examples of representing a project or community include using an official
-project e-mail address, posting via an official social media account, or acting
-as an appointed representative at an online or offline event. Representation of
-a project may be further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at <opensource-conduct@fb.com>. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
-
-[homepage]: https://www.contributor-covenant.org
-
-For answers to common questions about this code of conduct, see
-https://www.contributor-covenant.org/faq
-
+Facebook has adopted a Code of Conduct that we expect project participants to adhere to. Please [read the full text](https://code.fb.com/codeofconduct/) so that you can understand what actions will and will not be tolerated.

README.md

@@ -1,7 +1,7 @@
 # Yoga [![CocoaPods](https://img.shields.io/cocoapods/v/YogaKit.svg)](http://cocoapods.org/pods/YogaKit) [![npm](https://img.shields.io/npm/v/yoga-layout.svg)](https://www.npmjs.com/package/yoga-layout) [![bintray](https://img.shields.io/bintray/v/facebook/maven/com.facebook.yoga:yoga.svg)](https://bintray.com/facebook/maven/com.facebook.yoga%3Ayoga/_latestVersion) [![NuGet](https://img.shields.io/nuget/v/Facebook.Yoga.svg)](https://www.nuget.org/packages/Facebook.Yoga)
 
 ## Building
-Yoga builds with [buck](https://buckbuild.com). Make sure you install buck before contributing to Yoga. Yoga's main implementation is in C++, with bindings to supported languages and frameworks. When making changes to Yoga please ensure the changes are also propagated to these bindings when applicable.
+Yoga builds with [buck](https://buckbuild.com). Make sure you install buck before contributing to Yoga. Yoga's main implementation is in C, with bindings to supported languages and frameworks. When making changes to Yoga please ensure the changes are also propagated to these bindings when applicable.
 
 ## Testing
 For testing we rely on [gtest](https://github.com/google/googletest) as a submodule. After cloning Yoga run `git submodule init` followed by `git submodule update`.

ReactYoga.xcodeproj/project.pbxproj

@@ -859,6 +859,9 @@
 		597633381F4E021D005BE8A4 /* RCTShadowView+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 597633351F4E021D005BE8A4 /* RCTShadowView+Internal.h */; };
 		597633391F4E021D005BE8A4 /* RCTShadowView+Internal.h in Headers */ = {isa = PBXBuildFile; fileRef = 597633351F4E021D005BE8A4 /* RCTShadowView+Internal.h */; };
 		598FD1921F816A2A006C54CB /* RAMBundleRegistry.h in Copy Headers */ = {isa = PBXBuildFile; fileRef = C6D380181F71D75B00621378 /* RAMBundleRegistry.h */; };
+		598FD1951F817335006C54CB /* RCTModalManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 91076A881F743AB00081B4FA /* RCTModalManager.h */; };
+		598FD1961F817335006C54CB /* RCTModalManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 91076A871F743AB00081B4FA /* RCTModalManager.m */; };
+		598FD1971F817336006C54CB /* RCTModalManager.h in Headers */ = {isa = PBXBuildFile; fileRef = 91076A881F743AB00081B4FA /* RCTModalManager.h */; };
 		599FAA361FB274980058CCF6 /* RCTSurface.h in Headers */ = {isa = PBXBuildFile; fileRef = 599FAA2A1FB274970058CCF6 /* RCTSurface.h */; };
 		599FAA371FB274980058CCF6 /* RCTSurface.h in Headers */ = {isa = PBXBuildFile; fileRef = 599FAA2A1FB274970058CCF6 /* RCTSurface.h */; };
 		599FAA381FB274980058CCF6 /* RCTSurface.mm in Sources */ = {isa = PBXBuildFile; fileRef = 599FAA2B1FB274970058CCF6 /* RCTSurface.mm */; };
@@ -996,6 +999,7 @@
 		8507BBBF21EDACC200AEAFCA /* JSCExecutorFactory.mm in Sources */ = {isa = PBXBuildFile; fileRef = 8507BBBC21EDACC200AEAFCA /* JSCExecutorFactory.mm */; };
 		8507BBC021EDACC200AEAFCA /* JSCExecutorFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 8507BBBD21EDACC200AEAFCA /* JSCExecutorFactory.h */; };
 		8507BBC121EDACC200AEAFCA /* JSCExecutorFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = 8507BBBD21EDACC200AEAFCA /* JSCExecutorFactory.h */; };
+		916F9C2D1F743F57002E5920 /* RCTModalManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 91076A871F743AB00081B4FA /* RCTModalManager.m */; };
 		A2440AA21DF8D854006E7BFC /* RCTReloadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */; };
 		A2440AA31DF8D854006E7BFC /* RCTReloadCommand.m in Sources */ = {isa = PBXBuildFile; fileRef = A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */; };
 		A2440AA41DF8D865006E7BFC /* RCTReloadCommand.h in Headers */ = {isa = PBXBuildFile; fileRef = A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */; };
@@ -2055,6 +2059,8 @@
 		83F15A171B7CC46900F10295 /* UIView+Private.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "UIView+Private.h"; sourceTree = "<group>"; };
 		8507BBBC21EDACC200AEAFCA /* JSCExecutorFactory.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = JSCExecutorFactory.mm; sourceTree = "<group>"; };
 		8507BBBD21EDACC200AEAFCA /* JSCExecutorFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCExecutorFactory.h; sourceTree = "<group>"; };
+		91076A871F743AB00081B4FA /* RCTModalManager.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = RCTModalManager.m; sourceTree = "<group>"; };
+		91076A881F743AB00081B4FA /* RCTModalManager.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = RCTModalManager.h; sourceTree = "<group>"; };
 		A2440AA01DF8D854006E7BFC /* RCTReloadCommand.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTReloadCommand.h; sourceTree = "<group>"; };
 		A2440AA11DF8D854006E7BFC /* RCTReloadCommand.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTReloadCommand.m; sourceTree = "<group>"; };
 		AC70D2E81DE489E4002E6351 /* RCTJavaScriptLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = RCTJavaScriptLoader.mm; sourceTree = "<group>"; };
@@ -2399,6 +2405,8 @@
 				83392EB21B6634E10013B15F /* RCTModalHostViewController.m */,
 				83A1FE8D1B62643A00BE0E65 /* RCTModalHostViewManager.h */,
 				83A1FE8E1B62643A00BE0E65 /* RCTModalHostViewManager.m */,
+				91076A881F743AB00081B4FA /* RCTModalManager.h */,
+				91076A871F743AB00081B4FA /* RCTModalManager.m */,
 				58114A121AAE854800E7D092 /* RCTPicker.h */,
 				58114A131AAE854800E7D092 /* RCTPicker.m */,
 				58114A141AAE854800E7D092 /* RCTPickerManager.h */,
@@ -3020,6 +3028,7 @@
 				3D7BFD301EA8E3FA008DFB7A /* RCTSRWebSocket.h in Headers */,
 				59EDBCA81FDF4E0C003573DE /* RCTScrollableProtocol.h in Headers */,
 				3D302F6C1DF828F800D6DDAE /* RCTAnimationType.h in Headers */,
+				598FD1951F817335006C54CB /* RCTModalManager.h in Headers */,
 				657734871EE834E000A0E9EA /* RCTInspectorDevServerHelper.h in Headers */,
 				3D302F6D1DF828F800D6DDAE /* RCTAutoInsetsProtocol.h in Headers */,
 				3D302F6E1DF828F800D6DDAE /* RCTBorderDrawing.h in Headers */,
@@ -3180,6 +3189,7 @@
 				3D80DA2D1DF820620028D040 /* RCTFrameUpdate.h in Headers */,
 				3D80DA2E1DF820620028D040 /* RCTImageSource.h in Headers */,
 				3D80DA2F1DF820620028D040 /* RCTInvalidating.h in Headers */,
+				598FD1971F817336006C54CB /* RCTModalManager.h in Headers */,
 				599FAA3A1FB274980058CCF6 /* RCTSurfaceDelegate.h in Headers */,
 				3D80DA301DF820620028D040 /* RCTJavaScriptExecutor.h in Headers */,
 				3DCE53281FEAB23100613583 /* RCTDatePicker.h in Headers */,
@@ -3992,6 +4002,7 @@
 				2D3B5EA81D9B08D300451313 /* RCTUtils.m in Sources */,
 				599FAA451FB274980058CCF6 /* RCTSurfaceRootView.mm in Sources */,
 				2D3B5EC81D9B095800451313 /* RCTActivityIndicatorViewManager.m in Sources */,
+				598FD1961F817335006C54CB /* RCTModalManager.m in Sources */,
 				3DCD185D1DF978E7007FE5A1 /* RCTReloadCommand.m in Sources */,
 				130443DB1E401ADD00D93A67 /* RCTConvert+Transform.m in Sources */,
 				3D0B84301EC0B51200B2BD8E /* RCTTVNavigationEventEmitter.m in Sources */,
@@ -4243,6 +4254,7 @@
 				391E86A41C623EC800009732 /* RCTTouchEvent.m in Sources */,
 				1450FF861BCFF28A00208362 /* RCTProfile.m in Sources */,
 				13AB90C11B6FA36700713B4F /* RCTComponentData.m in Sources */,
+				916F9C2D1F743F57002E5920 /* RCTModalManager.m in Sources */,
 				F1EFDA50201F661000EE6E4C /* RCTUIUtils.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;

Yoga.podspec

@@ -1,8 +1,9 @@
-# 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.
-
+#  Copyright (c) Facebook, Inc. and its affiliates.
+#
+#  This source code is licensed under the MIT license found in the LICENSE
+#  file in the root directory of this source tree.
+#
 Pod::Spec.new do |spec|
   spec.name = 'Yoga'
   spec.version = '1.14.0'

YogaKit.podspec

@@ -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.
-
+#  Copyright (c) Facebook, Inc. and its affiliates.
+#
+#  This source code is licensed under the MIT license found in the LICENSE
+#  file in the root directory of this source tree.
+#
 podspec = Pod::Spec.new do |spec|
   spec.name = 'YogaKit'
-  spec.version = '1.17.0'
+  spec.version = '1.14.0'
   spec.license =  { :type => 'MIT', :file => "LICENSE" }
   spec.homepage = 'https://facebook.github.io/yoga/'
   spec.documentation_url = 'https://facebook.github.io/yoga/docs/'
@@ -22,20 +23,11 @@ podspec = Pod::Spec.new do |spec|
   spec.platform = :ios
   spec.ios.deployment_target = '8.0'
   spec.ios.frameworks = 'UIKit'
-  spec.default_subspec = "Core"
   spec.dependency 'Yoga', '~> 1.14'
-  spec.module_name = 'YogaKit'
-
-  spec.subspec "Core" do |ss|
-    ss.source_files = 'YogaKit/Source/*.{h,m}'
-    ss.public_header_files = 'YogaKit/Source/{YGLayout,UIView+Yoga}.h'
-    ss.private_header_files = 'YogaKit/Source/YGLayout+Private.h'
-  end
-
-  spec.subspec 'SwiftExtension' do |ss|
-    ss.source_files = 'YogaKit/Source/*.{swift}'
-  end
-
+  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'
 end
 
 # See https://github.com/facebook/yoga/pull/366

YogaKit/Source/UIView+Yoga.h

@@ -1,10 +1,9 @@
 /*
  * 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>
 

YogaKit/Source/UIView+Yoga.m

@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

YogaKit/Source/YGLayout+Private.h

@@ -1,10 +1,9 @@
 /*
  * 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>
 

YogaKit/Source/YGLayout.h

@@ -1,10 +1,9 @@
 /*
  * 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>

YogaKit/Source/YGLayout.m

@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the
@@ -180,7 +180,7 @@ static YGConfigRef globalConfig;
   // the measure function. Since we already know that this is a leaf,
   // this *should* be fine. Forgive me Hack Gods.
   const YGNodeRef node = self.node;
-  if (!YGNodeHasMeasureFunc(node)) {
+  if (YGNodeHasMeasureFunc(node)) {
     YGNodeSetMeasureFunc(node, YGMeasureView);
   }
 

YogaKit/Source/YGLayoutExtensions.swift

@@ -1,4 +1,4 @@
-/*
+/**
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
  * This source code is licensed under the MIT license found in the

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

YogaKit/YogaKitSample/YogaKitSample/AppDelegate.swift

@@ -1,8 +1,9 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * 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 license found in the
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import Foundation

YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift

@@ -1,8 +1,9 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * 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 license found in the
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -1,8 +1,9 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * 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 license found in the
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -1,8 +1,9 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * 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 license found in the
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 #import "ViewController.h"

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -1,8 +1,9 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * 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 license found in the
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift

@@ -1,8 +1,9 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * 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 license found in the
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift

@@ -1,8 +1,9 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
+/**
+ * Copyright 2014-present, Facebook, Inc.
+ * All rights reserved.
  *
- * 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 license found in the
+ * LICENSE-examples file in the root directory of this source tree.
  */
 
 import UIKit

android/BUCK

@@ -3,7 +3,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", "ANDROID_JAVA_TARGET", "ANDROID_RES_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", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
 
 yoga_android_aar(
     name = "android",
@@ -14,6 +14,7 @@ yoga_android_aar(
     deps = [
         ANDROID_JAVA_TARGET,
         ANDROID_RES_TARGET,
+        INFER_ANNOTATIONS_TARGET,
         JAVA_TARGET,
         PROGRUARD_ANNOTATIONS_TARGET,
     ],

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

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

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;

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

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;

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

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;
 
 

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

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;

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

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;

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

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;

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

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;

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

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

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

@@ -1,10 +1,9 @@
-/*
+/**
  * Copyright (c) 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;
@@ -29,7 +28,6 @@ import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
 import com.facebook.yoga.YogaNode;
-import com.facebook.yoga.YogaNodeFactory;
 import com.facebook.yoga.YogaOverflow;
 import com.facebook.yoga.YogaPositionType;
 import com.facebook.yoga.YogaWrap;
@@ -79,7 +77,7 @@ public class YogaLayout extends ViewGroup {
   public YogaLayout(Context context, AttributeSet attrs, int defStyleAttr) {
     super(context, attrs, defStyleAttr);
 
-    mYogaNode = YogaNodeFactory.create();
+    mYogaNode = YogaNode.create();
     mYogaNodes = new HashMap<>();
 
     mYogaNode.setData(this);
@@ -156,7 +154,7 @@ public class YogaLayout extends ViewGroup {
       if(mYogaNodes.containsKey(child)) {
         childNode = mYogaNodes.get(child);
       } else {
-        childNode = YogaNodeFactory.create();
+        childNode = YogaNode.create();
       }
 
       childNode.setData(child);

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

@@ -1,10 +1,9 @@
-/*
+/**
  * Copyright (c) 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;

benchmark/YGBenchmark.c

@@ -1,10 +1,9 @@
 /*
  * 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>

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
@@ -34,7 +34,7 @@ ext {
     minSdkVersion = 14
     targetSdkVersion = 25
     compileSdkVersion = 26
-    buildToolsVersion = '28.0.3'
+    buildToolsVersion = '26.0.2'
     sourceCompatibilityVersion = JavaVersion.VERSION_1_7
     targetCompatibilityVersion = JavaVersion.VERSION_1_7
 }

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

csharp/Mac/run-tests.sh

@@ -1,7 +1,10 @@
 #!/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

csharp/Windows/Facebook.Yoga.Universal.Tests/YogaNodeTest.cs

@@ -1,10 +1,3 @@
-/*
- * 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;

csharp/Yoga/YGInterop.cpp

@@ -1,10 +1,9 @@
 /*
  * 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;

csharp/Yoga/YGInterop.h

@@ -1,10 +1,9 @@
 /*
  * 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>

csharp/Yoga/dllmain.cpp

@@ -1,10 +1,9 @@
 /*
  * 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"
 

csharp/Yoga/resource.h

@@ -1,10 +1,9 @@
 /*
  * 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

csharp/Yoga/stdafx.cpp

@@ -1,10 +1,9 @@
 /*
  * 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

csharp/Yoga/stdafx.h

@@ -1,10 +1,9 @@
 /*
  * 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

csharp/Yoga/targetver.h

@@ -1,10 +1,9 @@
 /*
  * 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.

csharp/build-native.sh

@@ -1,8 +1,11 @@
 #!/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

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

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

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

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

csharp/tests/Facebook.Yoga/test_macos.sh

@@ -1,9 +1,4 @@
 #!/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

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 = YogaConfigFactory.create();")
+    this.push("YogaConfig config = new YogaConfig();")
     for (var i in experiments) {
       this.push('config.setExperimentalFeatureEnabled(YogaExperimentalFeature.' + toJavaUpper(experiments[i]) +', true);');
     }

gentest/gentest.rb

@@ -1,8 +1,4 @@
 #!/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'

gradle.properties

@@ -9,7 +9,7 @@
 
 org.gradle.jvmargs=-Xmx1536M
 
-VERSION_NAME=1.16.0-SNAPSHOT
+VERSION_NAME=1.14.0-SNAPSHOT
 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

gradle/android-maven-install.gradle

@@ -1,10 +1,3 @@
-/*
- * 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.
- */
-
 // Configure the Android maven publication
 
 apply plugin: 'com.github.dcendents.android-maven'

gradle/android-tasks.gradle

@@ -1,10 +1,3 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
 // Android tasks for Javadoc and sources.jar generation
 
 afterEvaluate { project ->

gradle/bintray.gradle

@@ -1,10 +1,3 @@
-/*
- * 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.
- */
-
 // Upload to Bintray
 apply plugin: 'com.jfrog.bintray'
 

gradle/release-bintray.gradle

@@ -1,10 +1,3 @@
-/*
- * 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.
- */
-
 // Set up everything required for releasing on Bintray
 ext {
     bintrayRepo = 'maven'

gradle/release.gradle

@@ -1,10 +1,3 @@
-/*
- * 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.
- */
-
 // Common Android tasks for all releases that generate Javadocs, sources, etc.
 apply from: rootProject.file('gradle/android-tasks.gradle')
 

java/BUCK

@@ -3,19 +3,13 @@
 # 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", "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", "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")
 
 CXX_LIBRARY_WHITELIST_FOR_TESTS = CXX_LIBRARY_WHITELIST + [
     yoga_cxx_lib("testutil:jni"),
     yoga_cxx_lib("testutil:testutil"),
 ]
 
-YOGA_JAVA_IMPLEMENTATION_FILES = [
-    "com/facebook/yoga/*JNI*.java",
-    "com/facebook/yoga/*Factory.java",
-    "com/facebook/yoga/YogaNative.java",
-]
-
 yoga_cxx_library(
     name = "jni",
     srcs = glob(["jni/*.cpp"]),
@@ -25,9 +19,6 @@ yoga_cxx_library(
     compiler_flags = [
         "-fno-omit-frame-pointer",
         "-fexceptions",
-        "-fvisibility=hidden",
-        "-ffunction-sections",
-        "-fdata-sections",
         "-fPIC",
         "-Wall",
         "-Werror",
@@ -47,40 +38,9 @@ yoga_cxx_library(
     ],
 )
 
-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,
-        PROGRUARD_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",
-        FBJNI_JAVA_TARGET,
-        JSR_305_TARGET,
-        PROGRUARD_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",
@@ -88,9 +48,12 @@ yoga_java_library(
         yoga_dep("java:tests"),
     ],
     visibility = ["PUBLIC"],
-    exported_deps = [
-        ":java-impl",
-        ":java-interface",
+    deps = [
+        ":jni",
+        INFER_ANNOTATIONS_TARGET,
+        JSR_305_TARGET,
+        PROGRUARD_ANNOTATIONS_TARGET,
+        SOLOADER_TARGET,
     ],
 )
 

java/CMakeLists.txt

@@ -1,7 +1,9 @@
+#
 # 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)
 
@@ -24,19 +26,13 @@ add_subdirectory(${yogacore_DIR} ${yogacore_build_DIR})
 add_compile_options(
     -fno-omit-frame-pointer
     -fexceptions
-    -fvisibility=hidden
-    -ffunction-sections
-    -fdata-sections
     -Wall
     -std=c++11)
 
-file(GLOB jni_SRC
-        jni/*.cpp)
-
-add_library(yoga SHARED ${jni_SRC})
+add_library(yoga SHARED jni/YGJNI.cpp jni/YGJTypes.cpp)
 
 target_include_directories(yoga PRIVATE
     ${libfb_DIR}/include
     ${yogacore_DIR})
 
-target_link_libraries(yoga -Wl,--gc-sections yogacore fb)
+target_link_libraries(yoga yogacore fb)

java/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
@@ -58,11 +58,10 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.code.findbugs:jsr305:3.0.1'
-    implementation project(':yoga:proguard-annotations')
+    compileOnly 'com.google.code.findbugs:jsr305:3.0.1'
+    compileOnly project(':yoga:proguard-annotations')
     implementation 'com.facebook.soloader:soloader:0.5.1'
     testImplementation 'junit:junit:4.12'
-    testImplementation project(':testutil')
 }
 
 task sourcesJar(type: Jar) {

java/com/facebook/yoga/LayoutPassReason.java

@@ -1,43 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.yoga;
-
-public enum LayoutPassReason {
-  INITIAL(0),
-  ABS_LAYOUT(1),
-  STRETCH(2),
-  MULTILINE_STRETCH(3),
-  FLEX_LAYOUT(4),
-  MEASURE(5),
-  ABS_MEASURE(6),
-  FLEX_MEASURE(7);
-
-  private final int mIntValue;
-
-  LayoutPassReason(int intValue) {
-    mIntValue = intValue;
-  }
-
-  public int intValue() {
-    return mIntValue;
-  }
-
-  public static LayoutPassReason fromInt(int value) {
-    switch (value) {
-      case 0: return INITIAL;
-      case 1: return ABS_LAYOUT;
-      case 2: return STRETCH;
-      case 3: return MULTILINE_STRETCH;
-      case 4: return FLEX_LAYOUT;
-      case 5: return MEASURE;
-      case 6: return ABS_MEASURE;
-      case 7: return FLEX_MEASURE;
-      default: throw new IllegalArgumentException("Unknown enum value: " + value);
-    }
-  }
-}

java/com/facebook/yoga/YogaAlign.java

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;
 
 import com.facebook.proguard.annotations.DoNotStrip;

java/com/facebook/yoga/YogaBaselineFunction.java

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;
 
 import com.facebook.proguard.annotations.DoNotStrip;

java/com/facebook/yoga/YogaConfig.java

@@ -1,45 +1,80 @@
-/*
+/**
  * 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;
 
-public abstract class YogaConfig {
+import com.facebook.soloader.SoLoader;
+
+public class YogaConfig {
 
   public static int SPACING_TYPE = 1;
+  public static boolean useBatchingForLayoutOutputs = false;
 
-  public abstract void setExperimentalFeatureEnabled(YogaExperimentalFeature feature, boolean enabled);
+  long mNativePointer;
+  private YogaLogger mLogger;
+  private YogaNodeCloneFunction mYogaNodeCloneFunction;
 
-  public abstract void setUseWebDefaults(boolean useWebDefaults);
+  public YogaConfig() {
+    mNativePointer = YogaNative.jni_YGConfigNew();
+    if (mNativePointer == 0) {
+      throw new IllegalStateException("Failed to allocate native memory");
+    }
+  }
 
-  public abstract void setPrintTreeFlag(boolean enable);
+  @Override
+  protected void finalize() throws Throwable {
+    try {
+      YogaNative.jni_YGConfigFree(mNativePointer);
+    } finally {
+      super.finalize();
+    }
+  }
+
+  public void setExperimentalFeatureEnabled(YogaExperimentalFeature feature, boolean enabled) {
+    YogaNative.jni_YGConfigSetExperimentalFeatureEnabled(mNativePointer, feature.intValue(), enabled);
+  }
+
+  public void setUseWebDefaults(boolean useWebDefaults) {
+    YogaNative.jni_YGConfigSetUseWebDefaults(mNativePointer, useWebDefaults);
+  }
+
+  public void setPrintTreeFlag(boolean enable) {
+    YogaNative.jni_YGConfigSetPrintTreeFlag(mNativePointer, enable);
+  }
+
+  public void setPointScaleFactor(float pixelsInPoint) {
+    YogaNative.jni_YGConfigSetPointScaleFactor(mNativePointer, pixelsInPoint);
+  }
 
-  public abstract void setPointScaleFactor(float pixelsInPoint);
   /**
    * Yoga previously had an error where containers would take the maximum space possible instead of the minimum
    * like they are supposed to. In practice this resulted in implicit behaviour similar to align-self: stretch;
    * Because this was such a long-standing bug we must allow legacy users to switch back to this behaviour.
    */
-  public abstract void setUseLegacyStretchBehaviour(boolean useLegacyStretchBehaviour);
+  public void setUseLegacyStretchBehaviour(boolean useLegacyStretchBehaviour) {
+    YogaNative.jni_YGConfigSetUseLegacyStretchBehaviour(mNativePointer, useLegacyStretchBehaviour);
+  }
 
   /**
    * If this flag is set then yoga would diff the layout without legacy flag and would set a bool in
    * YogaNode(mDoesLegacyStretchFlagAffectsLayout) with true if the layouts were different and false
    * if not
    */
-  public abstract void setShouldDiffLayoutWithoutLegacyStretchBehaviour(
-      boolean shouldDiffLayoutWithoutLegacyStretchBehaviour);
+  public void setShouldDiffLayoutWithoutLegacyStretchBehaviour(
+      boolean shouldDiffLayoutWithoutLegacyStretchBehaviour) {
+    YogaNative.jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(
+        mNativePointer, shouldDiffLayoutWithoutLegacyStretchBehaviour);
+  }
 
-  public abstract void setLogger(YogaLogger logger);
+  public void setLogger(YogaLogger logger) {
+    mLogger = logger;
+    YogaNative.jni_YGConfigSetLogger(mNativePointer, logger);
+  }
 
-  public abstract YogaLogger getLogger();
-
-  abstract long getNativePointer();
-
-  public abstract void setUseVanillaJNI(boolean useVanillaJNI);
-
-  public abstract boolean useVanillaJNI();
+  public YogaLogger getLogger() {
+    return mLogger;
+  }
 }

java/com/facebook/yoga/YogaConfigFactory.java

@@ -1,18 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.yoga;
-
-public abstract class YogaConfigFactory {
-  public static YogaConfig create() {
-    return new YogaConfigJNIFinalizer();
-  }
-
-  public static YogaConfig create(boolean useVanillaJNI) {
-    return new YogaConfigJNIFinalizer(useVanillaJNI);
-  }
-}

java/com/facebook/yoga/YogaConfigJNIBase.java

@@ -1,112 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.yoga;
-
-public abstract class YogaConfigJNIBase extends YogaConfig {
-
-  long mNativePointer;
-  private YogaLogger mLogger;
-  protected boolean useVanillaJNI = false;
-
-  private YogaConfigJNIBase(long nativePointer) {
-    if (nativePointer == 0) {
-      throw new IllegalStateException("Failed to allocate native memory");
-    }
-    mNativePointer = nativePointer;
-  }
-
-  YogaConfigJNIBase() {
-    this(YogaNative.jni_YGConfigNew());
-  }
-
-  YogaConfigJNIBase(boolean useVanillaJNI) {
-    this(useVanillaJNI ? YogaNative.jni_YGConfigNewJNI() : YogaNative.jni_YGConfigNew());
-    this.useVanillaJNI = useVanillaJNI;
-  }
-
-  public void setExperimentalFeatureEnabled(YogaExperimentalFeature feature, boolean enabled) {
-    if (useVanillaJNI)
-      YogaNative.jni_YGConfigSetExperimentalFeatureEnabledJNI(mNativePointer, feature.intValue(), enabled);
-    else
-      YogaNative.jni_YGConfigSetExperimentalFeatureEnabled(mNativePointer, feature.intValue(), enabled);
-  }
-
-  public void setUseWebDefaults(boolean useWebDefaults) {
-    if (useVanillaJNI)
-      YogaNative.jni_YGConfigSetUseWebDefaultsJNI(mNativePointer, useWebDefaults);
-    else
-      YogaNative.jni_YGConfigSetUseWebDefaults(mNativePointer, useWebDefaults);
-  }
-
-  public void setPrintTreeFlag(boolean enable) {
-    if (useVanillaJNI)
-      YogaNative.jni_YGConfigSetPrintTreeFlagJNI(mNativePointer, enable);
-    else
-      YogaNative.jni_YGConfigSetPrintTreeFlag(mNativePointer, enable);
-  }
-
-  public void setPointScaleFactor(float pixelsInPoint) {
-    if (useVanillaJNI)
-      YogaNative.jni_YGConfigSetPointScaleFactorJNI(mNativePointer, pixelsInPoint);
-    else
-      YogaNative.jni_YGConfigSetPointScaleFactor(mNativePointer, pixelsInPoint);
-  }
-
-  /**
-   * Yoga previously had an error where containers would take the maximum space possible instead of the minimum
-   * like they are supposed to. In practice this resulted in implicit behaviour similar to align-self: stretch;
-   * Because this was such a long-standing bug we must allow legacy users to switch back to this behaviour.
-   */
-  public void setUseLegacyStretchBehaviour(boolean useLegacyStretchBehaviour) {
-    if (useVanillaJNI)
-      YogaNative.jni_YGConfigSetUseLegacyStretchBehaviourJNI(mNativePointer, useLegacyStretchBehaviour);
-    else
-      YogaNative.jni_YGConfigSetUseLegacyStretchBehaviour(mNativePointer, useLegacyStretchBehaviour);
-  }
-
-  /**
-   * If this flag is set then yoga would diff the layout without legacy flag and would set a bool in
-   * YogaNode(mDoesLegacyStretchFlagAffectsLayout) with true if the layouts were different and false
-   * if not
-   */
-  public void setShouldDiffLayoutWithoutLegacyStretchBehaviour(
-      boolean shouldDiffLayoutWithoutLegacyStretchBehaviour) {
-    if (useVanillaJNI)
-      YogaNative.jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviourJNI(
-          mNativePointer, shouldDiffLayoutWithoutLegacyStretchBehaviour);
-    else
-      YogaNative.jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(
-          mNativePointer, shouldDiffLayoutWithoutLegacyStretchBehaviour);
-  }
-
-  public void setLogger(YogaLogger logger) {
-    mLogger = logger;
-    if (useVanillaJNI)
-      YogaNative.jni_YGConfigSetLoggerJNI(mNativePointer, logger);
-    else
-      YogaNative.jni_YGConfigSetLogger(mNativePointer, logger);
-  }
-
-  public YogaLogger getLogger() {
-    return mLogger;
-  }
-
-  long getNativePointer() {
-    return mNativePointer;
-  }
-
-  @Override
-  public void setUseVanillaJNI(boolean useVanillaJNI) {
-    this.useVanillaJNI = useVanillaJNI;
-  }
-
-  @Override
-  public boolean useVanillaJNI() {
-    return this.useVanillaJNI;
-  }
-}

java/com/facebook/yoga/YogaConfigJNIFinalizer.java

@@ -1,38 +0,0 @@
-/*
- * Copyright (c) Facebook, Inc. and its affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
- */
-
-package com.facebook.yoga;
-
-public class YogaConfigJNIFinalizer extends YogaConfigJNIBase {
-  public YogaConfigJNIFinalizer() {
-    super();
-  }
-
-  public YogaConfigJNIFinalizer(boolean useVanillaJNI) {
-    super(useVanillaJNI);
-  }
-
-  @Override
-  protected void finalize() throws Throwable {
-    try {
-      freeNatives();
-    } finally {
-      super.finalize();
-    }
-   }
-
-  public void freeNatives() {
-    if (mNativePointer != 0) {
-      long nativePointer = mNativePointer;
-      mNativePointer = 0;
-      if (useVanillaJNI)
-        YogaNative.jni_YGConfigFreeJNI(nativePointer);
-      else
-        YogaNative.jni_YGConfigFree(nativePointer);
-    }
-  }
-}

java/com/facebook/yoga/YogaConstants.java

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;
 
 public class YogaConstants {

java/com/facebook/yoga/YogaDimension.java

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;
 
 import com.facebook.proguard.annotations.DoNotStrip;

java/com/facebook/yoga/YogaDirection.java

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;
 
 import com.facebook.proguard.annotations.DoNotStrip;

java/com/facebook/yoga/YogaDisplay.java

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;
 
 import com.facebook.proguard.annotations.DoNotStrip;

java/com/facebook/yoga/YogaEdge.java

@@ -1,10 +1,9 @@
-/*
+/**
  * 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;
 
 import com.facebook.proguard.annotations.DoNotStrip;