Support Xcode10, Swift4.2

.travis.yml

@@ -17,9 +17,19 @@ matrix:
         - set -o pipefail
         - xcodebuild build-for-testing test-without-building -workspace JSONRPCKit.xcworkspace -scheme JSONRPCKit | xcpretty -c
         - xcodebuild build-for-testing test-without-building -workspace JSONRPCKit.xcworkspace -scheme JSONRPCKit -sdk iphonesimulator -destination "name=iPhone SE" | xcpretty -c
-        - xcodebuild build-for-testing test-without-building -workspace JSONRPCKit.xcworkspace -scheme JSONRPCKit -sdk appletvsimulator -destination "name=Apple TV 1080p" | xcpretty -c
+        - xcodebuild build-for-testing test-without-building -workspace JSONRPCKit.xcworkspace -scheme JSONRPCKit -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c
+        - xcodebuild build -workspace JSONRPCKit.xcworkspace -scheme JSONRPCKit -sdk watchsimulator | xcpretty -c
+    - os: osx
+      osx_image: xcode10
+      language: objective-c
+      env:
+        - JOB=Xcode
+      script:
+        - set -o pipefail
+        - xcodebuild build-for-testing test-without-building -workspace JSONRPCKit.xcworkspace -scheme JSONRPCKit | xcpretty -c
+        - xcodebuild build-for-testing test-without-building -workspace JSONRPCKit.xcworkspace -scheme JSONRPCKit -sdk iphonesimulator -destination "name=iPhone SE" | xcpretty -c
+        - xcodebuild build-for-testing test-without-building -workspace JSONRPCKit.xcworkspace -scheme JSONRPCKit -sdk appletvsimulator -destination "name=Apple TV 4K (at 1080p)" | xcpretty -c
         - xcodebuild build -workspace JSONRPCKit.xcworkspace -scheme JSONRPCKit -sdk watchsimulator | xcpretty -c
-        - pod lib lint
     - os: osx
       osx_image: xcode9
       language: generic
@@ -29,6 +39,15 @@ matrix:
         - swift --version
         - swift build
         - swift test
+    - os: osx
+      osx_image: xcode10
+      language: generic
+      env:
+        - JOB=SPM
+      script:
+        - swift --version
+        - swift build
+        - swift test
     - os: linux
       language: generic
       env:
@@ -42,6 +61,19 @@ matrix:
       dist: trusty
       install:
         - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
+    - os: linux
+      language: generic
+      env:
+        - JOB=Linux
+        - SWIFT_VERSION=4.2
+      script:
+        - swift --version
+        - swift build
+        - swift test
+      sudo: required
+      dist: trusty
+      install:
+        - eval "$(curl -sL https://gist.githubusercontent.com/kylef/5c0475ff02b7c7671d2a/raw/9f442512a46d7a2af7b850d65a7e9bd31edfb09b/swiftenv-install.sh)"
 
 notifications:
   email: false

Cartfile

@@ -1 +1 @@
-github "antitypical/Result" ~> 3.2.0
+github "antitypical/Result" ~> 4.0.0

Cartfile.private

@@ -1 +1 @@
-github "ishkawa/APIKit" ~> 3.2.0
+github "ishkawa/APIKit" ~> 4.0.0

Cartfile.resolved

@@ -1,2 +1,2 @@
-github "antitypical/Result" "3.2.4"
-github "ishkawa/APIKit" "3.2.0"
+github "antitypical/Result" "4.0.0"
+github "ishkawa/APIKit" "4.0.0"

JSONRPCKit.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name     = "JSONRPCKit"
-  s.version  = "3.0.0"
+  s.version  = "4.0.0"
   s.summary  = "JSONRPCKit is a JSON-RPC 2.0 library purely written in Swift."
   s.homepage = "https://github.com/bricklife/JSONRPCKit"
 
@@ -28,6 +28,6 @@ Pod::Spec.new do |s|
       THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
     LICENSE
   }
-  s.dependency "Result", "~> 3.2.0"
+  s.dependency "Result", "~> 4.0.0"
 
 end

Package.resolved

@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/antitypical/Result.git",
         "state": {
           "branch": null,
-          "revision": "7477584259bfce2560a19e06ad9f71db441fff11",
-          "version": "3.2.4"
+          "revision": "8fc088dcf72802801efeecba76ea8fb041fb773d",
+          "version": "4.0.0"
         }
       }
     ]

Package.swift

@@ -9,7 +9,7 @@ let package = Package(
         .library(name: "JSONRPCKit", targets: ["JSONRPCKit"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/antitypical/Result.git", from: "3.2.0"),
+        .package(url: "https://github.com/antitypical/Result.git", from: "4.0.0"),
     ],
     targets: [
         .target(name: "JSONRPCKit", dependencies: ["Result"]),

Package@swift-4.2.swift

@@ -0,0 +1,23 @@
+// swift-tools-version:4.2
+import PackageDescription
+
+let package = Package(
+    name: "JSONRPCKit",
+    products: [
+        .library(name: "JSONRPCKit", targets: ["JSONRPCKit"]),
+    ],
+    dependencies: [
+        .package(url: "https://github.com/antitypical/Result.git", from: "4.0.0"),
+    ],
+    targets: [
+        .target(
+            name: "JSONRPCKit",
+            dependencies: ["Result"]
+        ),
+        .testTarget(
+            name: "JSONRPCKitTests",
+            dependencies: ["JSONRPCKit"]
+        ),
+    ],
+    swiftLanguageVersions: [ .v4, .v4_2]
+)

Sources/JSONRPCKit/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>3.0.0</string>
+	<string>4.0.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>