Skip to content

Commit cad41a5

Browse files
authored
Merge pull request #153 from DougGregor/drop-swift-collections
Drop dependency on swift-collections
2 parents 89b0a06 + ddd578c commit cad41a5

File tree

3 files changed

+2
-6
lines changed

3 files changed

+2
-6
lines changed

Package.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ let package = Package(
139139
dependencies: [
140140
.package(url: "https://github.com/swiftlang/swift-syntax.git", branch: "main"),
141141
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
142-
.package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "1.1.0")),
143142
.package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),
144143
],
145144
targets: [
@@ -309,7 +308,6 @@ let package = Package(
309308
.product(name: "SwiftSyntax", package: "swift-syntax"),
310309
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
311310
.product(name: "ArgumentParser", package: "swift-argument-parser"),
312-
.product(name: "Collections", package: "swift-collections"),
313311
"JavaTypes",
314312
],
315313
swiftSettings: [

Sources/JExtractSwift/ImportedDecls+Printing.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import Foundation
1616
import JavaTypes
1717
import SwiftSyntax
18-
import OrderedCollections
1918

2019
extension ImportedFunc {
2120
/// Render a `@{@snippet ... }` comment section that can be put inside a JavaDoc comment
@@ -99,4 +98,4 @@ extension Optional where Wrapped == VariableAccessorKind {
9998
func renderMethodName(_ decl: ImportedFunc) -> String {
10099
self?.renderMethodName(decl) ?? decl.baseIdentifier
101100
}
102-
}
101+
}

Sources/JExtractSwift/ImportedDecls.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import Foundation
1616
import JavaTypes
1717
import SwiftSyntax
18-
import OrderedCollections
1918

2019
/// Any imported (Swift) declaration
2120
protocol ImportedDecl {
@@ -254,7 +253,7 @@ public struct ImportedVariable: ImportedDecl, CustomStringConvertible {
254253
/// Usually this will be all the accessors the variable declares,
255254
/// however if the getter is async or throwing we may not be able to import it
256255
/// (yet), and therefore would skip it from the supported set.
257-
public var supportedAccessorKinds: OrderedSet<VariableAccessorKind> = [.get, .set]
256+
public var supportedAccessorKinds: [VariableAccessorKind] = [.get, .set]
258257

259258
/// This is the base identifier for the function, e.g., "init" for an
260259
/// initializer or "f" for "f(a:b:)".

0 commit comments

Comments
 (0)