Refine the build to include real documentation in the kotlin module.

Fix documentation bug.

DbSetup-core/build.gradle

@@ -68,6 +68,18 @@ javadoc {
  options.addBooleanOption('Xdoclint:all,-missing', true)
 }
 
+task javadocJar(type: Jar, dependsOn: javadoc) {
+ classifier = 'javadoc'
+ from javadoc.destinationDir
+ manifest {
+ from project.ext.sharedManifest
+ }
+}
+
+artifacts {
+ archives javadocJar
+}
+
 def configurePomDependencies(pom) {
  // we don't care about test dependencies
  pom.dependencies = pom.dependencies.findAll {it.scope != 'test'}

DbSetup-kotlin/build.gradle

@@ -1,13 +1,16 @@
 buildscript {
  repositories {
  mavenCentral()
+ jcenter()
  }
  dependencies {
  classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.0.2"
+ classpath "org.jetbrains.dokka:dokka-gradle-plugin:0.9.8"
  }
 }
 
 apply plugin: 'kotlin'
+apply plugin: 'org.jetbrains.dokka'
 
 description = 'Kotlin extensions for DbSetup'
 
@@ -17,6 +20,39 @@ dependencies {
  testCompile 'junit:junit:4.11'
 }
 
+dokka {
+ inputs.dir 'src/main/kotlin'
+ jdkVersion = 8
+}
+
+task dokkaJavadoc(type: org.jetbrains.dokka.gradle.DokkaTask) {
+ outputFormat = 'javadoc'
+ outputDirectory = javadoc.destinationDir
+ inputs.dir 'src/main/kotlin'
+ jdkVersion = 8
+}
+
+task dokkaJar(type: Jar, dependsOn: dokka) {
+ classifier = 'dokka'
+ from dokka.outputDirectory
+ manifest {
+ from project.ext.sharedManifest
+ }
+}
+
+task javadocJar(type: Jar, dependsOn: dokkaJavadoc) {
+ classifier = 'javadoc'
+ from javadoc.destinationDir
+ manifest {
+ from project.ext.sharedManifest
+ }
+}
+
+artifacts {
+ archives javadocJar
+ archives dokkaJar
+}
+
 checkstyleMain {
  source sourceSets.main.kotlin
 }

DbSetup-kotlin/src/main/kotlin/com/ninja_squad/dbsetup_kotlin/Insert.Builder.kt

@@ -81,7 +81,7 @@ fun Insert.Builder.mappedValues(vararg entries: Pair<String, Any?>): Insert.Buil
  * insertInto("user") {
  * columns("id", "firstName", "lastName")
  * withGeneratedValue("id", ValueGenerators.sequence())
- * repeatingMappedValues(mapOf("firstName" to "John", "lastName" to "Doe")).times(100)
+ * repeatingValues(mapOf("firstName" to "John", "lastName" to "Doe")).times(100)
  * }
  * ```
  *

build.gradle

@@ -27,15 +27,15 @@ subprojects { subProject ->
  }
  compileJava.dependsOn checkJavaVersion
 
- def sharedManifest = manifest {
+ subProject.ext.sharedManifest = manifest {
  attributes(['Implementation-Title': project.name,
  'Implementation-Version': project.version,
  'Implementation-Vendor': 'ninja-squad.com'])
  }
 
  subProject.jar {
  manifest {
- from sharedManifest
+ from subProject.ext.sharedManifest
  instruction 'Bundle-Vendor', 'ninja-squad.com'
  }
  }
@@ -67,17 +67,8 @@ subprojects { subProject ->
  }
  }
 
- task javadocJar(type: Jar, dependsOn: javadoc) {
- classifier = 'javadoc'
- from javadoc.destinationDir
- manifest {
- from sharedManifest
- }
- }
-
  artifacts {
  archives sourcesJar
- archives javadocJar
  }
 
  task checkSonatypeProperties << {