Update Gradle to 8.11.1

Author: Donnerbart

.github/workflows/check.yml

@@ -18,6 +18,6 @@ jobs:
           distribution: temurin
           java-version: |
             8
-            11
+            21
       - name: Check
         run: ./gradlew check javadoc

.github/workflows/publish.yml

@@ -15,7 +15,9 @@ jobs:
         uses: actions/setup-java@c5195efecf7bdfc987ee8bae7a71cb8b11521c00 # v4
         with:
           distribution: temurin
-          java-version: 8
+          java-version: |
+            8
+            21
       - name: Publish to Maven Central
         env:
           ORG_GRADLE_PROJECT_signKey: ${{ secrets.SIGN_KEY }}

build.gradle.kts

@@ -1,18 +1,17 @@
 plugins {
     id("java-library")
-    id("com.github.johnrengelman.shadow")
-    id("biz.aQute.bnd.builder")
     id("maven-publish")
-    id("io.github.gradle-nexus.publish-plugin")
     id("signing")
-    id("com.github.hierynomus.license")
     id("pmd")
-    id("com.github.sgtsilvio.gradle.utf8")
-    id("com.github.sgtsilvio.gradle.metadata")
-    id("com.github.sgtsilvio.gradle.javadoc-links")
+    alias(libs.plugins.bnd)
+    alias(libs.plugins.javadoc.links)
+    alias(libs.plugins.metadata)
+    alias(libs.plugins.nexus.publish)
+    alias(libs.plugins.license)
+    alias(libs.plugins.shadow)
+    alias(libs.plugins.utf8)
 }
 
