Skip to content

Commit 6de811b

Browse files
committed
Workaround Kotlin serialization regression
This commit disables the Dokka plugin for now as it brings Kotlin Serialization transitively. See spring-projects/spring-framework#35761
1 parent 35f1408 commit 6de811b

File tree

5 files changed

+2
-20
lines changed

5 files changed

+2
-20
lines changed

buildSrc/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,7 @@ configurations.all {
8282
exclude group:"org.slf4j", module:"slf4j-api"
8383
exclude group:"ch.qos.logback", module:"logback-classic"
8484
exclude group:"ch.qos.logback", module:"logback-core"
85+
exclude group:"org.jetbrains.kotlinx", module:"kotlinx-serialization-json"
8586
}
8687

8788
gradlePlugin {

core/spring-boot/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
plugins {
1818
id "org.jetbrains.kotlin.jvm"
19-
id "org.jetbrains.dokka"
2019
id "java-library"
2120
id "java-test-fixtures"
2221
id "org.springframework.boot.configuration-properties"

documentation/spring-boot-docs/build.gradle

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import org.springframework.boot.build.optional.OptionalDependenciesPlugin
2222

2323
plugins {
2424
id "org.jetbrains.kotlin.jvm"
25-
id "org.jetbrains.dokka"
2625
id "java"
2726
id "org.antora"
2827
id "org.springframework.boot.aggregator"
@@ -85,9 +84,6 @@ plugins.withType(EclipsePlugin) {
8584
dependencies {
8685
compileOnly("org.hamcrest:hamcrest-core")
8786

88-
dokka(project(path: ":core:spring-boot"))
89-
dokka(project(path: ":module:spring-boot-resttestclient"))
90-
9187
implementation(project(path: ":cli:spring-boot-cli"))
9288
implementation(project(path: ":core:spring-boot-docker-compose"))
9389
implementation(project(path: ":core:spring-boot-test"))
@@ -244,10 +240,6 @@ dependencies {
244240
testSlices(project(path: ":core:spring-boot-test-autoconfigure", configuration: "testSliceMetadata"))
245241
}
246242

247-
dokka {
248-
moduleName.set("Spring Boot Kotlin API")
249-
}
250-
251243
configurations {
252244
javadoc {
253245
canBeConsumed = true
@@ -442,9 +434,6 @@ antoraContributions {
442434
from(aggregatedJavadoc) {
443435
into "java"
444436
}
445-
from(tasks.named("dokkaGeneratePublicationHtml")) {
446-
into "kotlin"
447-
}
448437
}
449438
}
450439
'root' {
@@ -508,9 +497,3 @@ antoraContributions {
508497
}
509498
}
510499
}
511-
512-
dokka {
513-
dokkaPublications.configureEach {
514-
includes.from("src/docs/dokka/dokka-overview.md")
515-
}
516-
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
* Kotlin APIs
2-
** xref:api:kotlin/index.html[Spring Boot,role=link-external, window=_blank]
2+
** WIP

module/spring-boot-resttestclient/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616

1717
plugins {
1818
id "org.jetbrains.kotlin.jvm"
19-
id "org.jetbrains.dokka"
2019
id "java-library"
2120
id "org.springframework.boot.auto-configuration"
2221
id "org.springframework.boot.deployed"

0 commit comments

Comments
 (0)