Skip to content

Commit f317668

Browse files
authored
De-dupe checksum filename definition (#40)
* 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.
1 parent b4875f3 commit f317668

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/main/kotlin/DevPublishPlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ constructor(
180180
}
181181

182182
val storedChecksum = providers.loadPublicationChecksum {
183-
this.checksumFilename.set(publicationData.map { "${it.name}.txt" })
183+
this.checksumFilename.set(publicationData.map { it.checksumFilename })
184184
this.checksumsStore.set(checksumsStore)
185185
}
186186

src/main/kotlin/data/PublicationData.kt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ import org.gradle.api.provider.Property
88
import org.gradle.api.publish.maven.MavenPublication
99
import org.gradle.api.tasks.Input
1010
import org.gradle.api.tasks.InputFiles
11+
import org.gradle.api.tasks.Internal
1112
import org.gradle.api.tasks.PathSensitive
1213
import org.gradle.api.tasks.PathSensitivity.RELATIVE
1314

@@ -42,6 +43,9 @@ constructor(
4243
@get:Input
4344
abstract val identifier: Property<String>
4445

46+
@get:Internal
47+
internal val checksumFilename: String get() = "$name.txt"
48+
4549
@Input
4650
override fun getName(): String = name
4751
}

src/main/kotlin/tasks/GeneratePublicationDataChecksumTask.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package dev.adamko.gradle.dev_publish.tasks
22

3-
import dev.adamko.gradle.dev_publish.internal.checksums.CreatePublicationChecksum.Companion.createPublicationChecksum
43
import dev.adamko.gradle.dev_publish.data.PublicationData
54
import dev.adamko.gradle.dev_publish.internal.DevPublishInternalApi
5+
import dev.adamko.gradle.dev_publish.internal.checksums.CreatePublicationChecksum.Companion.createPublicationChecksum
66
import dev.adamko.gradle.dev_publish.utils.info
77
import javax.inject.Inject
88
import org.gradle.api.NamedDomainObjectContainer
@@ -55,7 +55,7 @@ constructor(
5555
publicationData.forEach { data ->
5656
logger.info("Creating publication data checksum for ${data.name} ${data.artifacts.asPath}")
5757

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

6060
val checksum = providers.createPublicationChecksum {
6161
this.projectDir.set(currentProjectDir)

0 commit comments

Comments
 (0)