Upgrade the build environment and dependencies

Author: bmuschko

build.gradle.kts

@@ -61,34 +61,38 @@ gradlePlugin {
             displayName = "Gradle Docker Remote API Plugin"
             description = "Plugin that provides tasks for interacting with Docker via its remote API."
             implementationClass = "com.bmuschko.gradle.docker.DockerRemoteApiPlugin"
+            tags.set(listOf("docker", "container", "image", "lightweight", "vm", "linux"))
         }
         create("docker-java-application") {
             id = "com.bmuschko.docker-java-application"
             displayName = "Gradle Docker Java Application Plugin"
             description = "Plugin that provides conventions for building and publishing Docker images for Java applications."
             implementationClass = "com.bmuschko.gradle.docker.DockerJavaApplicationPlugin"
+            tags.set(listOf("docker", "container", "image", "lightweight", "vm", "linux"))
         }
         create("docker-spring-boot-application") {
             id = "com.bmuschko.docker-spring-boot-application"
             displayName = "Gradle Docker Spring Boot Application Plugin"
             description = "Plugin that provides conventions for building and publishing Docker images for Spring Boot applications."
             implementationClass = "com.bmuschko.gradle.docker.DockerSpringBootApplicationPlugin"
+            tags.set(listOf("docker", "container", "image", "lightweight", "vm", "linux"))
         }
     }
 }
 
-pluginBundle {
-    website = "https://github.com/bmuschko/gradle-docker-plugin"
-    vcsUrl = "https://github.com/bmuschko/gradle-docker-plugin"
-    tags = listOf("docker", "container", "image", "lightweight", "vm", "linux")
+gradlePlugin {
+    website.set("https://github.com/bmuschko/gradle-docker-plugin")
+    vcsUrl.set("https://github.com/bmuschko/gradle-docker-plugin")
 }
 
-buildScan {
-    termsOfServiceUrl = "https://gradle.com/terms-of-service"
-    termsOfServiceAgree = "yes"
+develocity {
+    buildScan {
+        termsOfUseUrl.set("https://gradle.com/help/legal-terms-of-use")
+        termsOfUseAgree.set("yes")
 
-    if (!System.getenv("CI").isNullOrEmpty()) {
-        publishAlways()
-        tag("CI")
+        if (!System.getenv("CI").isNullOrEmpty()) {
+            publishing.onlyIf { true }
+            tag("CI")
+        }
     }
 }

buildSrc/build.gradle.kts

@@ -6,6 +6,21 @@ plugins {
 repositories {
     mavenCentral()
     gradlePluginPortal()
+    maven {
+        name = "ajoberstar-backup"
+        url = uri("https://ajoberstar.org/bintray-backup/")
+    }
+}
+
+java {
+    sourceCompatibility = JavaVersion.VERSION_11
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile>().configureEach {
+    kotlinOptions {
+        jvmTarget = "11"
+    }
 }
 
 val versionCatalog = extensions.getByType<VersionCatalogsExtension>().named("buildsrcLibs")

gradle/buildsrc.libs.versions.toml

@@ -4,12 +4,12 @@ asciidoctorj-tabbed-code-extension = "0.3"
 grgit = "1.9.1"
 gradle-git = "1.7.1"
 gradle-git-publish = "0.3.3"
-shadow = "7.1.2"
+shadow = "8.3.8"
 
 [libraries]
 asciidoctor-jvm-plugin = { module = "org.asciidoctor:asciidoctor-gradle-jvm", version.ref = "asciidoctor-jvm-plugin" }
 asciidoctorj-tabbed-code-extension = { module = "com.bmuschko:asciidoctorj-tabbed-code-extension", version.ref = "asciidoctorj-tabbed-code-extension" }
 grgit = { module = "org.ajoberstar:grgit", version.ref = "grgit" }
 gradle-git = { module = "org.ajoberstar:gradle-git", version.ref = "gradle-git" }
 gradle-git-publish = { module = "org.ajoberstar:gradle-git-publish", version.ref = "gradle-git-publish" }
-shadow = { module = "gradle.plugin.com.github.johnrengelman:shadow", version.ref = "shadow" }
+shadow = { module = "com.gradleup.shadow:com.gradleup.shadow.gradle.plugin", version.ref = "shadow" }

gradle/libs.versions.toml

@@ -1,8 +1,8 @@
 [versions]
-plugin-publish = "1.1.0"
-docker-java = "3.3.3"
+plugin-publish = "1.3.1"
+docker-java = "3.5.3"
 activation = "1.1.1"
-asm = "9.6"
+asm = "9.8"
 spock = "2.0-groovy-3.0"
 zt-zip = "1.13"
 commons-vfs2 = "2.9.0"

gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 plugins {
-    id("com.gradle.enterprise") version("3.10.2")
+    id("com.gradle.develocity") version("4.1")
 }
 
 rootProject.name = "gradle-docker-plugin"

gradlew

@@ -7,7 +7,7 @@ Docker remote API is handled by the https://github.com/docker-java/docker-java[D
 Please refer to the library's documentation for more information on the supported Docker's client API and Docker server version.
 
 [IMPORTANT]
-This plugin requires Gradle >= 7.4.0 to work properly.
+This plugin requires Gradle >= 8.3.0 to work properly.
 
 === Benefits