Fix use of deprecated classes/properties in build.gradle.kts

Signed-off-by: Graham <gpe@openrs2.org>
Graham 3 years ago
parent e309add443
commit bdc9fa1f61
  1. 21
      build.gradle.kts

@ -1,5 +1,6 @@
import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper import org.jetbrains.kotlin.gradle.plugin.KotlinPluginWrapper
import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import org.jmailen.gradle.kotlinter.KotlinterExtension import org.jmailen.gradle.kotlinter.KotlinterExtension
import org.jmailen.gradle.kotlinter.KotlinterPlugin import org.jmailen.gradle.kotlinter.KotlinterPlugin
@ -22,8 +23,8 @@ allprojects {
version = "0.1.0-SNAPSHOT" version = "0.1.0-SNAPSHOT"
plugins.withType<BasePlugin> { plugins.withType<BasePlugin> {
configure<BasePluginConvention> { configure<BasePluginExtension> {
archivesBaseName = "${rootProject.name}-$name" archivesName.set("${rootProject.name}-$name")
} }
} }
@ -75,8 +76,8 @@ allprojects {
tasks.withType<Test> { tasks.withType<Test> {
reports { reports {
html.isEnabled = false html.required.set(false)
junitXml.isEnabled = true junitXml.required.set(true)
} }
} }
@ -84,9 +85,9 @@ allprojects {
dependsOn("test") dependsOn("test")
reports { reports {
csv.isEnabled = false csv.required.set(false)
html.isEnabled = false html.required.set(false)
xml.isEnabled = false xml.required.set(false)
} }
tasks.named("check") { tasks.named("check") {
@ -118,7 +119,7 @@ configure(subprojects.filter { it.isFree }) {
for (module in listOf("stdlib", "stdlib-common", "stdlib-jdk7", "stdlib-jdk8")) { for (module in listOf("stdlib", "stdlib-common", "stdlib-jdk7", "stdlib-jdk8")) {
api("org.jetbrains.kotlin:kotlin-$module") { api("org.jetbrains.kotlin:kotlin-$module") {
version { version {
strictly(kotlinPluginVersion) strictly(project.getKotlinPluginVersion())
} }
} }
} }
@ -348,8 +349,8 @@ project(":nonfree") {
project(":nonfree:client") { project(":nonfree:client") {
apply(plugin = "application") apply(plugin = "application")
configure<ApplicationPluginConvention> { configure<JavaApplication> {
mainClassName = "client" mainClass.set("client")
} }
tasks.named<JavaExec>("run") { tasks.named<JavaExec>("run") {

Loading…
Cancel
Save