From bdc9fa1f61b96ee6bf52beab9e69c564e04a293f Mon Sep 17 00:00:00 2001 From: Graham Date: Sat, 17 Jul 2021 17:46:30 +0100 Subject: [PATCH] Fix use of deprecated classes/properties in build.gradle.kts Signed-off-by: Graham --- build.gradle.kts | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index a018704a85..aeca463fb5 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper +import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jmailen.gradle.kotlinter.KotlinterExtension import org.jmailen.gradle.kotlinter.KotlinterPlugin @@ -22,8 +23,8 @@ allprojects { version = "0.1.0-SNAPSHOT" plugins.withType { - configure { - archivesBaseName = "${rootProject.name}-$name" + configure { + archivesName.set("${rootProject.name}-$name") } } @@ -75,8 +76,8 @@ allprojects { tasks.withType { reports { - html.isEnabled = false - junitXml.isEnabled = true + html.required.set(false) + junitXml.required.set(true) } } @@ -84,9 +85,9 @@ allprojects { dependsOn("test") reports { - csv.isEnabled = false - html.isEnabled = false - xml.isEnabled = false + csv.required.set(false) + html.required.set(false) + xml.required.set(false) } tasks.named("check") { @@ -118,7 +119,7 @@ configure(subprojects.filter { it.isFree }) { for (module in listOf("stdlib", "stdlib-common", "stdlib-jdk7", "stdlib-jdk8")) { api("org.jetbrains.kotlin:kotlin-$module") { version { - strictly(kotlinPluginVersion) + strictly(project.getKotlinPluginVersion()) } } } @@ -348,8 +349,8 @@ project(":nonfree") { project(":nonfree:client") { apply(plugin = "application") - configure { - mainClassName = "client" + configure { + mainClass.set("client") } tasks.named("run") {