Merge branch 'master' into edensan

.travis.yml

@@ -1,136 +1,25 @@
-# Copyright (c) 2014-present, Facebook, Inc.
+language: node_js
-# All rights reserved.
+node_js:
-#
+  - "8"
-# This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
 
-os: osx
+install:
-osx_image: xcode8.2
+- cd website
-language: cpp
+- yarn --ignore-scripts
-compiler: clang
+- cd ..
-cache:
-  directories:
-    - $HOME/Library/Caches/Homebrew
-    - $HOME/android-sdk
-    - $HOME/android-ndk
-
-env:
-  - TARGET=c
-  - TARGET=java
-  - TARGET=net
-  - TARGET=ios
-  - TARGET=js
-  - TARGET=android
-
-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
-
-  - brew update > /dev/null
-  - brew install --HEAD facebook/fb/buck
-
-  # Java
-  - |
-    if [[ $TARGET = "java" ]]; then
-      brew cask install java &&
-      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8) &&
-      export PATH=$JAVA_HOME/bin:$PATH
-    fi
-
-  # .NET
-  - |
-    if [[ $TARGET = "net" ]]; then
-      brew install mono
-    fi
-
-  # iOS
-  - |
-    if [[ $TARGET = "ios" ]]; then
-      brew outdated xctool || brew upgrade xctool;
-      gem install xcpretty --no-document --quiet;
-      gem install cocoapods --pre --no-document --quiet;
-      pod repo update --silent;
-      pod install --project-directory=YogaKit/YogaKitSample/;
-    fi
-
-  # Emscripten (used for js tests)
-  # Note: cannot be ran on Linux (because it will compile Clang from its sources :|)
-  - |
-    if [[ $TARGET = "js" ]]; then
-      wget -O /tmp/emsdk-portable.tar.gz https://s3.amazonaws.com/mozilla-games/emscripten/releases/emsdk-portable.tar.gz &&
-      tar xf /tmp/emsdk-portable.tar.gz -C /tmp/ &&
-      /tmp/emsdk-portable/emsdk install latest 2>&1 | grep -v '^x ' &&
-      /tmp/emsdk-portable/emsdk activate latest
-    fi
-
-  # Android
-  - |
-    if [[ $TARGET = "android" ]]; then
-      brew cask install java;
-      export JAVA_HOME=$(/usr/libexec/java_home -v 1.8);
-      export PATH=$JAVA_HOME/bin:$PATH;
-      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
-
-  # JavaScript
-  - |
-    if [[ $TARGET = "js" ]]; then (
-      cd javascript &&
-      npm install &&
-      unset CC && unset CXX && unset LINK &&
-      source /tmp/emsdk-portable/emsdk_env.sh &&
-      npm run build:browser
-    ) fi
 
 script:
-  # C
+- cd website
-  - |
+- yarn build
-    if [[ $TARGET = "c" ]]; then
+- cd ..
-      buck test --verbose 0 //:yoga &&
-      buck run --verbose 0 //benchmark:benchmark &&
-      git checkout HEAD^ &&
-      buck run --verbose 0 //benchmark:benchmark
-    fi
 
-  # Java
+deploy:
-  - |
+  provider: pages
-    if [[ $TARGET = "java" ]]; then
+  skip-cleanup: true
-      buck test --verbose 0 //java:java
+  github-token: $GITHUB_TOKEN
-    fi
+  fqdn: yogalayout.com
-
+  local-dir: website/public
-  # .NET
+  email: yogabot@fb.com
-  - |
+  name: Yoga-bot
-    if [[ $TARGET = "net" ]]; then
+  keep-history: true
-      sh csharp/tests/Facebook.Yoga/test_macos.sh
+  on:
-    fi
+    branch: master
-
-  # iOS
-  - |
-    if [[ $TARGET = "ios" ]]; then
-      buck test --verbose 0 //YogaKit:YogaKitTests --config cxx.default_platform=iphonesimulator-x86_64 &&
-      set -o pipefail &&
-      xcodebuild build -workspace YogaKit/YogaKitSample/YogaKitSample.xcworkspace -scheme YogaKitSample -sdk iphonesimulator | xcpretty -c
-    fi
-
-  # Android
-  - |
-    if [[ $TARGET = "android" ]]; then
-      buck build --verbose 0 //android/sample:sample &&
-      ./gradlew testDebugUnit &&
-      scripts/publish-snapshot.sh
-    fi
-
-  # JavaScript
-  - |
-    if [[ $TARGET = "js" ]]; then (
-      cd javascript &&
-      npm run test:all &&
-      npm run bench
-    ) fi

BUCK