-
 /* ******************** metadata ******************** */
 
 allprojects {
@@ -21,7 +20,6 @@ allprojects {
             "Java client library with different API flavours and backpressure support"
 
     plugins.apply("com.github.sgtsilvio.gradle.metadata")
-
     metadata {
         moduleName.set("com.hivemq.client.mqtt")
         readableName.set("HiveMQ MQTT Client")
@@ -33,9 +31,8 @@ allprojects {
             apache2()
         }
         developers {
-            developer {
-                id.set("SgtSilvio")
-                name.set("Silvio Giebl")
+            register("SgtSilvio") {
+                fullName.set("Silvio Giebl")
                 email.set("[email protected]")
             }
         }
@@ -46,44 +43,50 @@ allprojects {
             issues()
         }
     }
-}
 
+    repositories {
+        mavenCentral()
+    }
+}
 
 /* ******************** java ******************** */
 
 allprojects {
     plugins.withId("java") {
         java {
-            sourceCompatibility = JavaVersion.VERSION_1_8
-            targetCompatibility = JavaVersion.VERSION_1_8
+            toolchain {
+                languageVersion = JavaLanguageVersion.of(21)
+            }
+            tasks.compileJava {
+                javaCompiler = javaToolchains.compilerFor {
+                    languageVersion = JavaLanguageVersion.of(8)
+                }
+            }
         }
-
         plugins.apply("com.github.sgtsilvio.gradle.utf8")
     }
 }
 
-
 /* ******************** dependencies ******************** */
 
 dependencies {
-    api("io.reactivex.rxjava2:rxjava:${property("rxjava.version")}")
-    api("org.reactivestreams:reactive-streams:${property("reactive-streams.version")}")
+    api(libs.rxjava)
+    api(libs.reactive.streams)
 
-    implementation("io.netty:netty-buffer:${property("netty.version")}")
-    implementation("io.netty:netty-codec:${property("netty.version")}")
-    implementation("io.netty:netty-common:${property("netty.version")}")
-    implementation("io.netty:netty-handler:${property("netty.version")}")
-    implementation("io.netty:netty-transport:${property("netty.version")}")
-    implementation("org.jctools:jctools-core:${property("jctools.version")}")
-    implementation("org.jetbrains:annotations:${property("annotations.version")}")
-    implementation("com.google.dagger:dagger:${property("dagger.version")}")
+    implementation(libs.netty.buffer)
+    implementation(libs.netty.codec)
+    implementation(libs.netty.common)
+    implementation(libs.netty.handler)
+    implementation(libs.netty.transport)
+    implementation(libs.jctools)
+    implementation(libs.jetbrains.annotations)
+    implementation(libs.dagger)
 
-    compileOnly("org.slf4j:slf4j-api:${property("slf4j.version")}")
+    compileOnly(libs.slf4j.api)
 
-    annotationProcessor("com.google.dagger:dagger-compiler:${property("dagger.version")}")
+    annotationProcessor(libs.dagger.compiler)
 }
 
-
 /* ******************** optional dependencies ******************** */
 
 for (feature in listOf("websocket", "proxy", "epoll")) {
@@ -93,20 +96,19 @@ for (feature in listOf("websocket", "proxy", "epoll")) {
 }
 
 dependencies {
-    "websocketImplementation"("io.netty:netty-codec-http:${property("netty.version")}")
-    "proxyImplementation"("io.netty:netty-handler-proxy:${property("netty.version")}")
-    "epollImplementation"("io.netty:netty-transport-native-epoll:${property("netty.version")}:linux-x86_64")
+    "websocketImplementation"(libs.netty.codec.http)
+    "proxyImplementation"(libs.netty.handler.proxy)
+    "epollImplementation"(variantOf(libs.netty.transport.native.epoll) { classifier("linux-x86_64") })
 }
 
-
 /* ******************** test ******************** */
 
 allprojects {
     plugins.withId("java") {
         dependencies {
-            testImplementation("org.junit.jupiter:junit-jupiter-api:${property("junit-jupiter.version")}")
-            testImplementation("org.junit.jupiter:junit-jupiter-params:${property("junit-jupiter.version")}")
-            testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${property("junit-jupiter.version")}")
+            testImplementation(libs.junit.jupiter.api)
+            testImplementation(libs.junit.jupiter.params)
+            testRuntimeOnly(libs.junit.jupiter.engine)
         }
 
         tasks.test {
@@ -119,13 +121,13 @@ allprojects {
 }
 
 dependencies {
-    testImplementation("nl.jqno.equalsverifier:equalsverifier:${property("equalsverifier.version")}")
-    testImplementation("org.mockito:mockito-core:${property("mockito.version")}")
-    testImplementation("com.google.guava:guava:${property("guava.version")}")
-    testImplementation("org.bouncycastle:bcprov-jdk15on:${property("bouncycastle.version")}")
-    testImplementation("org.bouncycastle:bcpkix-jdk15on:${property("bouncycastle.version")}")
-    testImplementation("org.eclipse.paho:org.eclipse.paho.client.mqttv3:${property("paho.version")}")
-    testRuntimeOnly("org.slf4j:slf4j-simple:${property("slf4j.version")}")
+    testImplementation(libs.equalsverifier)
+    testImplementation(libs.mockito)
+    testImplementation(libs.guava)
+    testImplementation(libs.bouncycastle.pkix)
+    testImplementation(libs.bouncycastle.prov)
+    testImplementation(libs.paho.client)
+    testRuntimeOnly(libs.slf4j.simple)
 }
 
 /* ******************** integration Tests ******************** */
@@ -143,15 +145,9 @@ val integrationTestRuntimeOnly: Configuration by configurations.getting {
 }
 
 dependencies {
-    integrationTestImplementation("com.hivemq:hivemq-testcontainer-junit5:${property("hivemq-testcontainer.version")}")
-    integrationTestImplementation("com.hivemq:hivemq-extension-sdk:${property("hivemq-extension-sdk.version")}")
-    integrationTestImplementation("org.awaitility:awaitility:${property("awaitility.version")}")
-}
-
-tasks.named<JavaCompile>("compileIntegrationTestJava") {
-    javaCompiler.set(javaToolchains.compilerFor {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    })
+    integrationTestImplementation(libs.hivemq.testcontainer.junit5)
+    integrationTestImplementation(libs.hivemq.extension.sdk)
+    integrationTestImplementation(libs.awaitility)
 }
 
 val integrationTest by tasks.registering(Test::class) {
@@ -161,9 +157,6 @@ val integrationTest by tasks.registering(Test::class) {
     testClassesDirs = sourceSets["integrationTest"].output.classesDirs
     classpath = sourceSets["integrationTest"].runtimeClasspath
     shouldRunAfter(tasks.test)
-    javaLauncher.set(javaToolchains.launcherFor {
-        languageVersion.set(JavaLanguageVersion.of(11))
-    })
 }
 
 tasks.check { dependsOn(integrationTest) }
@@ -172,30 +165,25 @@ tasks.check { dependsOn(integrationTest) }
 
 allprojects {
     plugins.withId("java-library") {
-
         plugins.apply("biz.aQute.bnd.builder")
-
         tasks.jar {
-            withConvention(aQute.bnd.gradle.BundleTaskConvention::class) {
+            bundle {
                 bnd("-consumer-policy: \${range;[==,=+)}", "-removeheaders: Private-Package")
             }
         }
-
         java {
             withJavadocJar()
             withSourcesJar()
         }
-
         plugins.apply("com.github.sgtsilvio.gradle.javadoc-links")
-
         tasks.javadoc {
             exclude("**/internal/**")
         }
     }
 }
 
 tasks.jar {
-    withConvention(aQute.bnd.gradle.BundleTaskConvention::class) {
+    bundle {
         bnd("Export-Package: " +
                 "com.hivemq.client.annotations.*," +
                 "com.hivemq.client.mqtt.*," +
@@ -225,8 +213,6 @@ tasks.shadowJar {
     relocate("dagger", "${shadePrefix}dagger")
     exclude("META-INF/com.google.dagger_dagger.version")
     relocate("javax.inject", "${shadePrefix}javax.inject")
-
-    minimize()
 }
 
 val javaComponent = components["java"] as AdhocComponentWithVariants
@@ -238,19 +224,14 @@ javaComponent.withVariantsFromConfiguration(configurations.shadowRuntimeElements
 
 allprojects {
     plugins.withId("java-library") {
-
         plugins.apply("maven-publish")
-
         publishing.publications.register<MavenPublication>("base") {
             from(components["java"])
             suppressAllPomMetadataWarnings()
         }
     }
-
     plugins.withId("java-platform") {
-
         plugins.apply("maven-publish")
-
         publishing.publications.register<MavenPublication>("base") {
             from(components["javaPlatform"])
             suppressAllPomMetadataWarnings()
@@ -296,9 +277,7 @@ allprojects {
 
 allprojects {
     plugins.withId("maven-publish") {
-
         plugins.apply("signing")
-
         signing {
             val signKey: String? by project
             val signKeyPass: String? by project
@@ -320,7 +299,6 @@ nexusPublishing {
 
 allprojects {
     plugins.apply("com.github.hierynomus.license")
-
     license {
         header = rootDir.resolve("HEADER")
         mapping("java", "SLASHSTAR_STYLE")
@@ -329,19 +307,16 @@ allprojects {
 
 allprojects {
     plugins.withId("java") {
-
         plugins.apply("pmd")
-
         pmd {
-            toolVersion = "5.8.1"
+            toolVersion = libs.versions.pmd.get()
             incrementalAnalysis.set(false)
         }
     }
 }
 
 apply("$rootDir/gradle/japicc.gradle.kts")
 
-
 /* ******************** build cache ******************** */
 
 allprojects {

epoll/build.gradle.kts

@@ -2,7 +2,6 @@ plugins {
     id("java-platform")
 }
 
-
 /* ******************** metadata ******************** */
 
 description = "Adds dependencies for the HiveMQ MQTT Client epoll module"
@@ -12,7 +11,6 @@ metadata {
     readableName.set("HiveMQ MQTT Client epoll module")
 }
 
-
 /* ******************** dependencies ******************** */
 
 javaPlatform {

examples/build.gradle.kts

@@ -2,7 +2,6 @@ plugins {
     id("java")
 }
 
-
 /* ******************** metadata ******************** */
 
 description = "Examples using the HiveMQ MQTT Client"
@@ -12,7 +11,6 @@ metadata {
     readableName.set("HiveMQ MQTT Client examples")
 }
 
-
 /* ******************** dependencies ******************** */
 
 dependencies {

gradle.properties

@@ -1,43 +1,3 @@
 version=1.3.7
 prevVersion=1.3.6
-#
-# main dependencies
-#
-rxjava.version=2.2.21
-reactive-streams.version=1.0.4
-netty.version=4.1.122.Final
-jctools.version=2.1.2
-annotations.version=26.0.2
-dagger.version=2.27
-slf4j.version=1.7.36
-reactor.version=3.7.6
-reactor-adapter.version=3.3.3.RELEASE
-#
-# test dependencies
-#
-junit-jupiter.version=5.5.2
-equalsverifier.version=3.19.4
-mockito.version=2.28.2
-guava.version=24.1.1-jre
-bouncycastle.version=1.70
-paho.version=1.2.5
-#
-# integration test dependencies
-#
-hivemq-testcontainer.version=2.0.0
-hivemq-extension-sdk.version=4.7.2
-awaitility.version=4.3.0
-#
-# plugins
-#
-plugin.shadow.version=6.1.0
-plugin.bnd.version=5.3.0
-plugin.nexus-publish.version=1.3.0
-plugin.license.version=0.15.0
-plugin.utf8.version=0.1.0
-plugin.metadata.version=0.2.0
-plugin.javadoc-links.version=0.3.0
-#
-# options
-#
 org.gradle.caching=true