Make tasks compatible with configuration cache

023-dev · Apr 29, 2023 · 9c28789 · 9c28789
1 parent 7644bbd
commit 9c28789
Show file tree

Hide file tree

Showing 11 changed files with 25 additions and 12 deletions.
diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.osgi-conventions.gradle.kts
@@ -7,6 +7,8 @@ plugins {
 
 val importAPIGuardian = "org.apiguardian.*;resolution:=\"optional\""
 
+val projectDescription = objects.property<String>().convention(provider { project.description })
+
 // This task enhances `jar` and `shadowJar` tasks with the bnd
 // `BundleTaskExtension` extension which allows for generating OSGi
 // metadata into the jar
@@ -16,8 +18,8 @@ tasks.withType<Jar>().matching { task: Jar ->
 	extra["importAPIGuardian"] = importAPIGuardian
 
 	extensions.create<BundleTaskExtension>(BundleTaskExtension.NAME, this).apply {
-		properties.set(provider {
-			mapOf("project.description" to project.description)
+		properties.set(projectDescription.map {
+			mapOf("project.description" to it)
 		})
 		// These are bnd instructions necessary for generating OSGi metadata.
 		// We've generalized these so that they are widely applicable limiting

diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.publishing-conventions.gradle.kts
@@ -47,6 +47,7 @@ signing {
 }
 
 tasks.withType<Sign>().configureEach {
+	val isSnapshot = project.version.toString().contains("SNAPSHOT")
 	onlyIf {
 		!isSnapshot // Gradle Module Metadata currently does not support signing snapshots
 	}

diff --git a/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts b/gradle/plugins/common/src/main/kotlin/junitbuild.temp-maven-repo.gradle.kts
@@ -4,8 +4,9 @@ val tempRepoName by extra("temp")
 val tempRepoDir by extra(file("$buildDir/repo"))
 
 val clearTempRepoDir by tasks.registering {
+	val dir = tempRepoDir
 	doFirst {
-		tempRepoDir.deleteRecursively()
+		dir.deleteRecursively()
 	}
 }
 

diff --git a/junit-jupiter-api/junit-jupiter-api.gradle.kts b/junit-jupiter-api/junit-jupiter-api.gradle.kts
@@ -21,10 +21,11 @@ dependencies {
 tasks {
 	jar {
 		bundle {
+			val version = project.version
 			bnd("""
 				Require-Capability:\
 					org.junit.platform.engine;\
-						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;${rootProject.property("version")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("version")!!}}})))';\
+						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;${version}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${version}}})))';\
 						effective:=active
 			""")
 		}

diff --git a/junit-jupiter-engine/junit-jupiter-engine.gradle.kts b/junit-jupiter-engine/junit-jupiter-engine.gradle.kts
@@ -38,14 +38,15 @@ tasks {
 	}
 	jar {
 		bundle {
+			val platformVersion: String by rootProject.extra
 			bnd("""
 				Provide-Capability:\
 					org.junit.platform.engine;\
 						org.junit.platform.engine='junit-jupiter';\
 						version:Version="${'$'}{version_cleanup;${project.version}}"
 				Require-Capability:\
 					org.junit.platform.launcher;\
-						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}}})))';\
+						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${platformVersion}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${platformVersion}}})))';\
 						effective:=active
 			""")
 		}

diff --git a/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts b/junit-jupiter-migrationsupport/junit-jupiter-migrationsupport.gradle.kts
@@ -24,10 +24,11 @@ dependencies {
 
 tasks.jar {
 	bundle {
+		val importAPIGuardian: String by extra
 		bnd("""
 			# Import JUnit4 packages with a version
 			Import-Package: \
-				${extra["importAPIGuardian"]},\
+				$importAPIGuardian,\
 				org.junit;version="[${libs.versions.junit4Min.get()},5)",\
 				org.junit.platform.commons.logging;status=INTERNAL,\
 				org.junit.rules;version="[${libs.versions.junit4Min.get()},5)",\

diff --git a/junit-jupiter-params/junit-jupiter-params.gradle.kts b/junit-jupiter-params/junit-jupiter-params.gradle.kts
@@ -30,10 +30,11 @@ dependencies {
 tasks {
 	jar {
 		bundle {
+			val version = project.version
 			bnd("""
 				Require-Capability:\
 					org.junit.platform.engine;\
-						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;${rootProject.property("version")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("version")!!}}})))';\
+						filter:='(&(org.junit.platform.engine=junit-jupiter)(version>=${'$'}{version_cleanup;$version})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;$version}})))';\
 						effective:=active
 			""")
 		}

diff --git a/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts b/junit-platform-console-standalone/junit-platform-console-standalone.gradle.kts
@@ -52,10 +52,11 @@ tasks {
 		}
 
 		bundle {
+			val importAPIGuardian: String by extra
 			bnd("""
 				# Customize the imports because this is an aggregate jar
 				Import-Package: \
-					${extra["importAPIGuardian"]},\
+					$importAPIGuardian,\
 					kotlin.*;resolution:="optional",\
 					*
 				# Disable the APIGuardian plugin since everything was already

diff --git a/junit-platform-launcher/junit-platform-launcher.gradle.kts b/junit-platform-launcher/junit-platform-launcher.gradle.kts
@@ -17,11 +17,12 @@ dependencies {
 tasks {
 	jar {
 		bundle {
+			val version = project.version
 			bnd("""
 				Provide-Capability:\
 					org.junit.platform.launcher;\
 						org.junit.platform.launcher='junit-platform-launcher';\
-						version:Version="${'$'}{version_cleanup;${project.version}}"
+						version:Version="${'$'}{version_cleanup;${version}}"
 			""")
 		}
 	}

diff --git a/junit-platform-runner/junit-platform-runner.gradle.kts b/junit-platform-runner/junit-platform-runner.gradle.kts
@@ -24,10 +24,11 @@ dependencies {
 
 tasks.jar {
 	bundle {
+		val importAPIGuardian: String by extra
 		bnd("""
 			# Import JUnit4 packages with a version
 			Import-Package: \
-				${extra["importAPIGuardian"]},\
+				$importAPIGuardian,\
 				org.junit.platform.commons.logging;status=INTERNAL,\
 				org.junit.runner.*;version="[${libs.versions.junit4Min.get()},5)",\
 				*

diff --git a/junit-vintage-engine/junit-vintage-engine.gradle.kts b/junit-vintage-engine/junit-vintage-engine.gradle.kts
@@ -37,6 +37,8 @@ tasks {
 	jar {
 		bundle {
 			val junit4Min = libs.versions.junit4Min.get()
+			val platformVersion: String by rootProject.extra
+			val version = project.version
 			bnd("""
 				# Import JUnit4 packages with a version
 				Import-Package: \
@@ -53,10 +55,10 @@ tasks {
 				Provide-Capability:\
 					org.junit.platform.engine;\
 						org.junit.platform.engine='junit-vintage';\
-						version:Version="${'$'}{version_cleanup;${project.version}}"
+						version:Version="${'$'}{version_cleanup;$version}"
 				Require-Capability:\
 					org.junit.platform.launcher;\
-						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;${rootProject.property("platformVersion")!!}}})))';\
+						filter:='(&(org.junit.platform.launcher=junit-platform-launcher)(version>=${'$'}{version_cleanup;$platformVersion})(!(version>=${'$'}{versionmask;+;${'$'}{version_cleanup;$platformVersion}})))';\
 						effective:=active
 			""")
 		}