Skip to content

Drop dependency on swift-collections #153

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 4, 2024
Merged

Drop dependency on swift-collections #153

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1bc80c1
Drop dependency on swift-collections
DougGregor Nov 4, 2024
ddd578c
Remove unneeded import of OrderedCollections
DougGregor Nov 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,6 @@ let package = Package(
dependencies: [
.package(url: "https://github.com/swiftlang/swift-syntax.git", branch: "main"),
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.5.0"),
.package(url: "https://github.com/apple/swift-collections.git", .upToNextMinor(from: "1.1.0")),
.package(url: "https://github.com/ordo-one/package-benchmark", .upToNextMajor(from: "1.4.0")),
],
targets: [
Expand Down Expand Up @@ -309,7 +308,6 @@ let package = Package(
.product(name: "SwiftSyntax", package: "swift-syntax"),
.product(name: "SwiftSyntaxBuilder", package: "swift-syntax"),
.product(name: "ArgumentParser", package: "swift-argument-parser"),
.product(name: "Collections", package: "swift-collections"),
"JavaTypes",
],
swiftSettings: [
Expand Down
3 changes: 1 addition & 2 deletions Sources/JExtractSwift/ImportedDecls+Printing.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import Foundation
import JavaTypes
import SwiftSyntax
import OrderedCollections

extension ImportedFunc {
/// Render a `@{@snippet ... }` comment section that can be put inside a JavaDoc comment
Expand Down Expand Up @@ -99,4 +98,4 @@ extension Optional where Wrapped == VariableAccessorKind {
func renderMethodName(_ decl: ImportedFunc) -> String {
self?.renderMethodName(decl) ?? decl.baseIdentifier
}
}
}
3 changes: 1 addition & 2 deletions Sources/JExtractSwift/ImportedDecls.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
import Foundation
import JavaTypes
import SwiftSyntax
import OrderedCollections

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

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