starred/pkl
1
0
Fork 0
mirror of https://github.com/apple/pkl.git synced 2026-03-26 19:11:12 +01:00
Code Issues 198 Packages Projects Releases 10 Wiki Activity

Use layout.buildDirectory (#326)

Browse Source 
This switches Gradle scripts to use `layout.buildDirectory` instead
of hard-coded "build".
This commit is contained in:
Daniel Chao
2024-03-18 21:42:16 -07:00
committed by GitHub
parent 1f68cf0251
commit e4ccf517fa
11 changed files with 65 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
buildSrc/src/main/kotlin/pklFatJar.gradle.kts
View File

@@ -105,7 +105,7 @@ tasks.check {
}
val validateFatJar by tasks.registering {
val outputFile = file("build/validateFatJar/result.txt")
val outputFile = layout.buildDirectory.file("validateFatJar/result.txt")
inputs.files(tasks.shadowJar)
inputs.property("nonRelocations", nonRelocations)
outputs.file(outputFile)
@@ -125,9 +125,9 @@ val validateFatJar by tasks.registering {
}
}
if (unshadowedFiles.isEmpty()) {
outputFile.writeText("SUCCESS")
outputFile.get().asFile.writeText("SUCCESS")
} else {
outputFile.writeText("FAILURE")
outputFile.get().asFile.writeText("FAILURE")
throw GradleException("Found unshadowed files:\n" + unshadowedFiles.joinToString("\n"))
}
}
@@ -138,7 +138,7 @@ tasks.check {
val resolveSourcesJars by tasks.registering(ResolveSourcesJars::class) {
configuration.set(configurations.runtimeClasspath)
outputDir.set(project.file("build/resolveSourcesJars"))
outputDir.set(layout.buildDirectory.dir("resolveSourcesJars"))
}
val fatSourcesJar by tasks.registering(MergeSourcesJars::class) {

4
buildSrc/src/main/kotlin/pklHtmlValidator.gradle.kts
View File

@@ -33,7 +33,7 @@ dependencies {
}
val validateHtml by tasks.registering(JavaExec::class) {
val resultFile = file("build/validateHtml/result.txt")
val resultFile = layout.buildDirectory.file("validateHtml/result.txt")
inputs.files(htmlValidator.sources)
outputs.file(resultFile)
@@ -50,7 +50,7 @@ val validateHtml by tasks.registering(JavaExec::class) {
// write a basic result file s.t. gradle can consider task up-to-date
// writing a result file in case validation fails is not easily possible with JavaExec, but also not strictly necessary
doFirst { project.delete(resultFile) }
doLast { resultFile.writeText("Success.") }
doLast { resultFile.get().asFile.writeText("Success.") }
}
tasks.check {

2
buildSrc/src/main/kotlin/pklJavaLibrary.gradle.kts
View File

@@ -55,7 +55,7 @@ val workAroundKotlinGradlePluginBug by tasks.registering {
// A problem was found with the configuration of task ':pkl-executor:compileJava' (type 'JavaCompile').
// > Directory '[...]/pkl/pkl-executor/build/classes/kotlin/main'
// specified for property 'compileKotlinOutputClasses' does not exist.
file("build/classes/kotlin/main").mkdirs()
layout.buildDirectory.dir("classes/kotlin/main").get().asFile.mkdirs()
}
}

6
buildSrc/src/main/kotlin/pklPublishLibrary.gradle.kts
View File

@@ -54,14 +54,14 @@ val validatePom by tasks.registering {
return@registering
}
val generatePomFileForLibraryPublication by tasks.existing(GenerateMavenPom::class)
val outputFile = file("build/validatePom") // dummy output to satisfy up-to-date check
val outputFile = layout.buildDirectory.file("validatePom") // dummy output to satisfy up-to-date check
dependsOn(generatePomFileForLibraryPublication)
inputs.file(generatePomFileForLibraryPublication.get().destination)
outputs.file(outputFile)
doLast {
outputFile.delete()
outputFile.get().asFile.delete()
val pomFile = generatePomFileForLibraryPublication.get().destination
assert(pomFile.exists())
@@ -95,7 +95,7 @@ val validatePom by tasks.registering {
}
}
outputFile.writeText("OK")
outputFile.get().asFile.writeText("OK")
}
}