Merge branch 'dev'

2 files changed, 21 insertions, 4 deletions

diff --git a/runners/ant/build.gradle b/runners/ant/build.gradle
index 85328d95..e7dcd441 100644
--- a/runners/ant/build.gradle
+++ b/runners/ant/build.gradle
@@ -1,6 +1,15 @@
 apply plugin: 'kotlin'
 
-sourceCompatibility = 1.6
+sourceCompatibility = 1.8
+
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+        freeCompilerArgs += "-Xjsr305=strict"
+        languageVersion = "1.2"
+        apiVersion = languageVersion
+        jvmTarget = "1.8"
+    }
+}
 
 dependencies {
     compile project(":core")
diff --git a/runners/ant/src/main/kotlin/ant/dokka.kt b/runners/ant/src/main/kotlin/ant/dokka.kt
index fb70aefd..d1b6bef5 100644
--- a/runners/ant/src/main/kotlin/ant/dokka.kt
+++ b/runners/ant/src/main/kotlin/ant/dokka.kt
@@ -28,7 +28,8 @@ class AntPackageOptions(
         override var prefix: String = "",
         override var includeNonPublic: Boolean = false,
         override var reportUndocumented: Boolean = true,
-        override var skipDeprecated: Boolean = false) : DokkaConfiguration.PackageOptions
+        override var skipDeprecated: Boolean = false,
+        override var suppress: Boolean = false) : DokkaConfiguration.PackageOptions
 
 
 class DokkaAntTask: Task() {
@@ -44,6 +45,9 @@ class DokkaAntTask: Task() {
 
     var cacheRoot: String? = null
 
+    var languageVersion: String? = null
+    var apiVersion: String? = null
+
     val compileClasspath: Path by lazy { Path(getProject()) }
     val sourcePath: Path by lazy { Path(getProject()) }
     val samplesPath: Path by lazy { Path(getProject()) }
@@ -117,7 +121,9 @@ class DokkaAntTask: Task() {
                 samplesPath.list().toList(),
                 includesPath.list().toList(),
                 moduleName!!,
-                DocumentationOptions(outputDir!!, outputFormat,
+                DocumentationOptions(
+                        outputDir!!,
+                        outputFormat,
                         skipDeprecated = skipDeprecated,
                         sourceLinks = sourceLinks,
                         jdkVersion = jdkVersion,
@@ -125,7 +131,9 @@ class DokkaAntTask: Task() {
                         perPackageOptions = antPackageOptions,
                         externalDocumentationLinks = antExternalDocumentationLinks.map { it.build() },
                         noStdlibLink = noStdlibLink,
-                        cacheRoot = cacheRoot
+                        cacheRoot = cacheRoot,
+                        languageVersion = languageVersion,
+                        apiVersion = apiVersion
                 )
         )
         generator.generate()