From fe9b396243f6ae0c0eeeaf159525625373561c3a Mon Sep 17 00:00:00 2001 From: Kyle Bashour Date: Fri, 13 Dec 2019 11:43:13 -0800 Subject: [PATCH 1/2] Update for Swift 5.1 --- Package.swift | 2 +- Sources/WKCodable/WKBEncoder.swift | 2 +- Sources/WKCodable/WKTDecoder.swift | 2 +- Sources/WKCodable/WKTEncoder.swift | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Package.swift b/Package.swift index b49a607..b0e4b24 100644 --- a/Package.swift +++ b/Package.swift @@ -1,4 +1,4 @@ -// swift-tools-version:4.1 +// swift-tools-version:5.1 import PackageDescription var package = Package( diff --git a/Sources/WKCodable/WKBEncoder.swift b/Sources/WKCodable/WKBEncoder.swift index 0cd7ade..550ca9f 100644 --- a/Sources/WKCodable/WKBEncoder.swift +++ b/Sources/WKCodable/WKBEncoder.swift @@ -18,7 +18,7 @@ public extension WKBEncoder { // MARK: - Public - public func encode(_ value: Geometry) -> Data { + func encode(_ value: Geometry) -> Data { data = Data() encode(value, withSrid: true) return data diff --git a/Sources/WKCodable/WKTDecoder.swift b/Sources/WKCodable/WKTDecoder.swift index b16b91d..ecac209 100644 --- a/Sources/WKCodable/WKTDecoder.swift +++ b/Sources/WKCodable/WKTDecoder.swift @@ -17,7 +17,7 @@ public extension WKTDecoder { // MARK: - Public - public func decode(from value: String) throws -> T { + func decode(from value: String) throws -> T { scanner = Scanner(string: value) scanner.charactersToBeSkipped = CharacterSet.whitespaces scanner.caseSensitive = false diff --git a/Sources/WKCodable/WKTEncoder.swift b/Sources/WKCodable/WKTEncoder.swift index 48c6ed3..4eb26eb 100644 --- a/Sources/WKCodable/WKTEncoder.swift +++ b/Sources/WKCodable/WKTEncoder.swift @@ -9,7 +9,7 @@ public extension WKTEncoder { // MARK: - Public - public func encode(_ value: Geometry) -> String { + func encode(_ value: Geometry) -> String { result = String() encode(value, withSrid: true) return result From 17eea7d1fe81fd67f65c27b2fc77dae31c8d7fc9 Mon Sep 17 00:00:00 2001 From: Kyle Bashour Date: Fri, 13 Dec 2019 11:51:33 -0800 Subject: [PATCH 2/2] Switch where access is --- Sources/WKCodable/WKBEncoder.swift | 4 ++-- Sources/WKCodable/WKTDecoder.swift | 4 ++-- Sources/WKCodable/WKTEncoder.swift | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Sources/WKCodable/WKBEncoder.swift b/Sources/WKCodable/WKBEncoder.swift index 550ca9f..92f377e 100644 --- a/Sources/WKCodable/WKBEncoder.swift +++ b/Sources/WKCodable/WKBEncoder.swift @@ -14,11 +14,11 @@ public extension WKBEncoder { } } -public extension WKBEncoder { +extension WKBEncoder { // MARK: - Public - func encode(_ value: Geometry) -> Data { + public func encode(_ value: Geometry) -> Data { data = Data() encode(value, withSrid: true) return data diff --git a/Sources/WKCodable/WKTDecoder.swift b/Sources/WKCodable/WKTDecoder.swift index ecac209..6cd660c 100644 --- a/Sources/WKCodable/WKTDecoder.swift +++ b/Sources/WKCodable/WKTDecoder.swift @@ -13,11 +13,11 @@ public extension WKTDecoder { } } -public extension WKTDecoder { +extension WKTDecoder { // MARK: - Public - func decode(from value: String) throws -> T { + public func decode(from value: String) throws -> T { scanner = Scanner(string: value) scanner.charactersToBeSkipped = CharacterSet.whitespaces scanner.caseSensitive = false diff --git a/Sources/WKCodable/WKTEncoder.swift b/Sources/WKCodable/WKTEncoder.swift index 4eb26eb..a2da1bf 100644 --- a/Sources/WKCodable/WKTEncoder.swift +++ b/Sources/WKCodable/WKTEncoder.swift @@ -5,11 +5,11 @@ public class WKTEncoder { private var result: String = "" } -public extension WKTEncoder { +extension WKTEncoder { // MARK: - Public - func encode(_ value: Geometry) -> String { + public func encode(_ value: Geometry) -> String { result = String() encode(value, withSrid: true) return result