Merge pull request #13 from tigerpixel/development

Patch to Ensure that builds with latest Swift Tools.

Author: tigerpixel

CHANGELOG.md

@@ -48,3 +48,10 @@
 * Remove string copies using Swift 5 string updates.
 * Remove some typealiases masking Swift types for transparency.
 * Increase unit test readability.
+
+## Version 2.0.1
+
+### *Released 2019-08-20*
+* Update to Swift Package Manager to make compatible with Swift 5
+* This version is only required is using SPM
+

Package.swift

@@ -1,3 +1,4 @@
+// swift-tools-version:5.0
 //
 //  Package.swift
 //  ParserCombinator
@@ -11,5 +12,12 @@
 import PackageDescription
 
 let package = Package(
-    name: "ParserCombinator"
+    name: "ParserCombinator",
+    products: [
+        .library(name: "ParserCombinator", targets: ["ParserCombinator"])
+    ],
+    targets: [
+        .target(name: "ParserCombinator"),
+        .testTarget(name: "ParserCombinatorTests", dependencies: ["ParserCombinator"])
+    ]
 )

ParserCombinator.podspec

@@ -6,7 +6,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ParserCombinator'
-  s.version          = '2.0.0'
+  s.version          = '2.0.1'
   s.summary          = 'Exquisitely simple functional parsing in Swift.'
   s.description      = <<-DESC
 A simple parser combinator, created in Swift. Functional parser combinators can be extremely useful but can also be difficult to understand. ParserCombinator attempts to strip this back and create a simple and user friendly way to parse complex strings into other objects. Technical terms, like 'monad', are avoided or explained if necessary and docs are provided in plain English, with examples. 
@@ -24,5 +24,5 @@ A simple parser combinator, created in Swift. Functional parser combinators can
   s.tvos.deployment_target = '9.0'
   s.swift_version = '5.0'
 
-  s.source_files = 'Source/**/*.swift'
+  s.source_files = 'Sources/**/*.swift'
 end

ParserCombinator.xcodeproj/project.pbxproj

@@ -216,7 +216,7 @@
 			children = (
 				0C1242081E7B19BD00457CBA /* Docs */,
 				0C07C29D1E5251BA00A921A8 /* ParserCombinator */,
-				0C1242061E7B19A000457CBA /* Source */,
+				0C1242061E7B19A000457CBA /* Sources */,
 				0C1242071E7B19B700457CBA /* Tests */,
 				0C07C29C1E5251BA00A921A8 /* Products */,
 			);
@@ -245,18 +245,12 @@
 			path = ParserCombinator;
 			sourceTree = "<group>";
 		};
-		0C1242061E7B19A000457CBA /* Source */ = {
+		0C1242061E7B19A000457CBA /* Sources */ = {
 			isa = PBXGroup;
 			children = (
-				0C12421A1E7B1AA400457CBA /* Parser.swift */,
-				0C12421B1E7B1AA400457CBA /* Parser+Run.swift */,
-				0C3C65B41E85B96D009ED072 /* Parser+Combinators.swift */,
-				0C131CDE1E84A99B00C60A38 /* ParserOperators.swift */,
-				0C12421C1E7B1AA400457CBA /* ParseResult.swift */,
-				0C1437901E7CC990006E3D06 /* ConvienienceParsers */,
-				0C14378E1E7CC94E006E3D06 /* FoundationExtensions */,
+				0C2ACB63230A90A10091366A /* ParserCombinator */,
 			);
-			path = Source;
+			path = Sources;
 			sourceTree = "<group>";
 		};
 		0C1242071E7B19B700457CBA /* Tests */ = {
@@ -334,6 +328,20 @@
 			name = ConvenienceParsers;
 			sourceTree = "<group>";
 		};
+		0C2ACB63230A90A10091366A /* ParserCombinator */ = {
+			isa = PBXGroup;
+			children = (
+				0C12421A1E7B1AA400457CBA /* Parser.swift */,
+				0C12421B1E7B1AA400457CBA /* Parser+Run.swift */,
+				0C3C65B41E85B96D009ED072 /* Parser+Combinators.swift */,
+				0C131CDE1E84A99B00C60A38 /* ParserOperators.swift */,
+				0C12421C1E7B1AA400457CBA /* ParseResult.swift */,
+				0C1437901E7CC990006E3D06 /* ConvienienceParsers */,
+				0C14378E1E7CC94E006E3D06 /* FoundationExtensions */,
+			);
+			path = ParserCombinator;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXHeadersBuildPhase section */

ParserCombinator/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>2.0.0</string>
+	<string>2.0.1</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>NSHumanReadableCopyright</key>