From bcfd835f3670ab333e5255173cd40206e6cf3fde Mon Sep 17 00:00:00 2001 From: Kamil Doległo Date: Tue, 3 Mar 2020 19:56:25 +0100 Subject: Use JDK8 as the default version --- runners/ant/src/main/kotlin/ant/dokka.kt | 2 +- runners/cli/src/main/kotlin/cli/main.kt | 2 +- .../kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt | 2 +- runners/maven-plugin/src/main/kotlin/DokkaMojo.kt | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'runners') diff --git a/runners/ant/src/main/kotlin/ant/dokka.kt b/runners/ant/src/main/kotlin/ant/dokka.kt index 6b83fc8f..d275ed82 100644 --- a/runners/ant/src/main/kotlin/ant/dokka.kt +++ b/runners/ant/src/main/kotlin/ant/dokka.kt @@ -59,7 +59,7 @@ class AntPassConfig(task: Task) : DokkaConfiguration.PassConfiguration { override var reportUndocumented: Boolean = false override var skipEmptyPackages: Boolean = true override var skipDeprecated: Boolean = false - override var jdkVersion: Int = 6 + override var jdkVersion: Int = 8 override val sourceLinks: List get() = antSourceLinkDefinition.map { val path = it.path!! diff --git a/runners/cli/src/main/kotlin/cli/main.kt b/runners/cli/src/main/kotlin/cli/main.kt index db8ddb01..5d7ec1f7 100644 --- a/runners/cli/src/main/kotlin/cli/main.kt +++ b/runners/cli/src/main/kotlin/cli/main.kt @@ -90,7 +90,7 @@ class Arguments(val parser: DokkaArgumentsParser) : DokkaConfiguration.PassConfi listOf("-jdkVersion"), "Version of JDK to use for linking to JDK JavaDoc", { it.toInt() }, - { 6 } + { 8 } ) override val languageVersion: String? by parser.stringOption( diff --git a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt index 52caba41..3b3b3f96 100644 --- a/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt +++ b/runners/gradle-plugin/src/main/kotlin/org/jetbrains/dokka/gradle/configurationImplementations.kt @@ -35,7 +35,7 @@ open class GradlePassConfigurationImpl(@Transient val name: String = ""): PassCo @Input override var reportUndocumented: Boolean = false @Input override var skipEmptyPackages: Boolean = false @Input override var skipDeprecated: Boolean = false - @Input override var jdkVersion: Int = 6 + @Input override var jdkVersion: Int = 8 @Input override var sourceLinks: MutableList = mutableListOf() @Input override var perPackageOptions: MutableList = mutableListOf() @Input override var externalDocumentationLinks: MutableList = mutableListOf() diff --git a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt index 67188325..4ec7e0db 100644 --- a/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt +++ b/runners/maven-plugin/src/main/kotlin/DokkaMojo.kt @@ -77,7 +77,7 @@ abstract class AbstractDokkaMojo : AbstractMojo() { var skip: Boolean = false @Parameter(required = false, defaultValue = "6") - var jdkVersion: Int = 6 + var jdkVersion: Int = 8 @Parameter var skipDeprecated: Boolean = false -- cgit