Fix tests generation after upgrading Gradle to 6.5
This commit is contained in:
@@ -56,7 +56,7 @@ var Project.javaHome: String?
|
|||||||
|
|
||||||
fun Project.generator(fqName: String, sourceSet: SourceSet? = null) = smartJavaExec {
|
fun Project.generator(fqName: String, sourceSet: SourceSet? = null) = smartJavaExec {
|
||||||
classpath = (sourceSet ?: testSourceSet).runtimeClasspath
|
classpath = (sourceSet ?: testSourceSet).runtimeClasspath
|
||||||
main = fqName
|
mainClass.set(fqName)
|
||||||
workingDir = rootDir
|
workingDir = rootDir
|
||||||
systemProperty("line.separator", "\n")
|
systemProperty("line.separator", "\n")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -39,10 +39,9 @@ fun JavaExec.passClasspathInJar() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependsOn(jarTask)
|
dependsOn(jarTask)
|
||||||
|
mainClass.set("-jar")
|
||||||
|
|
||||||
doFirst {
|
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()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -165,7 +165,7 @@ fun Project.runIdeTask(name: String, ideaPluginDir: File, ideaSandboxDir: File,
|
|||||||
|
|
||||||
classpath = mainSourceSet.runtimeClasspath
|
classpath = mainSourceSet.runtimeClasspath
|
||||||
|
|
||||||
main = "com.intellij.idea.Main"
|
mainClass.set("com.intellij.idea.Main")
|
||||||
|
|
||||||
workingDir = File(intellijRootDir(), "bin")
|
workingDir = File(intellijRootDir(), "bin")
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user