Merge pull request #443 from zapcannon87/master

release: 17.11.0
leancloud · Jul 4, 2023 · 15956e3 · 15956e3
2 parents 9135590 + 602afd3
commit 15956e3
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/LeanCloud.podspec b/LeanCloud.podspec
@@ -12,8 +12,8 @@ Pod::Spec.new do |s|
 
   s.ios.deployment_target     = '11.0'
   s.osx.deployment_target     = '10.13'
-  s.tvos.deployment_target    = '10.0'
-  s.watchos.deployment_target = '3.0'
+  s.tvos.deployment_target    = '11.0'
+  s.watchos.deployment_target = '4.0'
 
   s.subspec 'Foundation' do |ss|
     ss.dependency 'Alamofire', '~> 5.7'
@@ -23,7 +23,7 @@ Pod::Spec.new do |s|
 
   s.subspec 'RTM' do |ss|
     ss.dependency 'SwiftProtobuf', '~> 1.22'
-    ss.dependency 'GRDB.swift', '~> 5.26'
+    ss.dependency 'GRDB.swift', '~> 6.15.0'
 
     ss.dependency 'LeanCloud/Foundation', "#{s.version}"
 

diff --git a/LeanCloud.xcodeproj/project.pbxproj b/LeanCloud.xcodeproj/project.pbxproj
@@ -967,8 +967,8 @@
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchos watchsimulator";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
+				WATCHOS_DEPLOYMENT_TARGET = 4.0;
 			};
 			name = Debug;
 		};
@@ -1002,8 +1002,8 @@
 				SKIP_INSTALL = YES;
 				SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx appletvos appletvsimulator watchos watchsimulator";
 				SWIFT_VERSION = 5.0;
-				TVOS_DEPLOYMENT_TARGET = 10.0;
-				WATCHOS_DEPLOYMENT_TARGET = 3.0;
+				TVOS_DEPLOYMENT_TARGET = 11.0;
+				WATCHOS_DEPLOYMENT_TARGET = 4.0;
 			};
 			name = Release;
 		};
@@ -1225,7 +1225,7 @@
 			repositoryURL = "https://github.com/groue/GRDB.swift";
 			requirement = {
 				kind = upToNextMajorVersion;
-				minimumVersion = 5.26.0;
+				minimumVersion = 6.15.0;
 			};
 		};
 		D35EB5BB2328A6E000763E4E /* XCRemoteSwiftPackageReference "Alamofire" */ = {

diff --git a/Package.swift b/Package.swift
@@ -8,16 +8,16 @@ let package = Package(
     platforms: [
         .iOS(.v11),
         .macOS(.v10_13),
-        .tvOS(.v10),
-        .watchOS(.v3)
+        .tvOS(.v11),
+        .watchOS(.v4)
     ],
     products: [
         .library(name: "LeanCloud", targets: ["LeanCloud"]),
     ],
     dependencies: [
         .package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.7.0")),
         .package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMajor(from: "1.22.0")),
-        .package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMajor(from: "5.26.0"))
+        .package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMajor(from: "6.15.0"))
     ],
     targets: [
         .target(