Merge pull request #62 from zintus/yoga-core

[WIP] Update yoga core to latest master

Author: lucdion

.buckconfig

@@ -0,0 +1,2 @@
+[cxx]
+  gtest_dep = //lib/gtest:gtest

.gitignore

@@ -14,3 +14,11 @@ Carthage/Build/iOS/*.dSYM
 Carthage/Build/iOS/*.bcsymbolmap
 Carthage/Build/tvOS
 Carthage/Checkouts
+
+# Buck
+/buck-cache/
+/buck-out/
+/.buckconfig.local
+/.buckd
+/gentest/test.html
+.buckversion

.travis.yml

@@ -1,7 +1,14 @@
 language: objective-c
 osx_image: xcode9.2
 
+cache:
+  directories:
+  - buck-out/cache
+
 before_install:
+  # Update homebrew and ensure our bundle
+  - brew update && brew bundle
+
   # - rvm use $RVM_RUBY_VERSION
   - bundle install
   - gem install xcpretty-travis-formatter;
@@ -11,6 +18,7 @@ before_install:
   # - carthage bootstrap --verbose --platform iOS --cache-builds --use-ssh 
 
 script:
+  - buck test :yoga
   - set -o pipefail && bundle exec fastlane travis
 
 after_success:

BUCK

@@ -0,0 +1,45 @@
+# Copyright (c) 2014-present, Facebook, Inc.
+#
+# This source code is licensed under the MIT license found in the
+# LICENSE file in the root directory of this source tree.
+
+load("//:yoga_defs.bzl", "LIBRARY_COMPILER_FLAGS", "BASE_COMPILER_FLAGS", "GTEST_TARGET", "yoga_dep", "cxx_library", "cxx_test")
+
+GMOCK_OVERRIDE_FLAGS = [
+    # gmock does not mark mocked methods as override, ignore the warnings in tests
+    "-Wno-inconsistent-missing-override",
+]
+
+COMPILER_FLAGS = LIBRARY_COMPILER_FLAGS + [
+    "-std=c++1y",
+]
+
+TEST_COMPILER_FLAGS = BASE_COMPILER_FLAGS + GMOCK_OVERRIDE_FLAGS + [
+    "-std=c++1y",
+]
+
+cxx_library(
+    name = "yoga",
+    srcs = glob(["Sources/yoga/*.cpp"]),
+    header_namespace = "yoga",
+    exported_headers = subdir_glob([("Sources/yoga", "*.h")]),
+    compiler_flags = COMPILER_FLAGS,
+    soname = "libyogacore.$(ext)",
+    tests = [":YogaTests"],
+    visibility = ["PUBLIC"],
+    deps = [
+        yoga_dep("lib/fb:ndklog"),
+    ],
+)
+
+cxx_test(
+    name = "YogaTests",
+    srcs = glob(["core-tests/*.cpp"]),
+    compiler_flags = TEST_COMPILER_FLAGS,
+    contacts = ["[email protected]"],
+    visibility = ["PUBLIC"],
+    deps = [
+        ":yoga",
+        GTEST_TARGET,
+    ],
+)

Brewfile

@@ -0,0 +1,2 @@
+tap 'facebook/fb'
+brew 'buck'

FlexLayout.podspec

@@ -14,14 +14,17 @@ Pod::Spec.new do |spec|
   spec.platform     = :ios, "9.0"
 
   spec.source       = { :git => "https://github.com/lucdion/FlexLayout.git", :tag => "#{spec.version}" }
-  spec.source_files  = "Sources/**/*.{swift,h,m,cpp,c}"
+  spec.source_files  = "Sources/**/*.{swift,h,m,mm,cpp,c}"
+  spec.public_header_files = "Sources/yoga/{Yoga,YGEnums,YGMacros}.h", "Sources/YogaKit/{UIView+Yoga,YGLayout}.h"
 
-  #spec.compiler_flags = [
-  #    '-fno-omit-frame-pointer',
-  #    '-fexceptions',
-  #    '-Wall',
-  #    '-Werror',
-  #    '-std=c11',
-  #    '-fPIC'
-  #]
+
+  # Should match yoga_defs.bzl + BUCK configuration
+  spec.compiler_flags = [
+     '-fno-omit-frame-pointer',
+     '-fexceptions',
+     '-Wall',
+     '-Werror',
+     '-std=c++1y',
+     '-fPIC'
+  ]
 end

FlexLayout.xcodeproj/project.pbxproj

@@ -27,9 +27,3 @@ FOUNDATION_EXPORT const unsigned char FlexLayoutVersionString[];
 #import "Yoga.h"
 #import "YGEnums.h"
 #import "YGMacros.h"
-#import "YGMacros.h"
-
-
-
-
-