Skip to content

Commit 144029c

Browse files
committed
chore: Adopt a modified RxSwift to workaround an NSLock subclassing issue
This workaround can be removed if/when the root cause is resolved in Foundation: swiftlang/swift-corelibs-foundation#5108 ...or when RxSwift has merged a workaround on its side: ReactiveX/RxSwift#2621
1 parent b98c7bc commit 144029c

File tree

2 files changed

+68
-69
lines changed

2 files changed

+68
-69
lines changed

Package.resolved

+66-67
Original file line numberDiff line numberDiff line change
@@ -1,70 +1,69 @@
11
{
2-
"object": {
3-
"pins": [
4-
{
5-
"package": "Graphiti",
6-
"repositoryURL": "https://github.com/GraphQLSwift/Graphiti.git",
7-
"state": {
8-
"branch": null,
9-
"revision": "ed06f0608a72176fd572763660e7492bfb53a419",
10-
"version": "1.15.1"
11-
}
12-
},
13-
{
14-
"package": "GraphQL",
15-
"repositoryURL": "https://github.com/GraphQLSwift/GraphQL.git",
16-
"state": {
17-
"branch": null,
18-
"revision": "87649dbc3cdab0be0256c86235f2aec22ec1bfc1",
19-
"version": "2.10.0"
20-
}
21-
},
22-
{
23-
"package": "RxSwift",
24-
"repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
25-
"state": {
26-
"branch": null,
27-
"revision": "b06a8c8596e4c3e8e7788e08e720e3248563ce6a",
28-
"version": "6.7.1"
29-
}
30-
},
31-
{
32-
"package": "swift-atomics",
33-
"repositoryURL": "https://github.com/apple/swift-atomics.git",
34-
"state": {
35-
"branch": null,
36-
"revision": "cd142fd2f64be2100422d658e7411e39489da985",
37-
"version": "1.2.0"
38-
}
39-
},
40-
{
41-
"package": "swift-collections",
42-
"repositoryURL": "https://github.com/apple/swift-collections",
43-
"state": {
44-
"branch": null,
45-
"revision": "9bf03ff58ce34478e66aaee630e491823326fd06",
46-
"version": "1.1.3"
47-
}
48-
},
49-
{
50-
"package": "swift-nio",
51-
"repositoryURL": "https://github.com/apple/swift-nio.git",
52-
"state": {
53-
"branch": null,
54-
"revision": "9746cf80e29edfef2a39924a66731249223f42a3",
55-
"version": "2.72.0"
56-
}
57-
},
58-
{
59-
"package": "swift-system",
60-
"repositoryURL": "https://github.com/apple/swift-system.git",
61-
"state": {
62-
"branch": null,
63-
"revision": "d2ba781702a1d8285419c15ee62fd734a9437ff5",
64-
"version": "1.3.2"
65-
}
2+
"originHash" : "d81369b07c465929b0b3fd13016e5c0961589d560ac2f7fad59b6a70316016d4",
3+
"pins" : [
4+
{
5+
"identity" : "graphiti",
6+
"kind" : "remoteSourceControl",
7+
"location" : "https://github.com/GraphQLSwift/Graphiti.git",
8+
"state" : {
9+
"revision" : "ed06f0608a72176fd572763660e7492bfb53a419",
10+
"version" : "1.15.1"
6611
}
67-
]
68-
},
69-
"version": 1
12+
},
13+
{
14+
"identity" : "graphql",
15+
"kind" : "remoteSourceControl",
16+
"location" : "https://github.com/GraphQLSwift/GraphQL.git",
17+
"state" : {
18+
"revision" : "87649dbc3cdab0be0256c86235f2aec22ec1bfc1",
19+
"version" : "2.10.0"
20+
}
21+
},
22+
{
23+
"identity" : "rxswift",
24+
"kind" : "remoteSourceControl",
25+
"location" : "https://github.com/clackary/RxSwift.git",
26+
"state" : {
27+
"revision" : "b5a0ba4d488ded8813cde51c7d49d7ad6cb56372",
28+
"version" : "6.8.1-pl.1"
29+
}
30+
},
31+
{
32+
"identity" : "swift-atomics",
33+
"kind" : "remoteSourceControl",
34+
"location" : "https://github.com/apple/swift-atomics.git",
35+
"state" : {
36+
"revision" : "cd142fd2f64be2100422d658e7411e39489da985",
37+
"version" : "1.2.0"
38+
}
39+
},
40+
{
41+
"identity" : "swift-collections",
42+
"kind" : "remoteSourceControl",
43+
"location" : "https://github.com/apple/swift-collections",
44+
"state" : {
45+
"revision" : "9bf03ff58ce34478e66aaee630e491823326fd06",
46+
"version" : "1.1.3"
47+
}
48+
},
49+
{
50+
"identity" : "swift-nio",
51+
"kind" : "remoteSourceControl",
52+
"location" : "https://github.com/apple/swift-nio.git",
53+
"state" : {
54+
"revision" : "9746cf80e29edfef2a39924a66731249223f42a3",
55+
"version" : "2.72.0"
56+
}
57+
},
58+
{
59+
"identity" : "swift-system",
60+
"kind" : "remoteSourceControl",
61+
"location" : "https://github.com/apple/swift-system.git",
62+
"state" : {
63+
"revision" : "d2ba781702a1d8285419c15ee62fd734a9437ff5",
64+
"version" : "1.3.2"
65+
}
66+
}
67+
],
68+
"version" : 3
7069
}

Package.swift

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// swift-tools-version:5.3
1+
// swift-tools-version:5.10
22
import PackageDescription
33

44
let package = Package(
@@ -9,7 +9,7 @@ let package = Package(
99
dependencies: [
1010
.package(url: "https://github.com/GraphQLSwift/GraphQL.git", from: "2.0.0"),
1111
.package(url: "https://github.com/GraphQLSwift/Graphiti.git", from: "1.0.0"),
12-
.package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.1.0"),
12+
.package(url: "https://github.com/PassiveLogic/RxSwift.git", exact: "6.8.1-pl.1"),
1313
],
1414
targets: [
1515
.target(name: "GraphQLRxSwift", dependencies: ["GraphQL", "Graphiti", "RxSwift"]),

0 commit comments

Comments
 (0)