upgrading to swift 4.2

RockfordWei · Mar 14, 2019 · 5c04d84 · 5c04d84
1 parent 2998486
commit 5c04d84
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version:4.0
+// swift-tools-version:4.2
 
 import PackageDescription
 
@@ -10,12 +10,18 @@ let package = Package(
             targets: ["PerfectPCRE2"]),
     ],
     dependencies: [
-      .package(url: "https://github.com/RockfordWei/pcre2api.git", from: "1.0.0"),
     ],
     targets: [
+        .systemLibrary(name: "pcre2api",
+            pkgConfig: "libpcre2-8",
+            providers: [
+                .apt(["libpcre2-dev"]),
+                .brew(["pcre2"])
+            ]
+        ),
         .target(
             name: "PerfectPCRE2",
-            dependencies: []),
+            dependencies: ["pcre2api"]),
         .testTarget(
             name: "PerfectPCRE2Tests",
             dependencies: ["PerfectPCRE2"]),

diff --git a/Sources/pcre2api/module.modulemap b/Sources/pcre2api/module.modulemap
@@ -0,0 +1,4 @@
+module pcre2api [system] {
+  header "pcre2api.h"
+  export *
+}
diff --git a/Sources/pcre2api/pcre2api.h b/Sources/pcre2api/pcre2api.h
@@ -0,0 +1,7 @@
+#ifndef __PCRE2_API__
+#define __PCRE2_API__
+#define PCRE2_CODE_UNIT_WIDTH 8
+
+#include "pcre2.h"
+
+#endif