Defer Jar task configuration

Goooler · Goooler · commit 1031d15db96d · 2023-11-26T16:06:20.000+08:00
diff --git a/lib-extra/build.gradle b/lib-extra/build.gradle
@@ -56,16 +56,16 @@ for (needsP2 in NEEDS_P2_DEPS) {
 		add("${needsP2}CompileOnly", "dev.equo.ide:solstice:${VER_SOLSTICE}")
 	}
 }
-jar {
+
+def jar = tasks.named('jar', Jar) {
 	for (needsP2 in NEEDS_P2_DEPS) {
-		from sourceSets.getByName(needsP2).output.classesDirs
+		from sourceSets.named(needsP2).map { it.output.classesDirs }
 	}
 }
+
 tasks.withType(Test).configureEach {
 	dependsOn jar
-	doFirst {
-		classpath += jar.outputs.files
-	}
+	classpath += jar.get().outputs.files
 }
 
 apply plugin: 'dev.equo.p2deps'

Original file line number	Diff line number	Diff line change
`@@ -56,16 +56,16 @@ for (needsP2 in NEEDS_P2_DEPS) {`
`56`	`56`	`add("${needsP2}CompileOnly", "dev.equo.ide:solstice:${VER_SOLSTICE}")`
`57`	`57`	`}`
`58`	`58`	`}`
`59`		`-jar {`
	`59`	`+`
	`60`	`+def jar = tasks.named('jar', Jar) {`
`60`	`61`	`for (needsP2 in NEEDS_P2_DEPS) {`
`61`		`- from sourceSets.getByName(needsP2).output.classesDirs`
	`62`	`+ from sourceSets.named(needsP2).map { it.output.classesDirs }`
`62`	`63`	`}`
`63`	`64`	`}`
	`65`	`+`
`64`	`66`	`tasks.withType(Test).configureEach {`
`65`	`67`	`dependsOn jar`
`66`		`- doFirst {`
`67`		`- classpath += jar.outputs.files`
`68`		`- }`
	`68`	`+ classpath += jar.get().outputs.files`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`apply plugin: 'dev.equo.p2deps'`