Skip to content

Commit dad2a10

Browse files
authored
SONARGO-378 Enable Gradle Configuration cache (#23)
1 parent 879a5ce commit dad2a10

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

gradle-modules/src/main/kotlin/org.sonarsource.cloud-native.artifactory-configuration.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@ val buildNumber: String? = System.getProperty("buildNumber")
3434

3535
val artifactoryConfiguration = extensions.create<ArtifactoryConfiguration>("artifactoryConfiguration")
3636

37+
val projectVersion = project.version as String
38+
3739
// `afterEvaluate` is required to inject configurable properties; see https://github.com/jfrog/artifactory-gradle-plugin/issues/71#issuecomment-1734977528
3840
project.afterEvaluate {
3941
artifactory {
@@ -63,7 +65,7 @@ project.afterEvaluate {
6365
setProperties(
6466
mapOf(
6567
"build.name" to artifactoryConfiguration.buildName.get(),
66-
"version" to project.version.toString(),
68+
"version" to projectVersion,
6769
"build.number" to buildNumber,
6870
"pr.branch.target" to System.getenv("PULL_REQUEST_BRANCH_TARGET"),
6971
"pr.number" to System.getenv("PULL_REQUEST_NUMBER"),
@@ -77,7 +79,7 @@ project.afterEvaluate {
7779
}
7880
}
7981

80-
clientConfig.info.addEnvironmentProperty("PROJECT_VERSION", project.version.toString())
82+
clientConfig.info.addEnvironmentProperty("PROJECT_VERSION", projectVersion)
8183
clientConfig.info.buildName = artifactoryConfiguration.buildName.get()
8284
clientConfig.info.buildNumber = buildNumber
8385
clientConfig.isIncludeEnvVars = true

gradle-modules/src/main/kotlin/org.sonarsource.cloud-native.sonar-plugin.gradle.kts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,14 @@ val cleanupTask = tasks.register<Delete>("cleanupOldVersion") {
2525
group = "build"
2626
description = "Clean up jars of old plugin version"
2727

28+
// those variables need to be calculated in the configuration phase to enable Configuration cache
29+
// https://docs.gradle.org/8.12.1/userguide/configuration_cache.html#config_cache:requirements:disallowed_types
30+
var projectName = "${project.name}-*.jar"
31+
var projectVersion = "${project.version}"
2832
delete(
2933
fileTree(layout.buildDirectory.dir("libs")).matching {
30-
include("${project.name}-*.jar")
31-
exclude("${project.name}-${project.version}-*.jar")
34+
include("${projectName}-*.jar")
35+
exclude("${projectName}-${projectVersion}-*.jar")
3236
}
3337
)
3438
}

0 commit comments

Comments
 (0)