From b17b72b6b5dbe677cd99fce744b9a9c488b804a5 Mon Sep 17 00:00:00 2001 From: Irmen de Jong Date: Sun, 19 Sep 2021 18:27:25 +0200 Subject: [PATCH] remote broken dokka build target, upgrade to kotlin 1.5.30 --- build.gradle.kts | 19 +------------------ 1 file changed, 1 insertion(+), 18 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 20f5d95..58ea8d0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,3 @@ -import org.jetbrains.dokka.gradle.DokkaTask import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import java.util.* import kotlin.math.max @@ -6,11 +5,10 @@ import kotlin.math.max plugins { // Apply the Kotlin JVM plugin to add support for Kotlin on the JVM. - kotlin("jvm") version "1.5.20" + kotlin("jvm") version "1.5.30" `maven-publish` application java - id("org.jetbrains.dokka") version "0.10.1" id("com.jfrog.bintray") version "1.8.4" } @@ -71,14 +69,6 @@ tasks { withType { kotlinOptions.jvmTarget = "11" } - - named("dokka") { - outputFormat = "html" - outputDirectory = "$buildDir/kdoc" - configuration { - skipEmptyPackages = true - } - } } val c64emuScript by tasks.registering(CreateStartScripts::class) { @@ -110,12 +100,6 @@ val sourcesJar by tasks.registering(Jar::class) { from(sourceSets.main.get().allSource) } -val dokkaDocs by tasks.registering(Jar::class) { - dependsOn("dokka") - archiveClassifier.set("kdoc") - from(fileTree(File(project.buildDir, "kdoc"))) -} - publishing { repositories { mavenLocal() @@ -124,7 +108,6 @@ publishing { register("mavenJava", MavenPublication::class) { from(components["java"]) artifact(sourcesJar.get()) - artifact(dokkaDocs.get()) } } }