Skip to content

Commit 86a4731

Browse files
erichaagdeverichaagdev
committed
Revert "Use Provider API to read version and changes files"
This reverts commit 7c7f5a6.
1 parent 422822e commit 86a4731

File tree

1 file changed

+31
-35
lines changed

1 file changed

+31
-35
lines changed

‎build.gradle.kts

Lines changed: 31 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,9 @@ repositories {
2929
mavenCentral()
3030
}
3131

32-
val releaseVersion = releaseVersion()
33-
val releaseNotes = releaseNotes()
34-
32+
val appVersion = layout.projectDirectory.file("release/version.txt").asFile.readText().trim()
3533
allprojects {
36-
version = releaseVersion
34+
version = appVersion
3735
}
3836

3937
val argbash by configurations.creating
@@ -95,18 +93,16 @@ val copyGradleScripts by tasks.registering(Copy::class) {
9593
group = "build"
9694
description = "Copies the Gradle source and generated scripts to output directory."
9795

98-
// local variable required for configuration cache compatibility
99-
// https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:not_yet_implemented:accessing_top_level_at_execution
100-
val releaseVersion = releaseVersion
101-
inputs.property("project.version", releaseVersion)
96+
val projectVersion = appVersion // local variable required for configuration cache compatibility
97+
inputs.property("project.version", projectVersion)
10298

10399
from(layout.projectDirectory.file("LICENSE"))
104100
from(layout.projectDirectory.dir("release").file("version.txt"))
105101
rename("version.txt", "VERSION")
106102

107103
from(layout.projectDirectory.dir("components/scripts/gradle")) {
108104
exclude("gradle-init-scripts")
109-
filter { line: String -> line.replace("<HEAD>", releaseVersion.get()) }
105+
filter { line: String -> line.replace("<HEAD>", projectVersion) }
110106
}
111107
from(layout.projectDirectory.dir("components/scripts/gradle")) {
112108
include("gradle-init-scripts/**")
@@ -118,7 +114,7 @@ val copyGradleScripts by tasks.registering(Copy::class) {
118114
include("network.settings")
119115
include("lib/**")
120116
exclude("lib/cli-parsers")
121-
filter { line: String -> line.replace("<HEAD>", releaseVersion.get()) }
117+
filter { line: String -> line.replace("<HEAD>", projectVersion) }
122118
}
123119
from(generateBashCliParsers.map { it.outputDir.file("lib/cli-parsers/gradle") }) {
124120
into("lib/")
@@ -133,25 +129,23 @@ val copyMavenScripts by tasks.registering(Copy::class) {
133129
group = "build"
134130
description = "Copies the Maven source and generated scripts to output directory."
135131

136-
// local variable required for configuration cache compatibility
137-
// https://docs.gradle.org/current/userguide/configuration_cache.html#config_cache:not_yet_implemented:accessing_top_level_at_execution
138-
val releaseVersion = releaseVersion
139-
inputs.property("project.version", releaseVersion)
132+
val projectVersion = appVersion // local variable required for configuration cache compatibility
133+
inputs.property("project.version", projectVersion)
140134

141135
from(layout.projectDirectory.file("LICENSE"))
142136
from(layout.projectDirectory.dir("release").file("version.txt"))
143137
rename("version.txt", "VERSION")
144138

145139
from(layout.projectDirectory.dir("components/scripts/maven")) {
146-
filter { line: String -> line.replace("<HEAD>", releaseVersion.get()) }
140+
filter { line: String -> line.replace("<HEAD>", projectVersion) }
147141
}
148142
from(layout.projectDirectory.dir("components/scripts/")) {
149143
include("README.md")
150144
include("mapping.example")
151145
include("network.settings")
152146
include("lib/**")
153147
exclude("lib/cli-parsers")
154-
filter { line: String -> line.replace("<HEAD>", releaseVersion.get()) }
148+
filter { line: String -> line.replace("<HEAD>", projectVersion) }
155149
}
156150
from(generateBashCliParsers.map { it.outputDir.file("lib/cli-parsers/maven") }) {
157151
into("lib/")
@@ -175,7 +169,7 @@ val assembleGradleScripts by tasks.registering(Zip::class) {
175169
group = "build"
176170
description = "Packages the Gradle experiment scripts in a zip archive."
177171
archiveBaseName.set("gradle-enterprise-gradle-build-validation")
178-
archiveFileName.set("${archiveBaseName.get()}-${distributionVersion().get()}.zip")
172+
archiveFileName.set("${archiveBaseName.get()}-${distributionVersion()}.zip")
179173
from(copyGradleScripts)
180174
into(archiveBaseName.get())
181175
}
@@ -184,7 +178,7 @@ val assembleMavenScripts by tasks.registering(Zip::class) {
184178
group = "build"
185179
description = "Packages the Maven experiment scripts in a zip archive."
186180
archiveBaseName.set("gradle-enterprise-maven-build-validation")
187-
archiveFileName.set("${archiveBaseName.get()}-${distributionVersion().get()}.zip")
181+
archiveFileName.set("${archiveBaseName.get()}-${distributionVersion()}.zip")
188182
from(copyMavenScripts)
189183
into(archiveBaseName.get())
190184
}
@@ -259,7 +253,7 @@ githubRelease {
259253
prerelease.set(isDevelopmentRelease)
260254
overwrite.set(isDevelopmentRelease)
261255
generateReleaseNotes.set(false)
262-
body.set(releaseNotes)
256+
body.set(layout.projectDirectory.file("release/changes.md").asFile.readText().trim())
263257
releaseAssets(assembleGradleScripts, assembleMavenScripts, generateChecksums.map { it.outputs.files.asFileTree })
264258
}
265259

@@ -278,24 +272,26 @@ tasks.withType(Sign::class).configureEach {
278272
notCompatibleWithConfigurationCache("$name task does not support configuration caching")
279273
}
280274

281-
fun gitHubReleaseName(): Provider<String> {
282-
return releaseVersion.map { if (isDevelopmentRelease) "Development release" else it }
283-
}
284-
285-
fun gitReleaseTag(): Provider<String> {
286-
return releaseVersion.map { if (isDevelopmentRelease) "development-latest" else "v$it" }
287-
}
288-
289-
fun distributionVersion(): Provider<String> {
290-
return releaseVersion.map { if (isDevelopmentRelease) "dev" else it }
275+
fun gitHubReleaseName(): String {
276+
if (isDevelopmentRelease) {
277+
return "Development Build"
278+
} else {
279+
return version.toString()
280+
}
291281
}
292282

293-
fun releaseVersion(): Provider<String> {
294-
val versionFile = layout.projectDirectory.file("release/version.txt")
295-
return providers.fileContents(versionFile).asText.map { it.trim() }
283+
fun gitReleaseTag(): String {
284+
if (isDevelopmentRelease) {
285+
return "development-latest"
286+
} else {
287+
return "v${version}"
288+
}
296289
}
297290

298-
fun releaseNotes(): Provider<String> {
299-
val releaseNotesFile = layout.projectDirectory.file("release/changes.md")
300-
return providers.fileContents(releaseNotesFile).asText.map { it.trim() }
291+
fun distributionVersion(): String {
292+
if (isDevelopmentRelease) {
293+
return "dev"
294+
} else {
295+
return version.toString()
296+
}
301297
}

0 commit comments

Comments
 (0)