Skip to content

Commit 62a949f

Browse files
committed
Update conditionals: characters is deprecated from Swift 3.2
1 parent 6314d80 commit 62a949f

File tree

7 files changed

+11
-11
lines changed

7 files changed

+11
-11
lines changed

Sources/PluginLibrary/NamingUtils.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,7 @@ fileprivate func sanitizeTypeName(_ s: String, disambiguator: String) -> String
189189
// conflict. This can be resolved recursively by stripping
190190
// the disambiguator, sanitizing the root, then re-adding the
191191
// disambiguator:
192-
#if swift(>=4.0)
192+
#if swift(>=3.2)
193193
let e = s.index(s.endIndex, offsetBy: -disambiguator.count)
194194
let truncated = String(s[..<e])
195195
#else
@@ -301,7 +301,7 @@ public enum NamingUtils {
301301
// "pacakge.some_name" -> "Package_SomeName"
302302
var makeUpper = true
303303
var prefix = ""
304-
#if swift(>=4.0)
304+
#if swift(>=3.2)
305305
let protoPackageChars = protoPackage
306306
#else
307307
let protoPackageChars = protoPackage.characters

Sources/SwiftProtobuf/Google_Protobuf_Any+Registry.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import Dispatch
2121

2222
internal func buildTypeURL(forMessage message: Message, typePrefix: String) -> String {
2323
var url = typePrefix
24-
#if swift(>=4.0)
24+
#if swift(>=3.2)
2525
let needsSlash = typePrefix.isEmpty || typePrefix.last != "/"
2626
#else
2727
let needsSlash = typePrefix.isEmpty || typePrefix.characters.last != "/"

Sources/SwiftProtobuf/Google_Protobuf_Duration+Extensions.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ private func parseDuration(text: String) throws -> (Int64, Int32) {
2323
var digits = [Character]()
2424
var digitCount = 0
2525
var total = 0
26-
#if swift(>=4.0)
26+
#if swift(>=3.2)
2727
var chars = text.makeIterator()
2828
#else
2929
var chars = text.characters.makeIterator()

Sources/SwiftProtobuf/Google_Protobuf_FieldMask+Extensions.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
private func ProtoToJSON(name: String) -> String? {
2020
var jsonPath = String()
21-
#if swift(>=4.0)
21+
#if swift(>=3.2)
2222
var chars = name.makeIterator()
2323
#else
2424
var chars = name.characters.makeIterator()
@@ -47,7 +47,7 @@ private func ProtoToJSON(name: String) -> String? {
4747

4848
private func JSONToProto(name: String) -> String? {
4949
var path = String()
50-
#if swift(>=4.0)
50+
#if swift(>=3.2)
5151
let chars = name
5252
#else
5353
let chars = name.characters
@@ -70,7 +70,7 @@ private func parseJSONFieldNames(names: String) -> [String]? {
7070
var fieldNameCount = 0
7171
var fieldName = String()
7272
var split = [String]()
73-
#if swift(>=4.0)
73+
#if swift(>=3.2)
7474
let namesChars = names
7575
#else
7676
let namesChars = names.characters

Sources/SwiftProtobuf/NameMap.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
private func toJsonFieldName(_ s: String) -> String {
2424
var result = String()
2525
var capitalizeNext = false
26-
#if swift(>=4.0)
26+
#if swift(>=3.2)
2727
let chars = s
2828
#else
2929
let chars = s.characters

Sources/protoc-gen-swift/StringUtils.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ func splitPath(pathname: String) -> (dir:String, base:String, suffix:String) {
1414
var dir = ""
1515
var base = ""
1616
var suffix = ""
17-
#if swift(>=4.0)
17+
#if swift(>=3.2)
1818
let pathnameChars = pathname
1919
#else
2020
let pathnameChars = pathname.characters
@@ -31,7 +31,7 @@ func splitPath(pathname: String) -> (dir:String, base:String, suffix:String) {
3131
suffix += String(c)
3232
}
3333
}
34-
#if swift(>=4.0)
34+
#if swift(>=3.2)
3535
let validSuffix = suffix.isEmpty || suffix.first == "."
3636
#else
3737
let validSuffix = suffix.isEmpty || suffix.characters.first == "."

Tests/SwiftProtobufTests/Test_JSON.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ class Test_JSON: XCTestCase, PBTestHelpers {
137137
var m = MessageTestType()
138138
configureLargeObject(&m)
139139
let s = try m.jsonString()
140-
#if swift(>=4.0)
140+
#if swift(>=3.2)
141141
let chars = s
142142
#else
143143
let chars = s.characters

0 commit comments

Comments
 (0)