gradle 8.10, fix javadoc jar after upgrading publishing plugin

barnhill · Aug 17, 2024 · 2c413bc · 2c413bc
1 parent 8461373
commit 2c413bc
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,5 +1,7 @@
+import org.jetbrains.dokka.plugability.configuration
+
 buildscript {
-    extra["gradle"] = "8.8"
+    extra["gradle"] = "8.10"
     extra["javaVersion"] = JavaVersion.VERSION_11
 }
 
@@ -43,6 +45,7 @@ tasks {
     }
 
     val javadocJar by creating(Jar::class) {
+        dependsOn.add(javadoc)
         dependsOn.add(dokkaHtml)
         archiveClassifier.set("javadoc")
         from(dokkaOutputDir)
@@ -69,7 +72,7 @@ tasks {
 
     afterEvaluate {
         tasks.named("generateMetadataFileForMavenPublication") {
-            dependsOn.add(tasks.named("dokkaJavadocJar"))
+            dependsOn.add(tasks.named("dokkaJavadoc"))
             dependsOn.add(tasks.named("sourcesJar"))
         }
     }

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-vanniktech-maven-publish = "0.28.0"
+vanniktech-maven-publish = "0.29.0"
 junit = "4.13.2"
 tomlChecker = "0.51.0"
 gradleCacheFix = "3.0.1"

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -9,7 +9,7 @@ pluginManagement {
 }
 
 plugins {
-    id("com.gradle.develocity") version "3.17.5"
+    id("com.gradle.develocity") version "3.17.6"
 }
 
 dependencyResolutionManagement {