mirror of
https://github.com/tadfisher/gradle2nix.git
synced 2026-01-11 23:40:37 -05:00
Miscellaneous cleanup
This commit is contained in:
@@ -20,11 +20,12 @@ interface DependencyCoordinates : Serializable {
|
||||
*/
|
||||
val timestamp: String?
|
||||
|
||||
val id: String get() = if (timestamp != null) {
|
||||
"$group:$artifact:$version:$timestamp"
|
||||
} else {
|
||||
"$group:$artifact:$version"
|
||||
}
|
||||
val id: String get() =
|
||||
if (timestamp != null) {
|
||||
"$group:$artifact:$version:$timestamp"
|
||||
} else {
|
||||
"$group:$artifact:$version"
|
||||
}
|
||||
|
||||
val timestampedCoordinates: DependencyCoordinates
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
package org.nixos.gradle2nix.model
|
||||
|
||||
const val RESOLVE_PROJECT_TASK = "resolveProjectDependencies"
|
||||
const val RESOLVE_ALL_TASK = "resolveAllDependencies"
|
||||
const val RESOLVE_PROJECT_TASK = "resolveProjectArtifacts"
|
||||
const val RESOLVE_ALL_TASK = "resolveAllArtifacts"
|
||||
|
||||
@@ -6,9 +6,8 @@ data class DefaultDependencyCoordinates(
|
||||
override val group: String,
|
||||
override val artifact: String,
|
||||
override val version: String,
|
||||
override val timestamp: String? = null
|
||||
override val timestamp: String? = null,
|
||||
) : DependencyCoordinates {
|
||||
|
||||
override val timestampedCoordinates: DependencyCoordinates
|
||||
get() = DefaultDependencyCoordinates(group, artifact, timestampedVersion)
|
||||
|
||||
@@ -21,7 +20,7 @@ data class DefaultDependencyCoordinates(
|
||||
3 -> DefaultDependencyCoordinates(parts[0], parts[1], parts[2])
|
||||
4 -> DefaultDependencyCoordinates(parts[0], parts[1], parts[2], parts[3])
|
||||
else -> throw IllegalStateException(
|
||||
"couldn't parse dependency coordinates: '$id'"
|
||||
"couldn't parse dependency coordinates: '$id'",
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -4,5 +4,5 @@ import org.nixos.gradle2nix.model.DependencySet
|
||||
import org.nixos.gradle2nix.model.ResolvedDependency
|
||||
|
||||
data class DefaultDependencySet(
|
||||
override val dependencies: List<ResolvedDependency>
|
||||
override val dependencies: List<ResolvedDependency>,
|
||||
) : DependencySet
|
||||
|
||||
Reference in New Issue
Block a user