Merge pull request #5 from vinted/swift-package-manager-2

Swift Package manager Support
vinted · Nov 3, 2021 · e3a924d · e3a924d
2 parents 5c668bf + fcf5c03
commit e3a924d
Show file tree

Hide file tree

Showing 21 changed files with 160 additions and 109 deletions.
diff --git a/Package.swift b/Package.swift
@@ -0,0 +1,46 @@
+// swift-tools-version:5.3
+// The swift-tools-version declares the minimum version of Swift required to build this package.
+
+import PackageDescription
+
+let package = Package(
+    name: "VGHtmlParser",
+    platforms: [
+        .iOS(.v11)
+    ],
+    products: [
+        // Products define the executables and libraries a package produces, and make them visible to other packages.
+        .library(
+            name: "VGHtmlParserDynamic",
+            type: .dynamic,
+            targets: ["VGHtmlParser"]
+        ),
+        .library(
+            name: "VGHtmlParserStatic",
+            type: .static,
+            targets: ["VGHtmlParser"]
+        )
+    ],
+    targets: [
+        // Targets are the basic building blocks of a package. A target can define a module or a test suite.
+        // Targets can depend on other targets in this package, and on products in packages this package depends on.
+        .target(
+            name: "VGHtmlParser",
+            dependencies: [
+                .target(name: "hpple")
+            ],
+            path: "VGHtmlParser/Classes",
+            sources: ["."],
+            publicHeadersPath: "Public",
+            cSettings: [
+                .headerSearchPath("Private/DefaultTransformers"),
+                .headerSearchPath("Private/VintedTransformers")
+            ]
+        ),
+        .target(
+            name: "hpple",
+            path: "VGHtmlParser/Dependencies/hpple/Classes",
+            publicHeadersPath: "."
+        )
+    ]
+)
diff --git a/VGHtmlParser.xcodeproj/project.pbxproj b/VGHtmlParser.xcodeproj/project.pbxproj
diff --git a/VGHtmlParser.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/VGHtmlParser.xcodeproj/project.xcworkspace/contents.xcworkspacedata
diff --git a/.../DefaultTransformers/VGHtmlATagTransfom.h → .../DefaultTransformers/VGHtmlATagTransfom.h b/.../DefaultTransformers/VGHtmlATagTransfom.h → .../DefaultTransformers/VGHtmlATagTransfom.h
diff --git a/.../DefaultTransformers/VGHtmlATagTransfom.m → .../DefaultTransformers/VGHtmlATagTransfom.m b/.../DefaultTransformers/VGHtmlATagTransfom.m → .../DefaultTransformers/VGHtmlATagTransfom.m
diff --git a/...efaultTransformers/VGHtmlBrTagTransform.h → ...efaultTransformers/VGHtmlBrTagTransform.h b/...efaultTransformers/VGHtmlBrTagTransform.h → ...efaultTransformers/VGHtmlBrTagTransform.h
diff --git a/...efaultTransformers/VGHtmlBrTagTransform.m → ...efaultTransformers/VGHtmlBrTagTransform.m b/...efaultTransformers/VGHtmlBrTagTransform.m → ...efaultTransformers/VGHtmlBrTagTransform.m
diff --git a/...DefaultTransformers/VGHtmlPTagTransform.h → ...DefaultTransformers/VGHtmlPTagTransform.h b/...DefaultTransformers/VGHtmlPTagTransform.h → ...DefaultTransformers/VGHtmlPTagTransform.h
diff --git a/...DefaultTransformers/VGHtmlPTagTransform.m → ...DefaultTransformers/VGHtmlPTagTransform.m b/...DefaultTransformers/VGHtmlPTagTransform.m → ...DefaultTransformers/VGHtmlPTagTransform.m
diff --git a/...er/VintedTransformers/HtmlATagTransform.h → ...te/VintedTransformers/HtmlATagTransform.h b/...er/VintedTransformers/HtmlATagTransform.h → ...te/VintedTransformers/HtmlATagTransform.h
@@ -7,9 +7,9 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <VGHtmlParser/VGHtmlTagTransform.h>
+#import "VGHtmlTagTransform.h"
+
 
-extern NSString * const VintedLinkAttributeName;
 
 @interface HtmlATagTransform : NSObject<VGHtmlTagTransform>
 

diff --git a/...er/VintedTransformers/HtmlATagTransform.m → ...te/VintedTransformers/HtmlATagTransform.m b/...er/VintedTransformers/HtmlATagTransform.m → ...te/VintedTransformers/HtmlATagTransform.m
diff --git a/...er/VintedTransformers/HtmlBTagTransform.h → ...te/VintedTransformers/HtmlBTagTransform.h b/...er/VintedTransformers/HtmlBTagTransform.h → ...te/VintedTransformers/HtmlBTagTransform.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <VGHtmlParser/VGHtmlTagTransform.h>
+#import "VGHtmlTagTransform.h"
 
 @interface HtmlBTagTransform : NSObject<VGHtmlTagTransform>
 

