Resolve some build errors after the merge

ShreckYe · ShreckYe · commit 83ec57eb65e0 · 2025-01-07T19:38:40.000+08:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -4,6 +4,7 @@ tasks.wrapper {
 
 plugins {
     id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3"
+    id("org.jetbrains.dokka")
 }
 
 apiValidation {
@@ -17,10 +18,6 @@ apiValidation {
     }
 }
 
-plugins {
-    id("org.jetbrains.dokka")
-}
-
 dependencies {
     subprojects.filter { it.name.startsWith(project.name) }.forEach {
         dokka(it)
diff --git a/buildSrc/src/main/kotlin/dokka-convention.gradle.kts b/buildSrc/src/main/kotlin/dokka-convention.gradle.kts
@@ -2,7 +2,9 @@ plugins {
     id("com.huanshankeji.team.dokka.github-dokka-convention")
 }
 
+/*
 dokka {
     // https://github.com/Kotlin/dokka/issues/3885#issuecomment-2449645480
     dokkaGeneratorIsolation = ClassLoaderIsolation()
 }
+*/

Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ tasks.wrapper {`
`4`	`4`
`5`	`5`	`plugins {`
`6`	`6`	`id("org.jetbrains.kotlinx.binary-compatibility-validator") version "0.16.3"`
	`7`	`+ id("org.jetbrains.dokka")`
`7`	`8`	`}`
`8`	`9`
`9`	`10`	`apiValidation {`
`@@ -17,10 +18,6 @@ apiValidation {`
`17`	`18`	`}`
`18`	`19`	`}`
`19`	`20`
`20`		`-plugins {`
`21`		`- id("org.jetbrains.dokka")`
`22`		`-}`
`23`		`-`
`24`	`21`	`dependencies {`
`25`	`22`	`subprojects.filter { it.name.startsWith(project.name) }.forEach {`
`26`	`23`	`dokka(it)`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,9 @@ plugins {`
`2`	`2`	`id("com.huanshankeji.team.dokka.github-dokka-convention")`
`3`	`3`	`}`
`4`	`4`
	`5`	`+/*`
`5`	`6`	`dokka {`
`6`	`7`	`// https://github.com/Kotlin/dokka/issues/3885#issuecomment-2449645480`
`7`	`8`	`dokkaGeneratorIsolation = ClassLoaderIsolation()`
`8`	`9`	`}`
	`10`	`+*/`