chore: move FlexLayout.h to public header directory

layoutBox · Feb 12, 2024 · fe8c720 · fe8c720
1 parent c5a9e97
commit fe8c720
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/FlexLayout.xcodeproj/project.pbxproj b/FlexLayout.xcodeproj/project.pbxproj
@@ -174,7 +174,6 @@
 		24AE97341FEAF30A00995987 /* SupportingFiles */ = {
 			isa = PBXGroup;
 			children = (
-				24AE97351FEAF30A00995987 /* FlexLayout.h */,
 			);
 			path = SupportingFiles;
 			sourceTree = "<group>";
@@ -307,6 +306,14 @@
 			path = YogaKit;
 			sourceTree = "<group>";
 		};
+		71CE1DE72B79E81500FD1037 /* Public */ = {
+			isa = PBXGroup;
+			children = (
+				24AE97351FEAF30A00995987 /* FlexLayout.h */,
+			);
+			path = Public;
+			sourceTree = "<group>";
+		};
 		B5403C6F81C3814B69C05D0B /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -320,6 +327,7 @@
 		B9EAD87E238884C90058E0CB /* Swift */ = {
 			isa = PBXGroup;
 			children = (
+				71CE1DE72B79E81500FD1037 /* Public */,
 				24AE972E1FEAF30A00995987 /* FlexLayout.swift */,
 				24AE972F1FEAF30A00995987 /* Impl */,
 				24AE97331FEAF30A00995987 /* Percent.swift */,

diff --git a/Package.swift b/Package.swift
@@ -12,34 +12,27 @@ let package = Package(
     .target(
       name: "FlexLayout",
       dependencies: ["FlexLayoutYoga", "FlexLayoutYogaKit"],
-      path: "Sources/Swift"
+      path: "Sources/Swift",
+      publicHeadersPath: "Public"
     ),
     .target(
       name: "FlexLayoutYoga",
       dependencies: [],
       path: "Sources/yoga",
-      publicHeadersPath: "include/yoga/",
-      cxxSettings: [
-        .headerSearchPath("include/yoga/"),
-        .headerSearchPath("."),
-      ]
+      publicHeadersPath: "include/yoga"
     ),
     .target(
       name: "FlexLayoutYogaKit",
       dependencies: ["FlexLayoutYoga"],
       path: "Sources/YogaKit",
-      publicHeadersPath: "include/YogaKit/",
-      cxxSettings: [
-        .headerSearchPath("include/YogaKit/"),
-        .headerSearchPath("."),
-      ]
+      publicHeadersPath: "include/YogaKit"
     ),
     .testTarget(
       name: "FlexLayoutTests",
       dependencies: [
-        "FlexLayout"
+        "FlexLayout",
       ]
-    )
+    ),
   ],
   cLanguageStandard: .gnu99,
   cxxLanguageStandard: .gnucxx11

diff --git a/Sources/SupportingFiles/FlexLayout.h → Sources/Swift/Public/FlexLayout.h b/Sources/SupportingFiles/FlexLayout.h → Sources/Swift/Public/FlexLayout.h