Skip to content
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

refactor(SwiftPM): De-duplicate a class #8228

Merged
merged 1 commit into from
Feb 5, 2024
Merged

refactor(SwiftPM): De-duplicate a class #8228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 9 additions & 11 deletions plugins/package-managers/swiftpm/src/main/kotlin/SwiftPm.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,16 +172,16 @@ class SwiftPm(
}
}

private val SwiftPackage.Dependency.id: Identifier
private val SwiftPackage.id: Identifier
get() = Identifier(
type = PACKAGE_TYPE,
namespace = "",
name = getCanonicalName(repositoryUrl),
name = getCanonicalName(url),
version = version
)

private fun SwiftPackage.Dependency.toPackage(): Package {
val vcsInfoFromUrl = VcsHost.parseUrl(repositoryUrl)
private fun SwiftPackage.toPackage(): Package {
val vcsInfoFromUrl = VcsHost.parseUrl(url)
val vcsInfo = vcsInfoFromUrl.takeUnless { it.revision.isBlank() } ?: vcsInfoFromUrl.copy(revision = version)

return createPackage(id, vcsInfo)
Expand Down Expand Up @@ -241,14 +241,12 @@ internal fun getCanonicalName(repositoryUrl: String): String {
}.getOrDefault(normalizedUrl).lowercase()
}

private class SwiftPmDependencyHandler : DependencyHandler<SwiftPackage.Dependency> {
override fun identifierFor(dependency: SwiftPackage.Dependency): Identifier = dependency.id
private class SwiftPmDependencyHandler : DependencyHandler<SwiftPackage> {
override fun identifierFor(dependency: SwiftPackage): Identifier = dependency.id

override fun dependenciesFor(dependency: SwiftPackage.Dependency): Collection<SwiftPackage.Dependency> =
dependency.dependencies
override fun dependenciesFor(dependency: SwiftPackage): Collection<SwiftPackage> = dependency.dependencies

override fun linkageFor(dependency: SwiftPackage.Dependency): PackageLinkage = PackageLinkage.DYNAMIC
override fun linkageFor(dependency: SwiftPackage): PackageLinkage = PackageLinkage.DYNAMIC

override fun createPackage(dependency: SwiftPackage.Dependency, issues: MutableList<Issue>): Package =
dependency.toPackage()
override fun createPackage(dependency: SwiftPackage, issues: MutableList<Issue>): Package = dependency.toPackage()
}
12 changes: 2 additions & 10 deletions plugins/package-managers/swiftpm/src/main/kotlin/SwiftPmModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,8 @@ internal data class SwiftPackage(
val url: String,
val version: String,
val path: String,
val dependencies: List<Dependency>
) {
@Serializable
data class Dependency(
val name: String,
val version: String,
@SerialName("url") val repositoryUrl: String,
val dependencies: Set<Dependency>
)
}
val dependencies: List<SwiftPackage>
)

/**
* See https://github.com/apple/swift-package-manager/blob/3ef830dddff459e569d6e49c186c3ded33c39bcc/Sources/PackageGraph/PinsStore.swift#L387-L462.
Expand Down
Loading