Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate kotlinOptions to compilerOptions #2883

Merged
merged 7 commits into from Mar 8, 2023
Merged

Migrate kotlinOptions to compilerOptions #2883

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6decb3c
Configure Kotlin compilation in KotlinCompilationTask
Goooler Feb 22, 2023
1fd5230
Still use KotlinCompile
Goooler Feb 23, 2023
7e57f74
Merge branch 'master' into fix
Goooler Mar 6, 2023
3ad37d5
Use `KotlinJvmCompile`
Goooler Mar 6, 2023
1b0ca44
Cleanup
Goooler Mar 7, 2023
302e5e0
Merge remote-tracking branch 'origin/master' into fix
Goooler Mar 8, 2023
f4d4336
Patch changes
Goooler Mar 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
32 changes: 19 additions & 13 deletions build.gradle.kts
View file
Open in desktop
@@ -1,4 +1,7 @@
import org.jetbrains.*
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
Expand All @@ -16,21 +19,24 @@ allprojects {
group = "org.jetbrains.dokka"
version = dokka_version


val language_version: String by project
tasks.withType(KotlinCompile::class).all {
kotlinOptions {
freeCompilerArgs = freeCompilerArgs + listOf(
"-opt-in=kotlin.RequiresOptIn",
"-Xjsr305=strict",
"-Xskip-metadata-version-check",
// need 1.4 support, otherwise there might be problems with Gradle 6.x (it's bundling Kotlin 1.4)
"-Xsuppress-version-warnings"
tasks.withType<KotlinCompile>().configureEach {
compilerOptions {
freeCompilerArgs.addAll(
listOf(
"-opt-in=kotlin.RequiresOptIn",
"-Xjsr305=strict",
"-Xskip-metadata-version-check",
// need 1.4 support, otherwise there might be problems with Gradle 6.x (it's bundling Kotlin 1.4)
"-Xsuppress-version-warnings"
)
)
allWarningsAsErrors = true
languageVersion = language_version
apiVersion = language_version
jvmTarget = "1.8"
allWarningsAsErrors.set(true)
languageVersion.set(KotlinVersion.fromVersion(language_version))
(this as? KotlinJvmCompilerOptions)?.run {
apiVersion.set(KotlinVersion.fromVersion(language_version))
jvmTarget.set(JvmTarget.JVM_1_8)
}
}
}

Expand Down
6 changes: 4 additions & 2 deletions examples/plugin/hide-internal-api/build.gradle.kts
View file
Open in desktop
@@ -1,3 +1,5 @@
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.net.URI

Expand Down Expand Up @@ -30,8 +32,8 @@ dependencies {
val dokkaOutputDir = "$buildDir/dokka"

tasks {
withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
withType<KotlinCompile>().configureEach {
(compilerOptions as? KotlinJvmCompilerOptions)?.jvmTarget?.set(JvmTarget.JVM_1_8)
Goooler marked this conversation as resolved.
Show resolved Hide resolved
}
dokkaHtml {
outputDirectory.set(file(dokkaOutputDir))
Expand Down
7 changes: 5 additions & 2 deletions mkdocs/src/doc/docs/developer_guide/plugin-development/introduction.md
View file
Open in desktop
Expand Up @@ -25,6 +25,9 @@ It has pre-configured dependencies, publishing and signing of your artifacts.
At a bare minimum, Dokka requires `Kotlin Gradle Plugin` and `dokka-core` dependencies:

```kotlin
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmCompilerOptions
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "<kotlin_version>"
}
Expand All @@ -33,8 +36,8 @@ dependencies {
compileOnly("org.jetbrains.dokka:dokka-core:<dokka_version>")
}

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "1.8"
tasks.withType<KotlinCompile>().configureEach {
(compilerOptions as? KotlinJvmCompilerOptions)?.jvmTarget?.set(JvmTarget.JVM_1_8)
}
```

Expand Down