diff --git a/build.gradle b/build.gradle index 5be0295..5113921 100644 --- a/build.gradle +++ b/build.gradle @@ -18,6 +18,7 @@ plugins { apply plugin: 'kotlin-platform-common' apply plugin: 'maven-publish' apply plugin: 'net.researchgate.release' +apply plugin: 'org.jetbrains.dokka' description = 'A Result monad for modelling success or failure operations.' @@ -31,6 +32,18 @@ dependencies { testCompile "org.jetbrains.kotlin:kotlin-test-common:$kotlinVersion" } +dokka { + outputFormat = 'javadoc' + outputDirectory = "$buildDir/docs" +} + +task javadocJar(type: Jar, dependsOn: dokka) { + group = LifecycleBasePlugin.BUILD_GROUP + description = 'Assembles a jar archive containing the Javadoc API documentation.' + classifier = 'javadoc' + from dokka.outputDirectory +} + task sourcesJar(type: Jar) { group = LifecycleBasePlugin.BUILD_GROUP description = 'Assembles a jar archive containing the main classes with sources.' @@ -41,6 +54,7 @@ task sourcesJar(type: Jar) { publishing { publications { mavenJava(MavenPublication) { + artifact javadocJar artifact sourcesJar } } diff --git a/gradle.properties b/gradle.properties index bc8b440..710a884 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,7 +1,7 @@ group=com.github.michaelbull.kotlin-result version=1.0.3-SNAPSHOT -dokkaVersion=0.9.15 +dokkaVersion=0.9.14 gradleReleaseVersion=2.6.0 hamkrestVersion=1.4.2.0 junitVersion=4.12 diff --git a/jvm/build.gradle b/jvm/build.gradle index d9bdcd7..1a6a636 100644 --- a/jvm/build.gradle +++ b/jvm/build.gradle @@ -1,5 +1,4 @@ apply plugin: 'kotlin-platform-jvm' -apply plugin: 'org.jetbrains.dokka' repositories { mavenCentral() @@ -13,23 +12,10 @@ dependencies { testCompile "org.jetbrains.kotlin:kotlin-test:$kotlinVersion" } -dokka { - outputFormat = 'javadoc' - outputDirectory = "$buildDir/docs" -} - -task javadocJar(type: Jar, dependsOn: dokka) { - group = LifecycleBasePlugin.BUILD_GROUP - description = 'Assembles a jar archive containing the Javadoc API documentation.' - classifier = 'javadoc' - from dokka.outputDirectory -} - publishing { publications { mavenJava(MavenPublication) { from components.java - artifact javadocJar } } }