Add Swift extension as a separate pod

Summary:
Adds swift extension file as a separate subspec, as it is not required for the objc projects.

Also this fixes the current issue where the flipper sample app fails to build on xcode 11, as it fails to link the Swift specific literals.

Fixes this too https://github.com/facebook/yoga/issues/565

Reviewed By: SidharthGuglani

Differential Revision: D18373993

fbshipit-source-id: 0c058886a837c7ceafcd0167f878b3e0f7763aa1

CMakeLists.txt

@@ -1,14 +1,21 @@
-#
 # Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-#
 
 cmake_minimum_required(VERSION 3.4.1)
 
 set(CMAKE_VERBOSE_MAKEFILE on)
 
+add_compile_options(
+    -fno-omit-frame-pointer
+    -fexceptions
+    -fvisibility=hidden
+    -ffunction-sections
+    -fdata-sections
+    -Wall
+    -std=c++11)
+
 file(GLOB_RECURSE yogacore_SRC yoga/*.cpp)
 add_library(yogacore STATIC ${yogacore_SRC})
 

Yoga.podspec

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

YogaKit/Source/UIView+Yoga.h

@@ -1,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 #import "YGLayout.h"
 #import <yoga/Yoga.h>
 

YogaKit/Source/YGLayout.h

@@ -1,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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

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,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import Foundation

YogaKit/YogaKitSample/YogaKitSample/ExamplesViewController.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/SwiftViewController.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/ViewController.m

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 #import "ViewController.h"

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/BasicViewController.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/ViewControllers/LayoutInclusionViewController.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 import UIKit

YogaKit/YogaKitSample/YogaKitSample/Views/SingleLabelCollectionCell.swift

@@ -1,9 +1,8 @@
-/**
+/*
- * Copyright 2014-present, Facebook, Inc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
- * 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.
  */
 
 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", "INFER_ANNOTATIONS_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID_JAVA_TARGET", "ANDROID_RES_TARGET", "JAVA_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "yoga_android_aar", "yoga_android_resource")
 
 yoga_android_aar(
     name = "android",
@@ -14,7 +14,6 @@ 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga.android;
 
 import java.util.HashMap;
@@ -17,6 +18,7 @@ import android.view.View;
 import android.view.ViewGroup;
 
 import com.facebook.yoga.YogaNode;
+import com.facebook.yoga.YogaNodeFactory;
 
 /**
  * Much like a {@link YogaLayout}, except this class does not render itself (the container) to the
@@ -32,7 +34,7 @@ public class VirtualYogaLayout extends ViewGroup {
 
   final private List<View> mChildren = new LinkedList<>();
   final private Map<View, YogaNode> mYogaNodes = new HashMap<>();
-  final private YogaNode mYogaNode = YogaNode.create();
+  final private YogaNode mYogaNode = YogaNodeFactory.create();
 
   public VirtualYogaLayout(Context context) {
     super(context);
@@ -72,7 +74,7 @@ public class VirtualYogaLayout extends ViewGroup {
       return;
     }
 
-    YogaNode node = YogaNode.create();
+    YogaNode node = YogaNodeFactory.create();
     YogaLayout.LayoutParams lp = new YogaLayout.LayoutParams(params);
     YogaLayout.applyLayoutParams(lp, node, child);
     node.setData(child);

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

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

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

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga.android;
 
 import android.content.Context;

benchmark/YGBenchmark.c

@@ -1,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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 = '26.0.2'
+    buildToolsVersion = '28.0.3'
     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,10 +1,7 @@
 #!/bin/sh
-
-#
 # Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-#
 
 ./csharp/Mac/Facebook.Yoga.Mac.Tests/bin/Release/Facebook.Yoga.Mac.Tests.app/Contents/MacOS/Facebook.Yoga.Mac.Tests

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

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 using System;
 using Microsoft.VisualStudio.TestPlatform.UnitTestFramework;
 using Facebook.Yoga;

csharp/Yoga/YGInterop.cpp

@@ -1,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include "YGInterop.h"
 
 static YGInteropLogger gManagedLogger;

csharp/Yoga/YGInterop.h

@@ -1,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 #include <yoga/Yoga.h>

csharp/Yoga/dllmain.cpp

@@ -1,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
 /*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,11 +1,8 @@
 #!/bin/sh
-
-#
 # Copyright (c) Facebook, Inc. and its affiliates.
 #
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
-#
 
 cd `dirname "$0"`
 echo $ANDROID_SDK

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,4 +1,9 @@
 #!/bin/sh
+# Copyright (c) Facebook, Inc. and its affiliates.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
 if mcs --version >/dev/null 2>&1 && mono --version >/dev/null 2>&1; then true; else
   echo "ERROR: Need to install Mono (brew install mono, or http://www.mono-project.com/download/)"
   exit 1

gentest/gentest-java.js

@@ -72,7 +72,7 @@ JavaEmitter.prototype = Object.create(Emitter.prototype, {
     this.push('public void test_' + name + '() {');
     this.pushIndent();
 
-    this.push("YogaConfig config = new YogaConfig();")
+    this.push("YogaConfig config = YogaConfigFactory.create();")
     for (var i in experiments) {
       this.push('config.setExperimentalFeatureEnabled(YogaExperimentalFeature.' + toJavaUpper(experiments[i]) +', true);');
     }

gentest/gentest.rb

@@ -1,4 +1,8 @@
 #!/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
+VERSION_NAME=1.16.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,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // Configure the Android maven publication
 
 apply plugin: 'com.github.dcendents.android-maven'

gradle/android-tasks.gradle

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

gradle/bintray.gradle

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // Upload to Bintray
 apply plugin: 'com.jfrog.bintray'
 

gradle/release-bintray.gradle

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // Set up everything required for releasing on Bintray
 ext {
     bintrayRepo = 'maven'

gradle/release.gradle

@@ -1,3 +1,10 @@
+/*
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ *
+ * This source code is licensed under the MIT license found in the
+ * LICENSE file in the root directory of this source tree.
+ */
+
 // Common Android tasks for all releases that generate Javadocs, sources, etc.
 apply from: rootProject.file('gradle/android-tasks.gradle')
 

java/BUCK

@@ -3,13 +3,19 @@
 # This source code is licensed under the MIT license found in the
 # LICENSE file in the root directory of this source tree.
 
-load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "FBJNI_JAVA_TARGET", "FBJNI_TARGET", "INFER_ANNOTATIONS_TARGET", "JNI_TARGET", "JSR_305_TARGET", "JUNIT_TARGET", "PROGRUARD_ANNOTATIONS_TARGET", "SOLOADER_TARGET", "yoga_cxx_lib", "yoga_cxx_library", "yoga_dep", "yoga_java_binary", "yoga_java_library", "yoga_java_test")
+load("//tools/build_defs/oss:yoga_defs.bzl", "ANDROID", "CXX_LIBRARY_WHITELIST", "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")
 
 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"]),
