Package.swift

@@ -11,7 +11,6 @@ let package = Package(
     products: [
         .library(
             name: "yoga",
-            type: .dynamic,
             targets: ["yoga"]
         ),
     ],
@@ -20,6 +19,7 @@ let package = Package(
             name: "yoga",
             dependencies: [],
             path: "./yoga",
+            publicHeadersPath: "./apple-public",
             cxxSettings: [
                 .headerSearchPath("../"),
             ],

Yoga.podspec

@@ -33,7 +33,6 @@ Pod::Spec.new do |spec|
       '-fPIC'
   ]
   spec.source_files = 'yoga/**/*.{c,h,cpp}'
-  spec.exclude_files = 'yoga/include/*.h'
-  spec.public_header_files = 'yoga/{Yoga,YGEnums,YGMacros,YGNode,YGStyle,YGValue}.h'
+  spec.public_header_files = 'yoga/apple-public/umbrella.h'
 
 end

yoga/YGMacros.h

@@ -7,16 +7,6 @@
 
 #pragma once
 
-
-#ifdef __OBJC__
-#import <Foundation/Foundation.h>
-#endif
-
-
-
-
-
-
 #ifdef __cplusplus
 #define YG_EXTERN_C_BEGIN extern "C" {
 #define YG_EXTERN_C_END }

yoga/apple-public/umbrella.h

@@ -0,0 +1,19 @@
+/*
+ * 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.
+ */
+
+#pragma once
+
+#ifdef __OBJC__
+#import <Foundation/Foundation.h>
+
+#include "../YGEnums.h"
+#include "../YGMacros.h"
+#include "../YGNode.h"
+#include "../YGStyle.h"
+#include "../YGValue.h"
+#include "../Yoga.h"
+#endif

yoga/include/YGEnums.h

@@ -1 +0,0 @@
-../YGEnums.h

yoga/include/YGMacros.h

@@ -1 +0,0 @@
-../YGMacros.h

yoga/include/YGNode.h

@@ -1 +0,0 @@
-../YGNode.h

yoga/include/YGStyle.h

@@ -1 +0,0 @@
-../YGStyle.h

yoga/include/YGValue.h

@@ -1 +0,0 @@
-../YGValue.h

yoga/include/Yoga.h

@@ -1 +0,0 @@
-../Yoga.h