Merge pull request #15 from tigerpixel/development

Swift 5.1

Author: tigerpixel

.travis.yml

@@ -1,4 +1,4 @@
-osx_image: xcode10.3
+osx_image: xcode11
 language: objective-c
 
 install:

CHANGELOG.md

@@ -52,6 +52,14 @@
 ## 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
+* Update to Swift Package Manager to make compatible with Swift 5.
+* This version is only required is using SPM.
+
+## Version 2.1.0
+
+### *Released 2019-09-30*
+* Update to Swift Package Manager to make compatible with Swift 5.1.
+* Added Swift package manager capabilities to all platforms.
+* Updated Swift code to take advantage of Swift 5.1 features.
+* Swiftlint version update to 0.35.0
 

Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.0
+// swift-tools-version:5.1
 //
 //  Package.swift
 //  ParserCombinator
@@ -13,6 +13,10 @@ import PackageDescription
 
 let package = Package(
     name: "ParserCombinator",
+    platforms: [
+        // Other platforms compile as far back as possible by default.
+        .macOS(.v10_10)
+    ],
     products: [
         .library(name: "ParserCombinator", targets: ["ParserCombinator"])
     ],

ParserCombinator.podspec

@@ -6,7 +6,7 @@
 
 Pod::Spec.new do |s|
   s.name             = 'ParserCombinator'
-  s.version          = '2.0.1'
+  s.version          = '2.1.0'
   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. 
@@ -22,7 +22,7 @@ A simple parser combinator, created in Swift. Functional parser combinators can
   s.watchos.deployment_target = '2.0'
   s.osx.deployment_target = '10.9'
   s.tvos.deployment_target = '9.0'
-  s.swift_version = '5.0'
+  s.swift_version = '5.1'
 
   s.source_files = 'Sources/**/*.swift'
 end

ParserCombinator.xcodeproj/project.pbxproj

@@ -927,6 +927,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.tigerpixel.ParserCombinator;
 				PRODUCT_NAME = ParserCombinator;
 				SKIP_INSTALL = YES;
@@ -950,6 +951,7 @@
 				INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks";
+				MARKETING_VERSION = 2.1.0;
 				PRODUCT_BUNDLE_IDENTIFIER = com.tigerpixel.ParserCombinator;
 				PRODUCT_NAME = ParserCombinator;
 				SKIP_INSTALL = YES;

ParserCombinator/Info.plist

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

README.md

@@ -25,13 +25,25 @@ Pull requests for improvements are welcome.
 There are no external requirements for this project, just Swift.
 
 - iOS 8.0+ / macOS 10.9+ / tvOS 9.0+ / watchOS 2.0+
-- Xcode 10.3+
-- Swift 5.0+
+- Xcode 11+
+- Swift 5.1+
 
 For previous versions of Xcode and Swift please see prior releases.
 
 ## Installation
 
+### Swift Package Manager
+
+The [Swift Package Manager](https://swift.org/package-manager) is the official tool for managing the distribution of Swift code. It is currently available for all Apple platforms. It can also be used with Linux but this project does not fully support Linux at this point in time.
+
+If you use it to manage your dependencies, simply add ParserCombinator to the dependencies value of your Package.swift file.
+
+```swift
+dependencies: [
+    .package(url: "https://github.com/Tigerpixel/ParserCombinator.git", from: "2.1.0")
+]
+```
+
 ### Cocoapods
 
 ParserCombinator is available through [CocoaPods](https://cocoapods.org/pods/ParserCombinator). To install it, simply add the following line to your Podfile:
@@ -50,18 +62,6 @@ github "tigerpixel/ParserCombinator"
 
 If you use Carthage to build your dependencies, make sure you have added `ParserCombinator.framework` to the "_Linked Frameworks and Libraries_" section of your target, and have included them in your Carthage framework copying build phase.
 
-### Swift Package Manager
-
-The [Swift Package Manager](https://swift.org/package-manager) is the official tool for managing the distribution of Swift code. It is currently available for macOS. It can also be used with Linux but this project does not fully support Linux at this point in time.
-
-If you use it to manage your dependencies, simply add ParserCombinator to the dependencies value of your Package.swift file.
-
-```swift
-dependencies: [
-.Package(url: "https://github.com/Tigerpixel/ParserCombinator.git", majorVersion: 2)
-]
-```
-
 ### Git Submodule
 
 1. Add the ParserCombinator repository as a [submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules) of your application’s repository.

Sources/ParserCombinator/Character+UnicodeScalar.swift

@@ -10,7 +10,7 @@ extension Character {
 
     /// The characters's value represented as Unicode scalar value.
     var unicodeScalar: UnicodeScalar {
-        return String(self).unicodeScalars.first!
+        String(self).unicodeScalars.first!
     }
 
 }

Sources/ParserCombinator/CharacterParsers.swift

@@ -57,7 +57,7 @@ public func character(condition: @escaping (Character) -> Bool) -> Parser<Charac
  - returns: The parser whith the same semantic as the character set given.
  */
 public func character(isInCharacterSet charSet: CharacterSet) -> Parser<Character> {
-    return character { charSet.contains($0.unicodeScalar) }
+    character { charSet.contains($0.unicodeScalar) }
 }
 
 /**
@@ -71,7 +71,7 @@ public func character(isInCharacterSet charSet: CharacterSet) -> Parser<Characte
  - returns: The parser which will only allow the given character to pass, all others will fail.
  */
 public func character(isEqualTo token: Character) -> Parser<Character> {
-    return character { $0 == token }
+    character { $0 == token }
 }
 
 /**
@@ -85,7 +85,7 @@ public func character(isEqualTo token: Character) -> Parser<Character> {
  - returns: The parser which will only allow the given characters to pass, all others will fail.
  */
 public func character(isInString string: String) -> Parser<Character> {
-    return character { string.contains($0) }
+    character { string.contains($0) }
 }
 
 // MARK: Pre-made pasers using the character parser function for common sets of characters.

Sources/ParserCombinator/NumberParsers.swift

@@ -9,9 +9,5 @@
 /// A set of tokens describing an integer number. The number can consist of one or more digits.
 public let integerNumber = digit.oneOrMany.map { characterArray -> Int in
 
-    guard let integerNumber = Int(String(characterArray)) else {
-        return 0
-    }
-
-    return integerNumber
+    Int(String(characterArray)) ?? 0
 }