Skip to content

Commit 5180deb

Browse files
committed
refactor: fix deprecated buildDir in NexusRepositoryIdStore
1 parent a1df565 commit 5180deb

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

plugins/stage-vote-release-plugin/src/main/kotlin/com/github/vlsi/gradle/release/NexusRepositoryIdStore.kt

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,23 +16,24 @@
1616
*/
1717
package com.github.vlsi.gradle.release
1818

19-
import java.io.File
19+
import org.gradle.api.file.ProjectLayout
20+
import org.gradle.api.logging.Logger
2021
import java.util.concurrent.ConcurrentHashMap
21-
import org.gradle.api.Project
2222

23-
class NexusRepositoryIdStore(private val project: Project) {
23+
class NexusRepositoryIdStore(
24+
private val logger: Logger,
25+
layout: ProjectLayout
26+
) {
2427
private val savedIds = ConcurrentHashMap<String, String>()
2528

26-
private fun storeDir() = "${project.buildDir}/stagingRepositories"
27-
28-
private fun filePath(repositoryName: String) = "${storeDir()}/$repositoryName.txt"
29+
private val storeDir = layout.buildDirectory.dir("stagingRepositories")
2930

3031
operator fun get(name: String) = savedIds[name]
3132

3233
operator fun set(name: String, id: String) {
3334
if (savedIds.putIfAbsent(name, id) == null) {
34-
project.logger.lifecycle("Initialized stagingRepositoryId {} for repository {}", id, name)
35-
val file = project.file(filePath(name))
35+
logger.lifecycle("Initialized stagingRepositoryId {} for repository {}", id, name)
36+
val file = storeDir.get().file("$name.txt").asFile
3637
file.parentFile.mkdirs()
3738
file.writeText(id)
3839
}
@@ -41,10 +42,10 @@ class NexusRepositoryIdStore(private val project: Project) {
4142
fun getOrLoad(name: String) = savedIds[name] ?: load(name)
4243

4344
fun load(name: String) =
44-
File(storeDir() + "/$name.txt").readText().also { set(name, it) }
45+
storeDir.get().file("$name.txt").asFile.readText().also { set(name, it) }
4546

4647
fun load() {
47-
for (f in project.file(storeDir()).listFiles { f -> f.name.endsWith("*.txt") }
48+
for (f in storeDir.get().asFile.listFiles { f -> f.name.endsWith("*.txt") }
4849
?: arrayOf()) {
4950
savedIds[f.name.removeSuffix(".txt")] = f.readText()
5051
}

plugins/stage-vote-release-plugin/src/main/kotlin/com/github/vlsi/gradle/release/ReleaseExtension.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ import org.gradle.api.Action
2525
import org.gradle.api.GradleException
2626
import org.gradle.api.Project
2727
import org.gradle.api.file.CopySpec
28+
import org.gradle.api.file.ProjectLayout
29+
import org.gradle.api.logging.Logger
2830
import org.gradle.api.model.ObjectFactory
2931
import org.gradle.api.tasks.TaskProvider
3032
import org.gradle.api.tasks.bundling.AbstractArchiveTask
@@ -40,10 +42,12 @@ import java.time.Duration
4042
* ```
4143
*/
4244
open class ReleaseExtension @Inject constructor(
45+
logger: Logger,
4346
private val project: Project,
47+
layout: ProjectLayout,
4448
objects: ObjectFactory
4549
) {
46-
internal val repositoryIdStore = NexusRepositoryIdStore(project)
50+
internal val repositoryIdStore = NexusRepositoryIdStore(logger, layout)
4751

4852
val validateSvnCredentials =
4953
project.validate { svnDist.credentials }.toMutableList()

plugins/stage-vote-release-plugin/src/main/kotlin/com/github/vlsi/gradle/release/StageVoteReleasePlugin.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ class StageVoteReleasePlugin @Inject constructor(
134134
val releaseSignaturesConfiguration = configurations[RELEASE_SIGNATURES_CONFIGURATION_NAME]
135135

136136
// Save stagingRepoId. We don't know which
137-
val releaseExt = extensions.create<ReleaseExtension>(RELEASE_PARAMS_EXTENSION_NAME, project)
137+
val releaseExt = extensions.create<ReleaseExtension>(RELEASE_PARAMS_EXTENSION_NAME, logger, project)
138138

139139
configureSigning(releaseExt)
140140

0 commit comments

Comments
 (0)