Merge pull request #427 from zapcannon87/master

chore: resolve building warning & upgrade dependencies

LeanCloud.podspec

@@ -22,16 +22,16 @@ Pod::Spec.new do |s|
   end
 
   s.subspec 'RTM' do |ss|
-    ss.dependency 'SwiftProtobuf', '~> 1.15'
-    ss.dependency 'GRDB.swift', '~> 4.14'
+    ss.dependency 'SwiftProtobuf', '~> 1.17'
+    ss.dependency 'GRDB.swift', '~> 5.8'
 
     ss.dependency 'LeanCloud/Foundation', "#{s.version}"
 
     ss.source_files = 'Sources/RTM/**/*.{swift}'
   end
 
   s.subspec 'RTM-no-local-storage' do |ss|
-    ss.dependency 'SwiftProtobuf', '~> 1.15'
+    ss.dependency 'SwiftProtobuf', '~> 1.17'
 
     ss.dependency 'LeanCloud/Foundation', "#{s.version}"
 

LeanCloud.xcodeproj/project.pbxproj

@@ -1208,15 +1208,15 @@
 			repositoryURL = "https://github.com/apple/swift-protobuf";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 1.15.0;
+				minimumVersion = 1.17.0;
 			};
 		};
 		D303BD792328D062004AE13D /* XCRemoteSwiftPackageReference "GRDB" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/groue/GRDB.swift";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 4.14.0;
+				minimumVersion = 5.8.0;
 			};
 		};
 		D35EB5BB2328A6E000763E4E /* XCRemoteSwiftPackageReference "Alamofire" */ = {

Package.swift

@@ -16,8 +16,8 @@ let package = Package(
     ],
     dependencies: [
         .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.4.0")),
-        .package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMajor(from: "1.15.0")),
-        .package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMajor(from: "4.14.0"))
+        .package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMajor(from: "1.17.0")),
+        .package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMajor(from: "5.8.0"))
     ],
     targets: [
         .target(

Sources/RTM/IMClient.swift

@@ -2594,7 +2594,7 @@ public enum IMMessageEvent {
 }
 
 /// IM Client Delegate
-public protocol IMClientDelegate: class {
+public protocol IMClientDelegate: AnyObject {
 
     /// Delegate function of the event about the client.
     /// - Parameters:
@@ -2613,7 +2613,7 @@ public protocol IMClientDelegate: class {
 // MARK: - Signature
 
 /// IM Signature Delegate
-public protocol IMSignatureDelegate: class {
+public protocol IMSignatureDelegate: AnyObject {
 
     /// Delegate function of the signature action
     ///

Sources/RTM/IMLocalStorage.swift

@@ -204,13 +204,15 @@ class IMLocalStorage {
     init(path: String, clientID: String) throws {
         var configuration = Configuration()
         configuration.label = "\(IMLocalStorage.self).dbQueue"
-        configuration.trace = {
-            Logger.shared.verbose("""
-                \n------ LeanCloud SQL Executing
-                \(IMClient.self)<ID: \"\(clientID)\">
-                \($0)
-                ------ END
-                """)
+        configuration.prepareDatabase { db in
+            db.trace(options: .statement) { event in
+                Logger.shared.verbose("""
+                    \n------ LeanCloud SQL Executing
+                    \(IMClient.self)<ID: \"\(clientID)\">
+                    \(event)
+                    ------ END
+                    """)
+            }
         }
         try self.dbPool = DatabasePool(path: path, configuration: configuration)
     }

Sources/RTM/IMMessage.swift

@@ -286,7 +286,7 @@ var IMCategorizedMessageTypeMap: [Int: IMCategorizedMessage.Type] = [
 ]
 
 /// IM Message Categorizing Protocol
-public protocol IMMessageCategorizing: class {
+public protocol IMMessageCategorizing: AnyObject {
 
     /// Message Type is Int Type
     typealias MessageType = Int

Sources/RTM/RTMConnection.swift

@@ -165,7 +165,7 @@ class RTMConnectionManager {
     }
 }
 
-protocol RTMConnectionDelegate: class {
+protocol RTMConnectionDelegate: AnyObject {
 
     func connection(inConnecting connection: RTMConnection)
 

Sources/RTM/WebSocket.swift

@@ -61,7 +61,7 @@ struct WSError: Error {
 }
 
 //WebSocketClient is setup to be dependency injection for testing
-protocol WebSocketClient: class {
+protocol WebSocketClient: AnyObject {
     var delegate: WebSocketDelegate? {get set}
     var pongDelegate: WebSocketPongDelegate? {get set}
     var disableSSLCertValidation: Bool {get set}
@@ -119,7 +119,7 @@ struct SSLSettings {
     #endif
 }
 
-protocol WSStreamDelegate: class {
+protocol WSStreamDelegate: AnyObject {
     func newBytesInStream()
     func streamDidError(error: Error?)
 }
@@ -315,20 +315,20 @@ class FoundationStream : NSObject, WSStream, StreamDelegate  {
 //WebSocket implementation
 
 //standard delegate you should use
-protocol WebSocketDelegate: class {
+protocol WebSocketDelegate: AnyObject {
     func websocketDidConnect(socket: WebSocketClient)
     func websocketDidDisconnect(socket: WebSocketClient, error: Error?)
     func websocketDidReceiveMessage(socket: WebSocketClient, text: String)
     func websocketDidReceiveData(socket: WebSocketClient, data: Data)
 }
 
 //got pongs
-protocol WebSocketPongDelegate: class {
+protocol WebSocketPongDelegate: AnyObject {
     func websocketDidReceivePong(socket: WebSocketClient, data: Data?)
 }
 
 // A Delegate with more advanced info on messages and connection etc.
-protocol WebSocketAdvancedDelegate: class {
+protocol WebSocketAdvancedDelegate: AnyObject {
     func websocketDidConnect(socket: WebSocket)
     func websocketDidDisconnect(socket: WebSocket, error: Error?)
     func websocketDidReceiveMessage(socket: WebSocket, text: String, response: WebSocket.WSResponse)