Set Swift 5.3 as the minimum version

Author: Mordil

.gitlab/ci/centos-7.yml

@@ -16,14 +16,14 @@ swift trunk:
   image: swiftlang/swift:nightly-master-centos7
   allow_failure: true
 
+swift 5.5:
+  extends: .centos7
+  image: swift:5.5-centos7
+
 swift 5.4:
   extends: .centos7
-  image: swiftlang/swift:nightly-5.4-centos7
+  image: swift:5.4-centos7
 
 swift 5.3:
   extends: .centos7
   image: swift:5.3-centos7
-
-swift 5.2:
-  extends: .centos7
-  image: swift:5.2-centos7

.gitlab/ci/platform-test.yml

@@ -29,14 +29,14 @@ swift trunk:
   image: swiftlang/swift:nightly-master-${SWIFT_PLATFORM_NAME}
   allow_failure: true
 
+swift 5.5:
+  extends: .standard-platform
+  image: swift:5.5-${SWIFT_PLATFORM_NAME}
+
 swift 5.4:
   extends: .standard-platform
-  image: swiftlang/swift:nightly-5.4-${SWIFT_PLATFORM_NAME}
+  image: swift:5.4-${SWIFT_PLATFORM_NAME}
 
 swift 5.3:
   extends: .standard-platform
   image: swift:5.3-${SWIFT_PLATFORM_NAME}
-
-swift 5.2:
-  extends: .standard-platform
-  image: swift:5.2-${SWIFT_PLATFORM_NAME}

Package.swift

@@ -1,9 +1,9 @@
-// swift-tools-version:5.2
+// swift-tools-version:5.3
 //===----------------------------------------------------------------------===//
 //
 // This source file is part of the RediStack open source project
 //
-// Copyright (c) 2019-2020 RediStack project authors
+// Copyright (c) 2019-2021 RediStack project authors
 // Licensed under Apache License v2.0
 //
 // See LICENSE.txt for license information

Sources/RediStack/RedisClient.swift

@@ -141,7 +141,6 @@ extension RedisClient {
         return self.punsubscribe(from: patterns)
     }
 
-    #if swift(>=5.3)
     public func subscribe(
         to channels: [RedisChannelName],
         messageReceiver receiver: @escaping RedisSubscriptionMessageReceiver,
@@ -177,61 +176,6 @@ extension RedisClient {
     ) -> EventLoopFuture<Void> {
         return self.psubscribe(to: patterns, messageReceiver: receiver, onSubscribe: subscribeHandler, onUnsubscribe: unsubscribeHandler)
     }
-    #else
-    public func subscribe(
-        to channels: RedisChannelName...,
-        messageReceiver receiver: @escaping RedisSubscriptionMessageReceiver,
-        onSubscribe subscribeHandler: RedisSubscriptionChangeHandler?,
-        onUnsubscribe unsubscribeHandler: RedisSubscriptionChangeHandler?
-    ) -> EventLoopFuture<Void> {
-        return self.subscribe(to: channels, messageReceiver: receiver, onSubscribe: subscribeHandler, onUnsubscribe: unsubscribeHandler)
-    }
-
-    public func subscribe(
-        to channels: RedisChannelName...,
-        onSubscribe subscribeHandler: RedisSubscriptionChangeHandler? = nil,
-        onUnsubscribe unsubscribeHandler: RedisSubscriptionChangeHandler? = nil,
-        messageReceiver receiver: @escaping RedisSubscriptionMessageReceiver
-    ) -> EventLoopFuture<Void> {
-        return self.subscribe(to: channels, messageReceiver: receiver, onSubscribe: subscribeHandler, onUnsubscribe: unsubscribeHandler)
-    }
-
-    public func subscribe(
-        to channels: [RedisChannelName],
-        onSubscribe subscribeHandler: RedisSubscriptionChangeHandler? = nil,
-        onUnsubscribe unsubscribeHandler: RedisSubscriptionChangeHandler? = nil,
-        messageReceiver receiver: @escaping RedisSubscriptionMessageReceiver
-    ) -> EventLoopFuture<Void> {
-        return self.subscribe(to: channels, messageReceiver: receiver, onSubscribe: subscribeHandler, onUnsubscribe: unsubscribeHandler)
-    }
-
-    public func psubscribe(
-        to patterns: String...,
-        messageReceiver receiver: @escaping RedisSubscriptionMessageReceiver,
-        onSubscribe subscribeHandler: RedisSubscriptionChangeHandler?,
-        onUnsubscribe unsubscribeHandler: RedisSubscriptionChangeHandler?
-    ) -> EventLoopFuture<Void> {
-        return self.psubscribe(to: patterns, messageReceiver: receiver, onSubscribe: subscribeHandler, onUnsubscribe: unsubscribeHandler)
-    }
-
-    public func psubscribe(
-        to patterns: [String],
-        onSubscribe subscribeHandler: RedisSubscriptionChangeHandler? = nil,
-        onUnsubscribe unsubscribeHandler: RedisSubscriptionChangeHandler? = nil,
-        messageReceiver receiver: @escaping RedisSubscriptionMessageReceiver
-    ) -> EventLoopFuture<Void> {
-        return self.psubscribe(to: patterns, messageReceiver: receiver, onSubscribe: subscribeHandler, onUnsubscribe: unsubscribeHandler)
-    }
-
-    public func psubscribe(
-        to patterns: String...,
-        onSubscribe subscribeHandler: RedisSubscriptionChangeHandler? = nil,
-        onUnsubscribe unsubscribeHandler: RedisSubscriptionChangeHandler? = nil,
-        messageReceiver receiver: @escaping RedisSubscriptionMessageReceiver
-    ) -> EventLoopFuture<Void> {
-        return self.psubscribe(to: patterns, messageReceiver: receiver, onSubscribe: subscribeHandler, onUnsubscribe: unsubscribeHandler)
-    }
-    #endif
 }
 
 // MARK: Errors