diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index ccebba7..7f93135 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 03bc515..b82aa23 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 79a61d4..0adc8e1 100755
--- a/gradlew
+++ b/gradlew
@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,10 +131,13 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
@@ -197,6 +198,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
 # Collect all arguments for the java command;
 #   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
diff --git a/plugin/build.gradle b/plugin/build.gradle
index d1a3ea4..e424395 100644
--- a/plugin/build.gradle
+++ b/plugin/build.gradle
@@ -1,5 +1,3 @@
-import com.vanniktech.maven.publish.GradlePlugin
-import com.vanniktech.maven.publish.JavadocJar
 import com.vanniktech.maven.publish.SonatypeHost
 
 plugins {
@@ -39,12 +37,6 @@ jacocoTestReport {
 }
 
 mavenPublishing {
-    // Override default configuration: by default `com.vanniktech.maven.publish` uses
-    // `new GradlePublishPlugin()` because it detects that we use `com.gradle.plugin-publish`.
-    // However since we also publish to Maven Central the default publication created by
-    // `com.gradle.plugin-publish` is not suitable (Maven Central publication requires sources
-    // and Javadoc).
-    configure(new GradlePlugin(new JavadocJar.Dokka("dokkaHtml")))
     publishToMavenCentral(SonatypeHost.S01)
     signAllPublications()
 }
@@ -63,6 +55,19 @@ gradlePlugin {
     }
 }
 
+// Since version 1.0.0 com.gradle.plugin-publish creates it's own javadocs, these do not
+// seem to support Kotlin and end-up empty. The plugin does not provide an easy way to
+// use Dokka or modify it.
+// The code below disables the default javadoc task, and modifies the javadocJar task to use dokka
+// instead.
+tasks.named('javadoc') {
+    enabled = false
+}
+tasks.register('javadocJar', Jar) {
+    archiveClassifier.set('javadoc')
+    dependsOn tasks.dokkaHtml
+    from tasks.dokkaHtml
+}
 test {
     testLogging {
         events "passed", "skipped", "failed"