From 0ddce44b2abb5fe4f37cb4ca40aa89c60b17bae7 Mon Sep 17 00:00:00 2001 From: Peter Verhage Date: Mon, 8 Oct 2018 01:11:34 +0200 Subject: [PATCH 1/3] Swift 4.2 --- Package.resolved | 32 ++++++++++++++++---------------- Package.swift | 4 ++-- ScClient.podspec | 4 ++-- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/Package.resolved b/Package.resolved index dec3528..ae4a985 100644 --- a/Package.resolved +++ b/Package.resolved @@ -2,30 +2,21 @@ "object": { "pins": [ { - "package": "HandyJSON", - "repositoryURL": "https://github.com/alibaba/HandyJSON.git", - "state": { - "branch": null, - "revision": "a8b42d8d989803a1f376aa3456f44b5efc445161", - "version": "4.1.0" - } - }, - { - "package": "SSCZLib", - "repositoryURL": "https://github.com/daltoniam/zlib-spm.git", + "package": "SSCommonCrypto", + "repositoryURL": "https://github.com/daltoniam/common-crypto-spm", "state": { "branch": null, - "revision": "83ac8d719a2f3aa775dbdf116a57f56fb2c49abb", + "revision": "2eb3aff0fb57f92f5722fac5d6d20bf64669ca66", "version": "1.1.0" } }, { - "package": "SSCommonCrypto", - "repositoryURL": "https://github.com/daltoniam/common-crypto-spm", + "package": "HandyJSON", + "repositoryURL": "https://github.com/alibaba/HandyJSON.git", "state": { "branch": null, - "revision": "2eb3aff0fb57f92f5722fac5d6d20bf64669ca66", - "version": "1.1.0" + "revision": "0eaec774ff559c50bf290c2c457de2320a9dbcfe", + "version": "4.2.0" } }, { @@ -36,6 +27,15 @@ "revision": "6e10c04c8387d00f41a17450fa45b51427971022", "version": "3.0.4" } + }, + { + "package": "SSCZLib", + "repositoryURL": "https://github.com/daltoniam/zlib-spm.git", + "state": { + "branch": null, + "revision": "83ac8d719a2f3aa775dbdf116a57f56fb2c49abb", + "version": "1.1.0" + } } ] }, diff --git a/Package.swift b/Package.swift index f8d340d..ce06178 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.0 +// swift-tools-version:4.2 // The swift-tools-version declares the minimum version of Swift required to build this package. import PackageDescription @@ -13,7 +13,7 @@ let package = Package( dependencies: [ // Dependencies declare other packages that this package depends on. .package(url: "https://github.com/daltoniam/Starscream.git", .exact("3.0.4")), - .package(url: "https://github.com/alibaba/HandyJSON.git", .exact("4.1.0")), + .package(url: "https://github.com/alibaba/HandyJSON.git", .exact("4.2.0")), ], targets: [ .target( diff --git a/ScClient.podspec b/ScClient.podspec index 4506e2d..493af6a 100644 --- a/ScClient.podspec +++ b/ScClient.podspec @@ -18,7 +18,7 @@ Pod::Spec.new do |s| s.name = "ScClient" s.version = "1.0.7" s.summary = "A socketcluster client for iOS and OSX." - s.swift_version = '3.2' + s.swift_version = '4.2' # This description is used to generate tags and improve search results. # * Think: What does it do? Why did you write it? What is the focus? @@ -137,5 +137,5 @@ Pod::Spec.new do |s| # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" } s.dependency "Starscream", "~> 3.0.4" - s.dependency "HandyJSON", "~> 4.1.0" + s.dependency "HandyJSON", "~> 4.2.0" end From f31efd1d0ab133cf0ae023d6a15648ce8d3435e5 Mon Sep 17 00:00:00 2001 From: Peter Verhage Date: Tue, 7 May 2019 09:57:23 +0200 Subject: [PATCH 2/3] Update Package.resolved --- Package.resolved | 9 --------- 1 file changed, 9 deletions(-) diff --git a/Package.resolved b/Package.resolved index 0a0fc0a..3c5301b 100644 --- a/Package.resolved +++ b/Package.resolved @@ -28,15 +28,6 @@ "version": "3.0.5" } }, - { - "package": "SSCZLib", - "repositoryURL": "https://github.com/daltoniam/zlib-spm.git", - "state": { - "branch": null, - "revision": "83ac8d719a2f3aa775dbdf116a57f56fb2c49abb", - "version": "1.1.0" - } - }, { "package": "SSCZLib", "repositoryURL": "https://github.com/daltoniam/zlib-spm.git", From 5e729ad7c9e06f9925355a5a310fd3c37fe98278 Mon Sep 17 00:00:00 2001 From: Peter Verhage Date: Tue, 28 May 2019 15:17:52 +0200 Subject: [PATCH 3/3] Fixed podspec --- ScClient.podspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ScClient.podspec b/ScClient.podspec index 0fda7e7..8afccfb 100644 --- a/ScClient.podspec +++ b/ScClient.podspec @@ -84,7 +84,7 @@ Pod::Spec.new do |s| # Supports git, hg, bzr, svn and HTTP. # - s.source = { :git => "https://github.com/sacOO7/socketcluster-client-swift.git", :tag => s.version.to_s } + s.source = { :git => "https://github.com/egeniq-forks/socketcluster-client-swift.git", :tag => s.version.to_s } # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― # @@ -136,6 +136,6 @@ Pod::Spec.new do |s| s.requires_arc = true # s.xcconfig = { "HEADER_SEARCH_PATHS" => "$(SDKROOT)/usr/include/libxml2" } - s.dependency "Starscream", "~> 3.0.5" - s.dependency "HandyJSON", "~> 4.2.0" + s.dependency "Starscream", "~> 3.1.0" + s.dependency "HandyJSON", "~> 5.0.0" end