Skip to content

Commit 823db5f

Browse files
committed
core: replace buildDir deprecation
1 parent 942c8c9 commit 823db5f

File tree

6 files changed

+21
-13
lines changed

6 files changed

+21
-13
lines changed

plugins/gettext-plugin/src/main/kotlin/com/github/vlsi/gradle/gettext/GettextTask.kt

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,21 +16,22 @@
1616
*/
1717
package com.github.vlsi.gradle.gettext
1818

19+
import org.gradle.api.file.RegularFileProperty
1920
import org.gradle.api.model.ObjectFactory
2021
import org.gradle.api.tasks.IgnoreEmptyDirectories
2122
import org.gradle.api.tasks.Input
2223
import org.gradle.api.tasks.InputFiles
24+
import org.gradle.api.tasks.Internal
2325
import org.gradle.api.tasks.OutputFile
2426
import org.gradle.api.tasks.PathSensitive
2527
import org.gradle.api.tasks.PathSensitivity
2628
import org.gradle.api.tasks.SkipWhenEmpty
2729
import org.gradle.api.tasks.TaskAction
2830
import org.gradle.kotlin.dsl.property
2931
import org.gradle.kotlin.dsl.setProperty
30-
import java.io.File
3132
import javax.inject.Inject
3233

33-
open class GettextTask @Inject constructor(
34+
abstract class GettextTask @Inject constructor(
3435
objects: ObjectFactory
3536
) : BaseGettextEditTask(objects) {
3637
@Input
@@ -56,13 +57,17 @@ open class GettextTask @Inject constructor(
5657
val outputPot = objects.fileProperty()
5758
.convention(project.layout.buildDirectory.file("gettext/$name/messages.pot"))
5859

60+
@get:Internal
61+
protected abstract val inputFilesList: RegularFileProperty
62+
5963
init {
6064
executable.convention("xgettext")
65+
inputFilesList.set(project.layout.buildDirectory.file("gettext/$name/input_files.txt"))
6166
}
6267

6368
@TaskAction
6469
fun run() {
65-
val inputFilesList = File(project.buildDir, "gettext/$name/input_files.txt")
70+
val inputFilesList = this.inputFilesList.get().asFile
6671
val baseDir = project.projectDir
6772
inputFilesList.writer().buffered().use { f ->
6873
sourceFiles.files.forEach {

plugins/license-gather-plugin/build.gradle.kts

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ dependencies {
2828

2929
tasks {
3030
val saveLicenses by registering(EnumGeneratorTask::class) {
31-
licenses.set(File(projectDir, "license-list-data/json"))
32-
outputDir.set(File(buildDir, "generated-sources/licenses"))
31+
licenses = layout.projectDirectory.dir("license-list-data/json")
32+
outputDir = layout.buildDirectory.dir("generated-sources/licenses")
3333

3434
sourceSets.main {
3535
java {
@@ -53,7 +53,7 @@ tasks {
5353

5454
// For unit tests
5555
val copyLicenses by registering(Sync::class) {
56-
val output = "$buildDir/licenses"
56+
val output = layout.buildDirectory.dir("licenses")
5757
into(output)
5858
with(licenseTexts)
5959
sourceSets.main {
@@ -65,7 +65,7 @@ tasks {
6565
dependsOn(copyLicenses)
6666
}
6767

68-
val allLicenseTextsDir = "$buildDir/license-texts"
68+
val allLicenseTextsDir = layout.buildDirectory.dir("license-texts")
6969
val copyTexts by registering(Sync::class) {
7070
into(allLicenseTextsDir)
7171
into("com/github/vlsi/gradle/license/api/text") {
@@ -82,7 +82,7 @@ tasks {
8282
}
8383

8484
val generateStaticTfIdf by registering(JavaExec::class) {
85-
val output = "$buildDir/tfidf"
85+
val output = layout.buildDirectory.dir("tfidf")
8686
dependsOn(copyTexts)
8787
inputs.files(sourceSets.main.map { it.runtimeClasspath.filter { f -> f.name != "tfidf_licenses.bin" } })
8888
inputs.files(copyLicenses)
@@ -97,7 +97,7 @@ tasks {
9797

9898
val copyTfidf by registering(Copy::class) {
9999
// This resource is generated after compile, so we copy it manually
100-
into("$buildDir/resources/main")
100+
into(layout.buildDirectory.dir("resources/main"))
101101
from(generateStaticTfIdf) {
102102
include("**/tfidf_licenses.bin")
103103
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import org.gradle.api.Project
2323
class NexusRepositoryIdStore(private val project: Project) {
2424
private val savedIds = ConcurrentHashMap<String, String>()
2525

26-
private fun storeDir() = "${project.buildDir}/stagingRepositories"
26+
private fun storeDir() = "${project.lay}/stagingRepositories"
2727

2828
private fun filePath(repositoryName: String) = "${storeDir()}/$repositoryName.txt"
2929

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ open class ReleaseArtifacts @Inject constructor(
4848
fun previewSite(vararg dependencies: TaskProvider<*>, action: Action<CopySpec>) {
4949
project.artifacts {
5050
for (task in dependencies) {
51-
add(PREVIEW_SITE_CONFIGURATION_NAME, project.buildDir.resolve(task.name + "_tmp")) {
51+
add(PREVIEW_SITE_CONFIGURATION_NAME, project.layout.buildDirectory.dir(task.name + "_tmp")) {
5252
builtBy(task)
5353
}
5454
}

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
@@ -652,7 +652,7 @@ class StageVoteReleasePlugin @Inject constructor(private val instantiator: Insta
652652

653653
val releaseExt = project.the<ReleaseExtension>()
654654

655-
val voteMailFile = "$buildDir/$PREPARE_VOTE_TASK_NAME/mail.txt"
655+
val voteMailFile = layout.buildDirectory.file("$PREPARE_VOTE_TASK_NAME/mail.txt")
656656
outputs.file(file(voteMailFile))
657657
doLast {
658658
val nexusPublish = project.the<NexusPublishExtension>()

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import java.io.File
2424
import java.net.URI
2525
import javax.inject.Inject
2626
import org.gradle.api.DefaultTask
27+
import org.gradle.api.file.RegularFileProperty
2728
import org.gradle.api.tasks.Input
2829
import org.gradle.api.tasks.TaskAction
2930
import org.gradle.kotlin.dsl.property
@@ -80,6 +81,8 @@ abstract class SvnmuccTask @Inject constructor() : DefaultTask() {
8081
return false
8182
}
8283

84+
protected val commandsFile = project.layout.buildDirectory.file("svnmucc/$name.txt")
85+
8386
@TaskAction
8487
fun mucc(inputChanges: InputChanges) {
8588
logger.debug(
@@ -110,7 +113,7 @@ abstract class SvnmuccTask @Inject constructor() : DefaultTask() {
110113
.map(SvnOperation::toSvn)
111114
.joinToString("\n")
112115

113-
val commandsFile = project.file("${project.buildDir}/svnmucc/$name.txt")
116+
val commandsFile = this.commandsFile.get().asFile
114117
commandsFile.parentFile.mkdir()
115118
commandsFile.writeText(commands)
116119

0 commit comments

Comments
 (0)