Skip to content

Commit c2fd6a9

Browse files
authored
Fix build error occurring on Linux when arc4random_uniform is present (#59)
* Update XcodeProj to upstream and add a guard statement * Return packageDependencies for better coherence rather than an empty array * Switch to fork of xcodeproj and remove xcodegen deps
1 parent 3ad9b36 commit c2fd6a9

File tree

3 files changed

+6
-42
lines changed

3 files changed

+6
-42
lines changed

Package.resolved

+3-39
Original file line numberDiff line numberDiff line change
@@ -9,24 +9,6 @@
99
"version" : "4.6.1"
1010
}
1111
},
12-
{
13-
"identity" : "graphviz",
14-
"kind" : "remoteSourceControl",
15-
"location" : "https://github.com/wabiverse/GraphViz.git",
16-
"state" : {
17-
"revision" : "5e597d2f580f543cf7185f260c69b6b482a68d0f",
18-
"version" : "0.6.0"
19-
}
20-
},
21-
{
22-
"identity" : "jsonutilities",
23-
"kind" : "remoteSourceControl",
24-
"location" : "https://github.com/yonaskolb/JSONUtilities.git",
25-
"state" : {
26-
"revision" : "128d2ffc22467f69569ef8ff971683e2393191a0",
27-
"version" : "4.2.0"
28-
}
29-
},
3012
{
3113
"identity" : "pathkit",
3214
"kind" : "remoteSourceControl",
@@ -216,22 +198,13 @@
216198
"version" : "1.4.0"
217199
}
218200
},
219-
{
220-
"identity" : "swiftcli",
221-
"kind" : "remoteSourceControl",
222-
"location" : "https://github.com/jakeheis/SwiftCLI.git",
223-
"state" : {
224-
"revision" : "2e949055d9797c1a6bddcda0e58dada16cc8e970",
225-
"version" : "6.0.3"
226-
}
227-
},
228201
{
229202
"identity" : "swiftxcodeproj",
230203
"kind" : "remoteSourceControl",
231-
"location" : "https://github.com/stackotter/SwiftXcodeProj.git",
204+
"location" : "https://github.com/stackotter/SwiftXcodeProj",
232205
"state" : {
233-
"revision" : "46e9b907e3ec66010cf2204594549ff1dc195032",
234-
"version" : "8.10.1"
206+
"revision" : "182a1f69f0c77e1a152fba083b7fa814785824dd",
207+
"version" : "8.11.0"
235208
}
236209
},
237210
{
@@ -252,15 +225,6 @@
252225
"version" : "2.1.0"
253226
}
254227
},
255-
{
256-
"identity" : "xcodegen",
257-
"kind" : "remoteSourceControl",
258-
"location" : "https://github.com/stackotter/XcodeGen",
259-
"state" : {
260-
"revision" : "8f562268f8b54461b6ddfe817d624bc4e307a30e",
261-
"version" : "2.35.2"
262-
}
263-
},
264228
{
265229
"identity" : "xctest-dynamic-overlay",
266230
"kind" : "remoteSourceControl",

Package.swift

+2-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ let package = Package(
1818
.package(url: "https://github.com/onevcat/Rainbow", from: "3.0.0"),
1919
.package(url: "https://github.com/mxcl/Version.git", from: "2.0.0"),
2020
.package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"),
21-
.package(url: "https://github.com/stackotter/XcodeGen", exact: "2.35.2"),
21+
.package(url: "https://github.com/stackotter/SwiftXcodeProj", from: "8.11.0"),
2222
.package(url: "https://github.com/apple/swift-syntax", exact: "510.0.1"),
2323
.package(url: "https://github.com/apple/swift-format", exact: "510.0.1"),
2424
.package(url: "https://github.com/pointfreeco/swift-overture", from: "0.5.0"),
@@ -44,8 +44,7 @@ let package = Package(
4444
"HotReloadingProtocol",
4545
"FileSystemWatcher",
4646
"Yams",
47-
.product(name: "XcodeGenKit", package: "XcodeGen"),
48-
.product(name: "ProjectSpec", package: "XcodeGen"),
47+
"SwiftXcodeProj",
4948
.product(name: "SwiftSyntax", package: "swift-syntax"),
5049
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
5150
.product(name: "SwiftFormat", package: "swift-format"),

Sources/swift-bundler/Bundler/XcodeprojConverter/XcodeprojConverter.swift

+1
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,7 @@ enum XcodeprojConverter {
118118
rootDirectory: URL
119119
) -> [XcodePackageDependency] {
120120
var packageDependencies: [XcodePackageDependency] = []
121+
121122
for dependency in target.packageProductDependencies {
122123
guard
123124
let package = dependency.package,

0 commit comments

Comments
 (0)