@@ -19,6 +25,9 @@ yoga_cxx_library(
     compiler_flags = [
         "-fno-omit-frame-pointer",
         "-fexceptions",
+        "-fvisibility=hidden",
+        "-ffunction-sections",
+        "-fdata-sections",
         "-fPIC",
         "-Wall",
         "-Werror",
@@ -38,9 +47,40 @@ 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",
@@ -48,13 +88,9 @@ yoga_java_library(
         yoga_dep("java:tests"),
     ],
     visibility = ["PUBLIC"],
-    deps = [
+    exported_deps = [
-        ":jni",
+        ":java-impl",
-        FBJNI_JAVA_TARGET,
+        ":java-interface",
-        INFER_ANNOTATIONS_TARGET,
-        JSR_305_TARGET,
-        PROGRUARD_ANNOTATIONS_TARGET,
-        SOLOADER_TARGET,
     ],
 )
 

java/CMakeLists.txt

@@ -1,9 +1,7 @@
-#
 # 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)
 
@@ -26,13 +24,19 @@ 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)
 
-add_library(yoga SHARED jni/YGJNI.cpp jni/YGJTypes.cpp)
+file(GLOB jni_SRC
+        jni/*.cpp)
+
+add_library(yoga SHARED ${jni_SRC})
 
 target_include_directories(yoga PRIVATE
     ${libfb_DIR}/include
     ${yogacore_DIR})
 
-target_link_libraries(yoga yogacore fb)
+target_link_libraries(yoga -Wl,--gc-sections 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,11 @@ android {
 }
 
 dependencies {
-    compileOnly 'com.google.code.findbugs:jsr305:3.0.1'
+    implementation 'com.google.code.findbugs:jsr305:3.0.1'
-    compileOnly project(':yoga:proguard-annotations')
+    implementation project(':yoga:proguard-annotations')
     implementation 'com.facebook.soloader:soloader:0.5.1'
     testImplementation 'junit:junit:4.12'
-    testCompile project(':testutil')
+    testImplementation project(':testutil')
 }
 
 task sourcesJar(type: Jar) {

java/com/facebook/yoga/LayoutPassReason.java

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
 public enum LayoutPassReason {

java/com/facebook/yoga/YogaAlign.java

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,79 +1,45 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
-import com.facebook.soloader.SoLoader;
+public abstract class YogaConfig {
-
-public class YogaConfig {
 
   public static int SPACING_TYPE = 1;
 
-  long mNativePointer;
+  public abstract void setExperimentalFeatureEnabled(YogaExperimentalFeature feature, boolean enabled);
-  private YogaLogger mLogger;
-  private YogaNodeCloneFunction mYogaNodeCloneFunction;
 
-  public YogaConfig() {
+  public abstract void setUseWebDefaults(boolean useWebDefaults);
-    mNativePointer = YogaNative.jni_YGConfigNew();
-    if (mNativePointer == 0) {
-      throw new IllegalStateException("Failed to allocate native memory");
-    }
-  }
 
-  @Override
+  public abstract void setPrintTreeFlag(boolean enable);
-  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 void setUseLegacyStretchBehaviour(boolean useLegacyStretchBehaviour) {
+  public abstract 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 void setShouldDiffLayoutWithoutLegacyStretchBehaviour(
+  public abstract void setShouldDiffLayoutWithoutLegacyStretchBehaviour(
-      boolean shouldDiffLayoutWithoutLegacyStretchBehaviour) {
+      boolean shouldDiffLayoutWithoutLegacyStretchBehaviour);
-    YogaNative.jni_YGConfigSetShouldDiffLayoutWithoutLegacyStretchBehaviour(
-        mNativePointer, shouldDiffLayoutWithoutLegacyStretchBehaviour);
-  }
 
-  public void setLogger(YogaLogger logger) {
+  public abstract void setLogger(YogaLogger logger);
-    mLogger = logger;
-    YogaNative.jni_YGConfigSetLogger(mNativePointer, logger);
-  }
 
-  public YogaLogger getLogger() {
+  public abstract YogaLogger getLogger();
-    return mLogger;
+
-  }
+  abstract long getNativePointer();
+
+  public abstract void setUseVanillaJNI(boolean useVanillaJNI);
+
+  public abstract boolean useVanillaJNI();
 }

java/com/facebook/yoga/YogaConfigFactory.java

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

java/com/facebook/yoga/YogaConfigJNIBase.java

@@ -0,0 +1,112 @@
+/*
+ * 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

@@ -0,0 +1,38 @@
+/*
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
 public class YogaConstants {

java/com/facebook/yoga/YogaDimension.java

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * 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,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;

java/com/facebook/yoga/YogaExperimentalFeature.java

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;

java/com/facebook/yoga/YogaFlexDirection.java

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;

java/com/facebook/yoga/YogaJustify.java

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;

java/com/facebook/yoga/YogaLayoutType.java

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
 public enum YogaLayoutType {

java/com/facebook/yoga/YogaLogLevel.java

@@ -1,9 +1,10 @@
-/**
+/*
  * Copyright (c) Facebook, Inc. and its affiliates.
  *
- * This source code is licensed under the MIT license found in the LICENSE
+ * This source code is licensed under the MIT license found in the
- * file in the root directory of this source tree.
+ * LICENSE file in the root directory of this source tree.
  */
+
 package com.facebook.yoga;
 
 import com.facebook.proguard.annotations.DoNotStrip;