Merge branch 'master' of https://github.com/pylonmc/rebar

Seggan · Seggan · commit 4dd89bd93d9a · 2026-05-20T16:39:03.000-04:00
diff --git a/dokka-plugin/build.gradle.kts b/dokka-plugin/build.gradle.kts
@@ -3,8 +3,8 @@ plugins {
 }
 
 dependencies {
-    compileOnly("org.jetbrains.dokka:dokka-core:2.0.0")
-    implementation("org.jetbrains.dokka:dokka-base:2.0.0")
+    compileOnly("org.jetbrains.dokka:dokka-core:2.2.0")
+    implementation("org.jetbrains.dokka:dokka-base:2.2.0")
 }
 
 tasks.test {
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -6,7 +6,7 @@ pluginManagement {
         gradlePluginPortal()
     }
 
-    val dokkaVersion = if (useLocalDokka) "2.3.0-rebar-SNAPSHOT" else "2.0.0"
+    val dokkaVersion = if (useLocalDokka) "2.3.0-rebar-SNAPSHOT" else "2.2.0"
     plugins {
         id("org.jetbrains.dokka") version dokkaVersion
         id("org.jetbrains.dokka-javadoc") version dokkaVersion

Original file line number	Diff line number	Diff line change
`@@ -3,8 +3,8 @@ plugins {`
`3`	`3`	`}`
`4`	`4`
`5`	`5`	`dependencies {`
`6`		`- compileOnly("org.jetbrains.dokka:dokka-core:2.0.0")`
`7`		`- implementation("org.jetbrains.dokka:dokka-base:2.0.0")`
	`6`	`+ compileOnly("org.jetbrains.dokka:dokka-core:2.2.0")`
	`7`	`+ implementation("org.jetbrains.dokka:dokka-base:2.2.0")`
`8`	`8`	`}`
`9`	`9`
`10`	`10`	`tasks.test {`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ pluginManagement {`
`6`	`6`	`gradlePluginPortal()`
`7`	`7`	`}`
`8`	`8`
`9`		`- val dokkaVersion = if (useLocalDokka) "2.3.0-rebar-SNAPSHOT" else "2.0.0"`
	`9`	`+ val dokkaVersion = if (useLocalDokka) "2.3.0-rebar-SNAPSHOT" else "2.2.0"`
`10`	`10`	`plugins {`
`11`	`11`	`id("org.jetbrains.dokka") version dokkaVersion`
`12`	`12`	`id("org.jetbrains.dokka-javadoc") version dokkaVersion`