diff --git a/...er/VintedTransformers/HtmlBTagTransform.m → ...te/VintedTransformers/HtmlBTagTransform.m b/...er/VintedTransformers/HtmlBTagTransform.m → ...te/VintedTransformers/HtmlBTagTransform.m
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Vinted. All rights reserved.
 //
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 #import "HtmlBTagTransform.h"
 
 @implementation HtmlBTagTransform

diff --git a/...er/VintedTransformers/HtmlITagTransform.h → ...te/VintedTransformers/HtmlITagTransform.h b/...er/VintedTransformers/HtmlITagTransform.h → ...te/VintedTransformers/HtmlITagTransform.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <VGHtmlParser/VGHtmlTagTransform.h>
+#import "VGHtmlTagTransform.h"
 
 @interface HtmlITagTransform : NSObject<VGHtmlTagTransform>
 

diff --git a/...er/VintedTransformers/HtmlITagTransform.m → ...te/VintedTransformers/HtmlITagTransform.m b/...er/VintedTransformers/HtmlITagTransform.m → ...te/VintedTransformers/HtmlITagTransform.m
@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Vinted. All rights reserved.
 //
 
-@import UIKit;
+#import <UIKit/UIKit.h>
 #import "HtmlITagTransform.h"
 
 @implementation HtmlITagTransform

diff --git a/...r/VintedTransformers/HtmlLiTagTransform.h → ...e/VintedTransformers/HtmlLiTagTransform.h b/...r/VintedTransformers/HtmlLiTagTransform.h → ...e/VintedTransformers/HtmlLiTagTransform.h
@@ -1,5 +1,5 @@
 #import <Foundation/Foundation.h>
-#import <VGHtmlParser/VGHtmlTagTransform.h>
+#import "VGHtmlTagTransform.h"
 
 @interface HtmlLiTagTransform : NSObject<VGHtmlTagTransform>
 

diff --git a/...r/VintedTransformers/HtmlLiTagTransform.m → ...e/VintedTransformers/HtmlLiTagTransform.m b/...r/VintedTransformers/HtmlLiTagTransform.m → ...e/VintedTransformers/HtmlLiTagTransform.m
@@ -1,4 +1,4 @@
-@import UIKit;
+#import <UIKit/UIKit.h>
 #import "HtmlLiTagTransform.h"
 
 @implementation HtmlLiTagTransform

diff --git a/VGHtmlParser/Classes/VGHtmlParser.h → VGHtmlParser/Classes/Public/VGHtmlParser.h b/VGHtmlParser/Classes/VGHtmlParser.h → VGHtmlParser/Classes/Public/VGHtmlParser.h
@@ -1,11 +1,7 @@
 #import <UIKit/UIKit.h>
-#import <VGHtmlParser/VGHtmlTagTransform.h>
-#import <VGHtmlParser/HtmlATagTransform.h>
-#import <VGHtmlParser/HtmlITagTransform.h>
-#import <VGHtmlParser/HtmlBTagTransform.h>
-#import <VGHtmlParser/HtmlLiTagTransform.h>
-#import <VGHtmlParser/XPathQuery.h>
+#import "VGHtmlTagTransform.h"
 
+extern NSString * _Nonnull const VintedLinkAttributeName;
 extern NSString * __nonnull const VGHtmlParserMissingTagNameException;
 
 @interface VGHtmlParser : NSObject

diff --git a/VGHtmlParser/Classes/VGHtmlParser.m → VGHtmlParser/Classes/Public/VGHtmlParser.m b/VGHtmlParser/Classes/VGHtmlParser.m → VGHtmlParser/Classes/Public/VGHtmlParser.m
diff --git a/VGHtmlParser/Classes/VGHtmlTagTransform.h → ...arser/Classes/Public/VGHtmlTagTransform.h b/VGHtmlParser/Classes/VGHtmlTagTransform.h → ...arser/Classes/Public/VGHtmlTagTransform.h
@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <VGHtmlParser/TFHpple.h>
+#import "TFHpple.h"
 
 @protocol VGHtmlTagTransform <NSObject>
 

diff --git a/VGHtmlParser/Dependencies/hpple/Classes/TFHpple.h b/VGHtmlParser/Dependencies/hpple/Classes/TFHpple.h
@@ -29,7 +29,7 @@
 
 
 #import <Foundation/Foundation.h>
-#import <VGHtmlParser/TFHppleElement.h>
+#import "TFHppleElement.h"
 
 @interface TFHpple : NSObject