Skip to content

Commit 496a62d

Browse files
zapcannon87zapcannon87
committed
chore: upgrade dependencies
1 parent afbfd52 commit 496a62d

File tree

11 files changed

+81
-72
lines changed

11 files changed

+81
-72
lines changed

‎LeanCloud.podspec‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,27 @@ Pod::Spec.new do |s|
1111
s.default_subspec = 'RTM'
1212

1313
s.ios.deployment_target = '11.0'
14-
s.osx.deployment_target = '10.12'
14+
s.osx.deployment_target = '10.13'
1515
s.tvos.deployment_target = '10.0'
1616
s.watchos.deployment_target = '3.0'
1717

1818
s.subspec 'Foundation' do |ss|
19-
ss.dependency 'Alamofire', '~> 5.4'
19+
ss.dependency 'Alamofire', '~> 5.7'
2020

2121
ss.source_files = 'Sources/Foundation/**/*.{swift}'
2222
end
2323

2424
s.subspec 'RTM' do |ss|
25-
ss.dependency 'SwiftProtobuf', '~> 1.18'
26-
ss.dependency 'GRDB.swift', '~> 5.12'
25+
ss.dependency 'SwiftProtobuf', '~> 1.22'
26+
ss.dependency 'GRDB.swift', '~> 5.26'
2727

2828
ss.dependency 'LeanCloud/Foundation', "#{s.version}"
2929

3030
ss.source_files = 'Sources/RTM/**/*.{swift}'
3131
end
3232

3333
s.subspec 'RTM-no-local-storage' do |ss|
34-
ss.dependency 'SwiftProtobuf', '~> 1.18'
34+
ss.dependency 'SwiftProtobuf', '~> 1.22'
3535

3636
ss.dependency 'LeanCloud/Foundation', "#{s.version}"
3737

