Build: Fix JavaExec task configuration
Setting some properties is not allowed in doFirst anymore in Gradle 6.5
This commit is contained in:
@@ -23,6 +23,10 @@ fun JavaExec.passClasspathInJar() {
|
|||||||
dependsOn(classpath)
|
dependsOn(classpath)
|
||||||
inputs.files(classpath)
|
inputs.files(classpath)
|
||||||
inputs.property("main", main)
|
inputs.property("main", main)
|
||||||
|
|
||||||
|
archiveFileName.set("$main.${this@passClasspathInJar.name}.classpath.container.jar")
|
||||||
|
destinationDirectory.set(temporaryDir)
|
||||||
|
|
||||||
doFirst {
|
doFirst {
|
||||||
val classPathString = classpath.joinToString(" ") { project.file(it).toURI().toString() }
|
val classPathString = classpath.joinToString(" ") { project.file(it).toURI().toString() }
|
||||||
manifest {
|
manifest {
|
||||||
@@ -34,15 +38,11 @@ fun JavaExec.passClasspathInJar() {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
archiveName = "$main.${this@passClasspathInJar.name}.classpath.container.$extension"
|
|
||||||
destinationDir = temporaryDir
|
|
||||||
}
|
}
|
||||||
|
|
||||||
dependsOn(jarTask)
|
dependsOn(jarTask)
|
||||||
mainClass.set("-jar")
|
|
||||||
|
|
||||||
doFirst {
|
main = "-jar"
|
||||||
classpath = project.files()
|
classpath = project.files()
|
||||||
args = listOf(jarTask.outputs.files.singleFile.path) + args.orEmpty()
|
args = listOf(jarTask.outputs.files.singleFile.path) + args.orEmpty()
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user