From cc3d4872f70cfebaf5d85c72af0030f526671915 Mon Sep 17 00:00:00 2001 From: Marcin Aman Date: Thu, 3 Sep 2020 13:39:58 +0200 Subject: Javadoc version number is always 0.0.1 #1406 --- .../src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt | 4 ++++ .../src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt | 1 + 2 files changed, 5 insertions(+) (limited to 'runners/gradle-plugin/src/main/kotlin') diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt index b4800124..9dab1f04 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/AbstractDokkaTask.kt @@ -28,6 +28,10 @@ abstract class AbstractDokkaTask( val moduleName: Property = project.objects.safeProperty() .safeConvention(project.name) + @Input + val moduleVersion: Property = project.objects.safeProperty() + .safeConvention(project.version.toString()) + @OutputDirectory val outputDirectory: Property = project.objects.safeProperty() .safeConvention(defaultDokkaOutputDirectory()) diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt index beec3a7e..ed3989af 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/DokkaTask.kt @@ -37,6 +37,7 @@ abstract class DokkaTask : AbstractDokkaTask(DokkaBootstrapImpl::class) { override fun buildDokkaConfiguration(): DokkaConfigurationImpl { return DokkaConfigurationImpl( moduleName = moduleName.getSafe(), + moduleVersion = moduleVersion.orNull, outputDir = outputDirectory.getSafe(), cacheRoot = cacheRoot.getSafe(), offlineMode = offlineMode.getSafe(), -- cgit