‎LeanCloud.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 52;
6+
objectVersion = 53;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -584,8 +584,9 @@
584584
8342FCB21C7B13A600C3CF15 /* Project object */ = {
585585
isa = PBXProject;
586586
attributes = {
587+
BuildIndependentTargetsInParallel = YES;
587588
LastSwiftUpdateCheck = 1120;
588-
LastUpgradeCheck = 1200;
589+
LastUpgradeCheck = 1430;
589590
ORGANIZATIONNAME = LeanCloud;
590591
TargetAttributes = {
591592
8342FCBA1C7B13A700C3CF15 = {
@@ -947,6 +948,7 @@
947948
DYLIB_COMPATIBILITY_VERSION = 1;
948949
DYLIB_CURRENT_VERSION = 1;
949950
DYLIB_INSTALL_NAME_BASE = "@rpath";
951+
ENABLE_MODULE_VERIFIER = YES;
950952
INFOPLIST_FILE = LeanCloud/Info.plist;
951953
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
952954
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -955,7 +957,9 @@
955957
"@executable_path/Frameworks",
956958
"@loader_path/Frameworks",
957959
);
958-
MACOSX_DEPLOYMENT_TARGET = 10.12;
960+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
961+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
962+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
959963
PRODUCT_BUNDLE_IDENTIFIER = LeanCloud.SDK.Swift;
960964
PRODUCT_NAME = "$(TARGET_NAME)";
961965
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -980,6 +984,7 @@
980984
DYLIB_COMPATIBILITY_VERSION = 1;
981985
DYLIB_CURRENT_VERSION = 1;
982986
DYLIB_INSTALL_NAME_BASE = "@rpath";
987+
ENABLE_MODULE_VERIFIER = YES;
983988
INFOPLIST_FILE = LeanCloud/Info.plist;
984989
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
985990
IPHONEOS_DEPLOYMENT_TARGET = 11.0;
@@ -988,7 +993,9 @@
988993
"@executable_path/Frameworks",
989994
"@loader_path/Frameworks",
990995
);
991-
MACOSX_DEPLOYMENT_TARGET = 10.12;
996+
MACOSX_DEPLOYMENT_TARGET = "$(RECOMMENDED_MACOSX_DEPLOYMENT_TARGET)";
997+
MODULE_VERIFIER_SUPPORTED_LANGUAGES = "objective-c objective-c++";
998+
MODULE_VERIFIER_SUPPORTED_LANGUAGE_STANDARDS = "gnu99 gnu++11";
992999
PRODUCT_BUNDLE_IDENTIFIER = LeanCloud.SDK.Swift;
9931000
PRODUCT_NAME = "$(TARGET_NAME)";
9941001
PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1118,6 +1125,7 @@
11181125
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
11191126
CODE_SIGN_IDENTITY = "-";
11201127
CODE_SIGN_STYLE = Automatic;
1128+
DEAD_CODE_STRIPPING = YES;
11211129
DEVELOPMENT_TEAM = 7J5XFNL99Q;
11221130
ENABLE_HARDENED_RUNTIME = YES;
11231131
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1141,6 +1149,7 @@
11411149
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
11421150
CODE_SIGN_IDENTITY = "-";
11431151
CODE_SIGN_STYLE = Automatic;
1152+
DEAD_CODE_STRIPPING = YES;
11441153
DEVELOPMENT_TEAM = 7J5XFNL99Q;
11451154
ENABLE_HARDENED_RUNTIME = YES;
11461155
GCC_C_LANGUAGE_STANDARD = gnu11;
@@ -1208,23 +1217,23 @@
12081217
repositoryURL = "https://github.com/apple/swift-protobuf";
12091218
requirement = {
12101219
kind = upToNextMajorVersion;
1211-
minimumVersion = 1.18.0;
1220+
minimumVersion = 1.22.0;
12121221
};
12131222
};
12141223
D303BD792328D062004AE13D /* XCRemoteSwiftPackageReference "GRDB" */ = {
12151224
isa = XCRemoteSwiftPackageReference;
12161225
repositoryURL = "https://github.com/groue/GRDB.swift";
12171226
requirement = {
12181227
kind = upToNextMajorVersion;
1219-
minimumVersion = 5.12.0;
1228+
minimumVersion = 5.26.0;
12201229
};
12211230
};
12221231
D35EB5BB2328A6E000763E4E /* XCRemoteSwiftPackageReference "Alamofire" */ = {
12231232
isa = XCRemoteSwiftPackageReference;
12241233
repositoryURL = "https://github.com/Alamofire/Alamofire";
12251234
requirement = {
12261235
kind = upToNextMajorVersion;
1227-
minimumVersion = 5.4.0;
1236+
minimumVersion = 5.7.0;
12281237
};
12291238
};
12301239
/* End XCRemoteSwiftPackageReference section */

‎LeanCloud.xcodeproj/xcshareddata/xcschemes/CLI.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1200"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎LeanCloud.xcodeproj/xcshareddata/xcschemes/LeanCloud.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1200"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎LeanCloud.xcodeproj/xcshareddata/xcschemes/LeanCloudTests.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1200"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎LeanCloud.xcodeproj/xcshareddata/xcschemes/RuntimeTests-iOS.xcscheme‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1200"
3+
LastUpgradeVersion = "1430"
44
version = "1.3">
55
<BuildAction
66
parallelizeBuildables = "YES"

‎LeanCloudTests/IMConversationTestCase.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1514,7 +1514,7 @@ class IMConversationTestCase: RTMBaseTestCase {
15141514
nameKey: uuid,
15151515
"\(attrKey).\(createKey)": uuid,
15161516
"\(attrKey).\(deleteKey)": ["__op": "Delete"],
1517-
"\(attrKey).\(arrayKey)": ["__op": "Add", "objects": [uuid]]
1517+
"\(attrKey).\(arrayKey)": ["__op": "Add", "objects": [uuid]] as [String : Any]
15181518
]
15191519

15201520
let updateExp = expectation(description: "update")

‎LeanCloudTests/LCTypeTestCase.swift‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import XCTest
1010
@testable import LeanCloud
1111

1212
class LCTypeTestCase: BaseTestCase {
13-
13+
1414
override func setUp() {
1515
super.setUp()
1616
// Put setup code here. This method is called before the invocation of each test method in the class.
@@ -20,11 +20,11 @@ class LCTypeTestCase: BaseTestCase {
2020
// Put teardown code here. This method is called after the invocation of each test method in the class.
2121
super.tearDown()
2222
}
23-
23+
2424
func convert(_ object: LCValueConvertible) -> LCValue {
2525
return object.lcValue
2626
}
27-
27+
2828
func testNullConvertible() {
2929
XCTAssertEqual(convert(NSNull()) as? LCNull, LCNull())
3030
}
@@ -34,7 +34,7 @@ class LCTypeTestCase: BaseTestCase {
3434
XCTAssertEqual(LCBool(true).boolValue, true)
3535
XCTAssertFalse(LCBool(LCBool()).value)
3636
}
37-
37+
3838
func testIntegerConvertible() {
3939
XCTAssertEqual(convert(Int(42)) as? LCNumber, 42)
4040
XCTAssertEqual(convert(UInt(42)) as? LCNumber, 42)
@@ -47,13 +47,13 @@ class LCTypeTestCase: BaseTestCase {
4747
XCTAssertEqual(convert(Int64(42)) as? LCNumber, 42)
4848
XCTAssertEqual(convert(UInt64(42)) as? LCNumber, 42)
4949
}
50-
50+
5151
func testFloatConvertible() {
5252
XCTAssertEqual(convert(Float(42)) as? LCNumber, 42)
5353
XCTAssertEqual(convert(Double(42)) as? LCNumber, 42)
5454
XCTAssertEqual(LCNumber(), LCNumber(LCNumber()))
5555
}
56-
56+
5757
func testStringConvertible() {
5858
XCTAssertEqual(convert("foo") as? LCString, "foo")
5959
XCTAssertEqual(convert(NSString(string: "foo")) as? LCString, "foo")
@@ -67,14 +67,14 @@ class LCTypeTestCase: BaseTestCase {
6767
XCTAssertEqual(array1.value.count, array2.value.count)
6868
XCTAssertEqual(array1.value.first as? LCNumber, array2.value.first as? LCNumber)
6969
}
70-
70+
7171
func testArrayConvertible() {
7272
let date = Date()
7373
let object = LCObject()
74-
74+
7575
XCTAssertEqual(
7676
LCArray([42, true, NSNull(), [String: String](), [String](), Data(), date, object]),
77-
try LCArray(unsafeObject: [42, true, NSNull(), [String: String](), [String](), Data(), date, object]))
77+
try LCArray(unsafeObject: [42, true, NSNull(), [String: String](), [String](), Data(), date, object] as [Any]))
7878
}
7979

8080
func testArrayLiteral() {
@@ -84,14 +84,14 @@ class LCTypeTestCase: BaseTestCase {
8484
let _: LCArray = [LCString("a"), 1]
8585
let _: LCArray = [LCString("a"), LCNumber(1)]
8686
}
87-
87+
8888
func testDictionaryConvertible() {
8989
let date = Date()
9090
let object = LCObject()
91-
91+
9292
XCTAssertEqual(
9393
LCDictionary(["foo": "bar", "true": true, "dict": ["null": NSNull()], "date": date, "object": object]),
94-
try LCDictionary(unsafeObject: ["foo": "bar", "true": true, "dict": ["null": NSNull()], "date": date, "object": object]))
94+
try LCDictionary(unsafeObject: ["foo": "bar", "true": true, "dict": ["null": NSNull()], "date": date, "object": object] as [String : Any]))
9595

9696
let dic = LCDictionary()
9797
dic["1"] = "a"
@@ -101,13 +101,13 @@ class LCTypeTestCase: BaseTestCase {
101101
XCTAssertEqual(dic["2"]?.intValue, 42)
102102
XCTAssertEqual(dic["3"]?.boolValue, true)
103103
}
104-
104+
105105
func testDataConvertible() {
106106
let data = Data()
107107
XCTAssertEqual(convert(data) as? LCData, LCData(data))
108108
XCTAssertTrue(LCData(LCData()).value.isEmpty)
109109
}
110-
110+
111111
func testDateConvertible() {
112112
let date = Date()
113113
XCTAssertEqual(convert(date) as? LCDate, LCDate(date))
@@ -117,49 +117,49 @@ class LCTypeTestCase: BaseTestCase {
117117
func testGeoPoint() {
118118
XCTAssertEqual(LCGeoPoint(), LCGeoPoint(LCGeoPoint()))
119119
}
120-
120+
121121
func archiveThenUnarchive<T>(_ object: T) -> T {
122122
return NSKeyedUnarchiver.unarchiveObject(with: NSKeyedArchiver.archivedData(withRootObject: object)) as! T
123123
}
124-
124+
125125
func testCoding() {
126126
let acl = LCACL()
127127
acl.setAccess(.write, allowed: true)
128128
let aclCopy = archiveThenUnarchive(acl)
129129
XCTAssertTrue(aclCopy.getAccess(.write))
130-
130+
131131
let array = LCArray([true, 42, "foo"])
132132
let arrayCopy = archiveThenUnarchive(array)
133133
XCTAssertEqual(arrayCopy, array)
134-
134+
135135
let bool = LCBool(true)
136136
let boolCopy = archiveThenUnarchive(bool)
137137
XCTAssertEqual(boolCopy, bool)
138-
138+
139139
let data = LCData(base64EncodedString: "Zm9v")!
140140
let dataCopy = archiveThenUnarchive(data)
141141
XCTAssertEqual(dataCopy, data)
142-
142+
143143
let date = LCDate()
144144
let dateCopy = archiveThenUnarchive(date)
145145
XCTAssertEqual(dateCopy, date)
146-
146+
147147
let dictionary = LCDictionary(["foo": "bar", "baz": 42])
148148
let dictionaryCopy = archiveThenUnarchive(dictionary)
149149
XCTAssertEqual(dictionaryCopy, dictionary)
150-
150+
151151
let geoPoint = LCGeoPoint(latitude: 12, longitude: 34)
152152
let geoPointCopy = archiveThenUnarchive(geoPoint)
153153
XCTAssertEqual(geoPointCopy, geoPoint)
154-
154+
155155
let null = LCNull()
156156
let nullCopy = archiveThenUnarchive(null)
157157
XCTAssertEqual(nullCopy, null)
158-
158+
159159
let number = LCNumber(42)
160160
let numberCopy = archiveThenUnarchive(number)
161161
XCTAssertEqual(numberCopy, number)
162-
162+
163163
let object = LCObject(objectId: "1234567890")
164164
let friend = LCObject(objectId: "0987654321")
165165
try! object.insertRelation("friend", object: friend)
@@ -168,10 +168,10 @@ class LCTypeTestCase: BaseTestCase {
168168
let relation = object.relationForKey("friend")
169169
let relationCopy = objectCopy.relationForKey("friend")
170170
XCTAssertEqual(relationCopy.value, relation.value)
171-
171+
172172
/* Test mutability after unarchiving. */
173173
objectCopy["foo"] = "bar" as LCString
174-
174+
175175
let string = LCString("foo")
176176
let stringCopy = archiveThenUnarchive(string)
177177
XCTAssertEqual(stringCopy, string)

‎Package.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ let package = Package(
77
name: "LeanCloud",
88
platforms: [
99
.iOS(.v11),
10-
.macOS(.v10_12),
10+
.macOS(.v10_13),
1111
.tvOS(.v10),
1212
.watchOS(.v3)
1313
],
1414
products: [
1515
.library(name: "LeanCloud", targets: ["LeanCloud"]),
1616
],
1717
dependencies: [
18-
.package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.4.4")),
19-
.package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMajor(from: "1.18.0")),
20-
.package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMajor(from: "5.12.0"))
18+
.package(url: "https://github.com/Alamofire/Alamofire.git", .upToNextMajor(from: "5.7.0")),
19+
.package(url: "https://github.com/apple/swift-protobuf.git", .upToNextMajor(from: "1.22.0")),
20+
.package(url: "https://github.com/groue/GRDB.swift.git", .upToNextMajor(from: "5.26.0"))
2121
],
2222
targets: [
2323
.target(

0 commit comments

Comments
 (0)