Skip to content

Commit

Permalink
De-dupe checksum filename definition (#40)
Browse files Browse the repository at this point in the history
* Disable tasks caching

The DevPublish tasks only relocates files. Caching the tasks is wasteful and slow.

* create distinct directory for each test

* test DevPublish does not affect Build Cache

* Re-use the same checksum filename

Minor update to make sure the checksum filename is always the same.
  • Loading branch information
aSemy authored Jul 22, 2024
1 parent b4875f3 commit 0b626a5
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/main/kotlin/DevPublishPlugin.kt
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ constructor(
}

val storedChecksum = providers.loadPublicationChecksum {
this.checksumFilename.set(publicationData.map { "${it.name}.txt" })
this.checksumFilename.set(publicationData.map { it.checksumFilename })
this.checksumsStore.set(checksumsStore)
}

Expand Down
4 changes: 4 additions & 0 deletions src/main/kotlin/data/PublicationData.kt
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import org.gradle.api.provider.Property
import org.gradle.api.publish.maven.MavenPublication
import org.gradle.api.tasks.Input
import org.gradle.api.tasks.InputFiles
import org.gradle.api.tasks.Internal
import org.gradle.api.tasks.PathSensitive
import org.gradle.api.tasks.PathSensitivity.RELATIVE

Expand Down Expand Up @@ -42,6 +43,9 @@ constructor(
@get:Input
abstract val identifier: Property<String>

@get:Internal
internal val checksumFilename: String get() = "$name.txt"

@Input
override fun getName(): String = name
}
4 changes: 2 additions & 2 deletions src/main/kotlin/tasks/GeneratePublicationDataChecksumTask.kt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package dev.adamko.gradle.dev_publish.tasks

import dev.adamko.gradle.dev_publish.internal.checksums.CreatePublicationChecksum.Companion.createPublicationChecksum
import dev.adamko.gradle.dev_publish.data.PublicationData
import dev.adamko.gradle.dev_publish.internal.DevPublishInternalApi
import dev.adamko.gradle.dev_publish.internal.checksums.CreatePublicationChecksum.Companion.createPublicationChecksum
import dev.adamko.gradle.dev_publish.utils.info
import javax.inject.Inject
import org.gradle.api.NamedDomainObjectContainer
Expand Down Expand Up @@ -55,7 +55,7 @@ constructor(
publicationData.forEach { data ->
logger.info("Creating publication data checksum for ${data.name} ${data.artifacts.asPath}")

val checksumFile = tempDir.resolve("${data.name}.txt")
val checksumFile = tempDir.resolve(data.checksumFilename)

val checksum = providers.createPublicationChecksum {
this.projectDir.set(currentProjectDir)
Expand Down

0 comments on commit 0b626a5

Please sign in to comment.