strips/darwin-apk
2
0
Fork 0
mirror of https://github.com/GayPizzaSpecifications/darwin-apk.git synced 2025-08-03 21:41:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Consolidate version stuff

Browse Source
This commit is contained in:
a dinosaur
2024-11-22 20:19:49 +11:00
parent 72c4f2ac31
commit cc703ad0c5
8 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/apk/Index/ApkIndexDependency.swift
View File

@ -6,9 +6,9 @@
import Foundation
public struct ApkIndexDependency: Hashable, Sendable {
let requirement: ApkRequirement
let requirement: ApkVersionRequirement
init(requirement: ApkRequirement) {
init(requirement: ApkVersionRequirement) {
self.requirement = requirement
}
}

4
Sources/apk/Index/ApkIndexInstallIf.swift
View File

@ -4,9 +4,9 @@
*/
public struct ApkIndexInstallIf: Hashable, Sendable {
let requirement: ApkRequirement
let requirement: ApkVersionRequirement
init(requirement: ApkRequirement) {
init(requirement: ApkVersionRequirement) {
self.requirement = requirement
}
}

2
Sources/apk/Index/ApkIndexProvides.swift
View File

@ -6,7 +6,7 @@
public struct ApkIndexProvides: Hashable, Sendable {
let name: String
init(requirement: ApkRequirement) {
init(requirement: ApkVersionRequirement) {
self.name = requirement.name
}
}

6
Sources/apk/Index/ApkIndexRequirementRef.swift
View File

@ -19,7 +19,7 @@ struct ApkIndexRequirementRef {
self._graph!.pkgIndex.packages[self.packageID]
}
func satisfied(by other: ApkRequirement) -> Bool {
func satisfied(by other: ApkVersionRequirement) -> Bool {
true
}
}
@ -50,11 +50,11 @@ extension ApkIndexRequirementRef: CustomStringConvertible {
}
return switch self.constraint {
case .dep(let version):
"dep=\(ApkRequirement(name: package.name, spec: version))"
"dep=\(ApkVersionRequirement(name: package.name, spec: version))"
case .provision:
"provides=\(package.name)"
case .installIf(let version):
"installIf=\(ApkRequirement(name: package.name, spec: version))"
"installIf=\(ApkVersionRequirement(name: package.name, spec: version))"
}
}
}