chore: upgrade dependencies

leancloud · Jun 21, 2021 · 326f9f4 · 326f9f4
1 parent e59a347
commit 326f9f4
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 14 deletions.
diff --git a/LeanCloud.podspec b/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}"
 

diff --git a/LeanCloud.xcodeproj/project.pbxproj b/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" */ = {

diff --git a/Package.swift b/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(

diff --git a/Sources/RTM/IMLocalStorage.swift b/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)
     }