diff --git a/.travis.yml b/.travis.yml index d4800cc..3e260ed 100644 --- a/.travis.yml +++ b/.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 diff --git a/Cartfile b/Cartfile index fa9f48b..1e95470 100644 --- a/Cartfile +++ b/Cartfile @@ -1 +1 @@ -github "antitypical/Result" ~> 3.2.0 +github "antitypical/Result" ~> 4.0.0 diff --git a/Cartfile.private b/Cartfile.private index 8b3aa2a..0c7bd3e 100644 --- a/Cartfile.private +++ b/Cartfile.private @@ -1 +1 @@ -github "ishkawa/APIKit" ~> 3.2.0 +github "ishkawa/APIKit" ~> 4.0.0 diff --git a/Cartfile.resolved b/Cartfile.resolved index 3d02dae..0c1205e 100644 --- a/Cartfile.resolved +++ b/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" diff --git a/Carthage/Checkouts/APIKit b/Carthage/Checkouts/APIKit index 0afa74d..dc4350d 160000 --- a/Carthage/Checkouts/APIKit +++ b/Carthage/Checkouts/APIKit @@ -1 +1 @@ -Subproject commit 0afa74dedff0df678af02fc2b474c4eafba37a67 +Subproject commit dc4350d686deb13e4c88418c5de1f2e1ecac0b82 diff --git a/Carthage/Checkouts/Result b/Carthage/Checkouts/Result index 7477584..8fc088d 160000 --- a/Carthage/Checkouts/Result +++ b/Carthage/Checkouts/Result @@ -1 +1 @@ -Subproject commit 7477584259bfce2560a19e06ad9f71db441fff11 +Subproject commit 8fc088dcf72802801efeecba76ea8fb041fb773d diff --git a/JSONRPCKit.podspec b/JSONRPCKit.podspec index 91337fe..68b40ca 100644 --- a/JSONRPCKit.podspec +++ b/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 diff --git a/Package.resolved b/Package.resolved index 3236c9e..dc09c89 100644 --- a/Package.resolved +++ b/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" } } ] diff --git a/Package.swift b/Package.swift index a1bec29..aed5491 100644 --- a/Package.swift +++ b/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"]), diff --git a/Package@swift-4.2.swift b/Package@swift-4.2.swift new file mode 100644 index 0000000..68426c2 --- /dev/null +++ b/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] +) diff --git a/Sources/JSONRPCKit/Info.plist b/Sources/JSONRPCKit/Info.plist index e0f4bf7..1bcfa6d 100644 --- a/Sources/JSONRPCKit/Info.plist +++ b/Sources/JSONRPCKit/Info.plist @@ -15,7 +15,7 @@ CFBundlePackageType FMWK CFBundleShortVersionString - 3.0.0 + 4.0.0 CFBundleSignature ???? CFBundleVersion