@@ -1,9 +1,7 @@
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
 load("//:yoga_defs.bzl", "LIBRARY_COMPILER_FLAGS", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "yoga_dep", "cxx_library", "cxx_test")
 
@@ -34,6 +32,20 @@ cxx_library(
     ],
 )
 
+cxx_library(
+    name = "yogafastmath",
+    srcs = glob(["yoga/*.cpp"]),
+    header_namespace = "",
+    exported_headers = subdir_glob([("", "yoga/*.h")]),
+    compiler_flags = COMPILER_FLAGS + ["-ffast-math"],
+    soname = "libyogafastmathcore.$(ext)",
+    tests = [":YogaTests"],
+    visibility = ["PUBLIC"],
+    deps = [
+        yoga_dep("lib/fb:ndklog"),
+    ],
+)
+
 cxx_test(
     name = "YogaTests",
     srcs = glob(["tests/*.cpp"]),

CMakeLists.txt

@@ -1,10 +1,8 @@
 #
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 #
 
 cmake_minimum_required(VERSION 3.4.1)

CONTRIBUTING.md

@@ -31,4 +31,4 @@ outlined on that page and do not file a public issue.
 
 ## License
 By contributing to yoga, you agree that your contributions will be licensed
-under its BSD license.
+under its MIT license.

LICENSE

@@ -1,30 +1,21 @@
-BSD License
+MIT License
 
-For yoga software
+Copyright (c) 2014-present, Facebook, Inc.
 
-Copyright (c) 2014-present, Facebook, Inc. All rights reserved.
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-Redistribution and use in source and binary forms, with or without modification,
+The above copyright notice and this permission notice shall be included in all
-are permitted provided that the following conditions are met:
+copies or substantial portions of the Software.
 
- * Redistributions of source code must retain the above copyright notice, this
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   list of conditions and the following disclaimer.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * Redistributions in binary form must reproduce the above copyright notice,
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-   this list of conditions and the following disclaimer in the documentation
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-   and/or other materials provided with the distribution.
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-
+SOFTWARE.
- * Neither the name Facebook nor the names of its contributors may be used to
-   endorse or promote products derived from this software without specific
-   prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

PATENTS

@@ -1,33 +0,0 @@
-Additional Grant of Patent Rights Version 2
-
-"Software" means the yoga software distributed by Facebook, Inc.
-
-Facebook, Inc. (“Facebook”) hereby grants to each recipient of the Software
-(“you”) a perpetual, worldwide, royalty-free, non-exclusive, irrevocable
-(subject to the termination provision below) license under any Necessary
-Claims, to make, have made, use, sell, offer to sell, import, and otherwise
-transfer the Software. For avoidance of doubt, no license is granted under
-Facebook's rights in any patent claims that are infringed by (i) modifications
-to the Software made by you or any third party or (ii) the Software in
-combination with any software or other technology.
-
-The license granted hereunder will terminate, automatically and without notice,
-if you (or any of your subsidiaries, corporate affiliates or agents) initiate
-directly or indirectly, or take a direct financial interest in, any Patent
-Assertion: (i) against Facebook or any of its subsidiaries or corporate
-affiliates, (ii) against any party if such Patent Assertion arises in whole or
-in part from any software, technology, product or service of Facebook or any of
-its subsidiaries or corporate affiliates, or (iii) against any party relating
-to the Software. Notwithstanding the foregoing, if Facebook or any of its
-subsidiaries or corporate affiliates files a lawsuit alleging patent
-infringement against you in the first instance, and you respond by filing a
-patent infringement counterclaim in that lawsuit against that party that is
-unrelated to the Software, the license granted hereunder will not terminate
-under section (i) of this paragraph due to such counterclaim.
-
-A "Necessary Claim" is a claim of a patent owned by Facebook that is
-necessarily infringed by the Software standing alone.
-
-A "Patent Assertion" is any lawsuit or other action alleging direct, indirect,
-or contributory infringement or inducement to infringe any patent, including a
-cross-claim or counterclaim.

README.md

@@ -1,15 +1,5 @@
 # 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)
 
-[![C Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=c&label=C)](https://travis-ci.org/facebook/yoga)
-[![Java Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=java&label=Java)](https://travis-ci.org/facebook/yoga)
-[![iOS Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=ios&label=iOS)](https://travis-ci.org/facebook/yoga)
-[![.NET Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=net&label=.NET)](https://travis-ci.org/facebook/yoga)
-[![JavaScript Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=js&label=JavaScript)](https://travis-ci.org/facebook/yoga)
-[![Android Status](https://badges.herokuapp.com/travis/facebook/yoga?env=TARGET=android&label=Android)](https://travis-ci.org/facebook/yoga)
-
-[![Visual Studio Team services](https://img.shields.io/vso/build/rumar/fe6d27b5-e424-4f61-b8f6-e2ec2f8755fb/1.svg?label=vsts-windows)]()
-[![Visual Studio Team services](https://img.shields.io/vso/build/rumar/fe6d27b5-e424-4f61-b8f6-e2ec2f8755fb/2.svg?label=vsts-osx)]()
-
 ## 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.podspec

@@ -1,7 +1,7 @@
 Pod::Spec.new do |spec|
   spec.name = 'Yoga'
   spec.version = '1.7.0'
-  spec.license =  { :type => 'BSD', :file => "LICENSE" }
+  spec.license =  { :type => 'MIT', :file => "LICENSE" }
   spec.homepage = 'https://facebook.github.io/yoga/'
   spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/c/'
 

YogaKit.podspec

@@ -1,7 +1,7 @@
 podspec = Pod::Spec.new do |spec|
   spec.name = 'YogaKit'
   spec.version = '1.7.0'
-  spec.license =  { :type => 'BSD', :file => "LICENSE" }
+  spec.license =  { :type => 'MIT', :file => "LICENSE" }
   spec.homepage = 'https://facebook.github.io/yoga/'
   spec.documentation_url = 'https://facebook.github.io/yoga/docs/api/yogakit/'
 

YogaKit/BUCK

@@ -1,9 +1,7 @@
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
 load("//:yoga_defs.bzl", "yoga_dep", "apple_library", "apple_test")
 
@@ -30,6 +28,7 @@ COMPILER_FLAGS = [
 apple_library(
     name = "YogaKit",
     srcs = glob(["Source/**/*.m"]),
+    header_namespace = "",
     exported_headers = subdir_glob(
         [
             ("", "Source/**/*.h"),

YogaKit/Source/UIView+Yoga.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #import "YGLayout.h"

YogaKit/Source/UIView+Yoga.m

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #import "UIView+Yoga.h"

YogaKit/Source/YGLayout+Private.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #import "YGLayout.h"

YogaKit/Source/YGLayout.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #import <UIKit/UIKit.h>

YogaKit/Source/YGLayout.m

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #import "YGLayout+Private.h"

YogaKit/Source/YGLayoutExtensions.swift

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 postfix operator %

YogaKit/Tests/YogaKitTests.m

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #import <XCTest/XCTest.h>

android/BUCK

@@ -1,9 +1,7 @@
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
 load("//:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "android_aar", "android_resource")
 

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

@@ -1,9 +1,7 @@
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under the license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE-examples file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
 load("//:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_SAMPLE_RES_TARGET", "ANDROID_SUPPORT_TARGET", "APPCOMPAT_TARGET", "SOLOADER_TARGET", "android_library")
 

android/src/main/AndroidManifest.xml

@@ -2,11 +2,9 @@
 
 <!--
   Copyright (c) 2014-present, Facebook, Inc.
-  All rights reserved.
+  
-
+  This source code is licensed under the MIT license found in the
-  This source code is licensed under the BSD-style license found in the
+  LICENSE file in the root directory of this source tree.
-  LICENSE file in the root directory of this source tree. An additional grant
-  of patent rights can be found in the PATENTS file in the same directory.
 -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"

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

@@ -1,9 +1,7 @@
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
 load("//:yoga_defs.bzl", "ANDROID_RES_TARGET", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "JSR_305_TARGET", "SOLOADER_TARGET", "android_library")
 

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

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 package com.facebook.yoga.android;

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

@@ -1,17 +1,12 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 package com.facebook.yoga.android;
 
-import java.util.HashMap;
-import java.util.Map;
-
 import android.content.Context;
 import android.content.res.Configuration;
 import android.content.res.TypedArray;
@@ -23,9 +18,6 @@ import android.util.SparseArray;
 import android.util.TypedValue;
 import android.view.View;
 import android.view.ViewGroup;
-import android.util.Log;
-
-import com.facebook.yoga.android.R;
 import com.facebook.yoga.YogaAlign;
 import com.facebook.yoga.YogaConstants;
 import com.facebook.yoga.YogaDirection;
@@ -37,10 +29,11 @@ import com.facebook.yoga.YogaMeasureFunction;
 import com.facebook.yoga.YogaMeasureMode;
 import com.facebook.yoga.YogaMeasureOutput;
 import com.facebook.yoga.YogaNode;
-import com.facebook.yoga.YogaNode;
 import com.facebook.yoga.YogaOverflow;
 import com.facebook.yoga.YogaPositionType;
 import com.facebook.yoga.YogaWrap;
+import java.util.HashMap;
+import java.util.Map;
 
 /**
  * A {@code ViewGroup} based on the Yoga layout engine.
@@ -293,6 +286,8 @@ public class YogaLayout extends ViewGroup {
       if (view.getVisibility() == GONE) {
         return;
       }
+      int left = Math.round(xOffset + node.getLayoutX());
+      int top = Math.round(yOffset + node.getLayoutY());
       view.measure(
           View.MeasureSpec.makeMeasureSpec(
               Math.round(node.getLayoutWidth()),
@@ -300,11 +295,7 @@ public class YogaLayout extends ViewGroup {
           View.MeasureSpec.makeMeasureSpec(
               Math.round(node.getLayoutHeight()),
               View.MeasureSpec.EXACTLY));
-      view.layout(
+      view.layout(left, top, left + view.getMeasuredWidth(), top + view.getMeasuredHeight());
-          Math.round(xOffset + node.getLayoutX()),
-          Math.round(yOffset + node.getLayoutY()),
-          Math.round(xOffset + node.getLayoutX() + node.getLayoutWidth()),
-          Math.round(yOffset + node.getLayoutY() + node.getLayoutHeight()));
     }
 
     final int childrenCount = node.getChildCount();

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

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 package com.facebook.yoga.android;

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

@@ -2,11 +2,9 @@
 
 <!--
   Copyright (c) 2014-present, Facebook, Inc.
-  All rights reserved.
+  
-
+  This source code is licensed under the MIT license found in the
-  This source code is licensed under the BSD-style license found in the
+  LICENSE file in the root directory of this source tree.
-  LICENSE file in the root directory of this source tree. An additional grant
-  of patent rights can be found in the PATENTS file in the same directory.
 -->
 
 <resources>

benchmark/BUCK

@@ -1,9 +1,7 @@
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
 load("//:yoga_defs.bzl", "yoga_dep")
 

benchmark/YGBenchmark.c

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #include "YGBenchmark.h"

benchmark/YGBenchmark.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #pragma once

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

@@ -1,9 +1,8 @@
 /**
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System.Reflection;

csharp/BUCK

@@ -1,12 +1,9 @@
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
-load("@xplat//configurations/buck:default_platform_defs.bzl", "is_apple_platform")
+load("//:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "yoga_dep", "cxx_library", "is_apple_platform")
-load("//:yoga_defs.bzl", "BASE_COMPILER_FLAGS", "yoga_dep", "cxx_library")
 
 COMPILER_FLAGS = BASE_COMPILER_FLAGS + ["-std=c++11"]
 
@@ -38,7 +35,7 @@ cxx_library(
 if is_apple_platform():
   yoganet_ios_srcs = []
   for arch in [
-    'iphonesimulator-x86_64', 'iphonesimulator-i386', 'iphoneos-arm64', 'iphoneos-armv7'
+    'iphonesimulator-x86_64', 'iphoneos-arm64'
   ]:
     name = 'yoganet-' + arch
     yoganet_ios_srcs.append(':' + name)
@@ -66,8 +63,7 @@ if is_apple_platform():
   genrule(
     name = 'yoganet-macosx',
     srcs = [
-      yoga_dep(yoganet_macosx_target % 'x86_64'),
+      yoga_dep(yoganet_macosx_target % 'x86_64')
-      yoga_dep(yoganet_macosx_target % 'i386'),
     ],
     out = 'libyoga.dylib',
     cmd = 'lipo $SRCS -create -output $OUT',

csharp/Facebook.Yoga/BaselineFunction.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/Logger.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/MeasureFunction.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/MeasureOutput.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/Native.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/Facebook.Yoga/YGConfigHandle.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/Facebook.Yoga/YGNodeHandle.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/Facebook.Yoga/YogaAlign.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaBaselineFunc.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/Facebook.Yoga/YogaConfig.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/Facebook.Yoga/YogaConstants.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaDimension.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaDirection.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaDisplay.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaEdge.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaExperimentalFeature.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaFlexDirection.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaJustify.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaLogLevel.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaLogger.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/Facebook.Yoga/YogaMeasureFunc.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/Facebook.Yoga/YogaMeasureMode.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaNode.Spacing.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaNode.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/Facebook.Yoga/YogaNodeType.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaOverflow.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaPositionType.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaPrintOptions.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaSize.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System.Runtime.InteropServices;

csharp/Facebook.Yoga/YogaUnit.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaValue.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/Facebook.Yoga/YogaValueExtensions.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Facebook.Yoga/YogaWrap.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 namespace Facebook.Yoga

csharp/Mac/ApiDefinition.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/Mac/Facebook.Yoga.Mac.Tests/Main.cs

@@ -1,9 +1,8 @@
 /**
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/Unity/pack.sh

@@ -1,10 +1,8 @@
 #!/bin/sh
 # Copyright (c) 2014-present, Facebook, Inc.
-# All rights reserved.
 #
-# This source code is licensed under the BSD-style license found in the
+# This source code is licensed under the MIT license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
+# LICENSE file in the root directory of this source tree.
-# of patent rights can be found in the PATENTS file in the same directory.
 
 set -e
 

csharp/Windows/Facebook.Yoga.Desktop.Tests/Properties/AssemblyInfo.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System.Reflection;

csharp/Windows/Facebook.Yoga/Properties/AssemblyInfo.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System.Reflection;

csharp/Yoga/YGInterop.cpp

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #include "YGInterop.h"

csharp/Yoga/YGInterop.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #pragma once

csharp/Yoga/dllmain.cpp

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // dllmain.cpp : Defines the entry point for the DLL application.

csharp/Yoga/stdafx.cpp

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // stdafx.cpp : source file that includes just the standard includes

csharp/Yoga/stdafx.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // stdafx.h : include file for standard system include files,

csharp/Yoga/targetver.h

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 #pragma once

csharp/build-native.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 cd `dirname "$0"`
 echo $ANDROID_SDK
-BUCK_RELEASE=2017.05.09.01
+BUCK_RELEASE=2018.02.16.01
 echo "buck $BUCK_RELEASE"
 BUCK=lib/buck-$BUCK_RELEASE/bin/buck
 if $BUCK --version >/dev/null 2>&1; then true; else

csharp/iOS/Facebook.Yoga.iOS.Tests/Main.cs

@@ -1,9 +1,8 @@
 /**
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/iOS/Facebook.Yoga.iOS.Tests/UnitTestAppDelegate.cs

@@ -1,9 +1,8 @@
 /**
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE-examples file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
 
 using System;

csharp/iOS/Facebook.Yoga.iOS/ApiDefinition.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using System;

csharp/tests/Facebook.Yoga/YGAbsolutePositionTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAbsolutePositionTest.html

csharp/tests/Facebook.Yoga/YGAlignContentTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignContentTest.html

csharp/tests/Facebook.Yoga/YGAlignItemsTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignItemsTest.html

csharp/tests/Facebook.Yoga/YGAlignSelfTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAlignSelfTest.html

csharp/tests/Facebook.Yoga/YGAndroidNewsFeed.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGAndroidNewsFeed.html

csharp/tests/Facebook.Yoga/YGBorderTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGBorderTest.html

csharp/tests/Facebook.Yoga/YGDimensionTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGDimensionTest.html

csharp/tests/Facebook.Yoga/YGDisplayTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGDisplayTest.html

csharp/tests/Facebook.Yoga/YGFlexDirectionTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexDirectionTest.html

csharp/tests/Facebook.Yoga/YGFlexTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexTest.html

csharp/tests/Facebook.Yoga/YGFlexWrapTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGFlexWrapTest.html

csharp/tests/Facebook.Yoga/YGJustifyContentTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGJustifyContentTest.html

csharp/tests/Facebook.Yoga/YGMarginTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGMarginTest.html

csharp/tests/Facebook.Yoga/YGMinMaxDimensionTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGMinMaxDimensionTest.html

csharp/tests/Facebook.Yoga/YGPaddingTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGPaddingTest.html

csharp/tests/Facebook.Yoga/YGPercentageTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGPercentageTest.html

csharp/tests/Facebook.Yoga/YGRoundingTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGRoundingTest.html

csharp/tests/Facebook.Yoga/YGSizeOverflowTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 // @Generated by gentest/gentest.rb from gentest/fixtures/YGSizeOverflowTest.html

csharp/tests/Facebook.Yoga/YogaConfigTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using NUnit.Framework;

csharp/tests/Facebook.Yoga/YogaNodeSpacingTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using NUnit.Framework;

csharp/tests/Facebook.Yoga/YogaNodeTest.cs

@@ -1,10 +1,8 @@
 /**
  * Copyright (c) 2014-present, Facebook, Inc.
- * All rights reserved.
  *
- * This source code is licensed under the BSD-style license found in the
+ * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree. An additional grant
+ * LICENSE file in the root directory of this source tree.
- * of patent rights can be found in the PATENTS file in the same directory.
  */
 
 using NUnit.Framework;

docs/.gitignore

@@ -1,6 +0,0 @@
-_site/
-.sass-cache/
-.DS_STORE
-*.swo
-*.swp
-*.psd