build: Update to Gradle Wrapper 8.10.2 / Develocity Plugin 3.18.1 / P…

…lugin Dependencies / Dependencies (#100436) * build: Update to Gradle Wrapper 8.10.2 * build: Migrate to Develocity Plugin 3.18.1 * build: Update plugin dependencies * build: Update dependencies - com.intershop.version:semantic-version - com.intershop.gradle.test:test-gradle-plugin * test: Migrate deprecated code of integration tests
IntershopCommunicationsAG · Oct 9, 2024 · 7a3bb84 · 7a3bb84
1 parent a36df2b
commit 7a3bb84
Show file tree

Hide file tree

Showing 14 changed files with 141 additions and 103 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -23,7 +23,7 @@ plugins {
     `java-gradle-plugin`
     groovy
 
-    kotlin("jvm") version "1.9.21"
+    kotlin("jvm") version "1.9.25"
 
     // test coverage
     jacoco
@@ -40,13 +40,13 @@ plugins {
     `jvm-test-suite`
 
     // plugin for documentation
-    id("org.asciidoctor.jvm.convert") version "3.3.2"
+    id("org.asciidoctor.jvm.convert") version "4.0.3"
 
     // documentation
-    id("org.jetbrains.dokka") version "1.9.10"
+    id("org.jetbrains.dokka") version "1.9.20"
 
     // plugin for publishing to Gradle Portal
-    id("com.gradle.plugin-publish") version "1.2.1"
+    id("com.gradle.plugin-publish") version "1.3.0"
 }
 
 group = "com.intershop.gradle.icm"
@@ -160,14 +160,14 @@ testing {
     suites.withType<JvmTestSuite> {
         useSpock()
         dependencies {
-            implementation("com.intershop.gradle.test:test-gradle-plugin:5.0.1")
+            implementation("com.intershop.gradle.test:test-gradle-plugin:5.1.0")
             implementation(gradleTestKit())
         }
 
         targets {
             all {
                 testTask.configure {
-                    systemProperty("intershop.gradle.versions", "8.5")
+                    systemProperty("intershop.gradle.versions", "8.5,8.10.2")
                     testLogging {
                         showStandardStreams = true
                     }
@@ -214,18 +214,21 @@ tasks {
             setBackends(listOf("html5", "docbook"))
         }
 
-        options = mapOf( "doctype" to "article",
-            "ruby"    to "erubis")
-        attributes = mapOf(
-            "latestRevision"        to  project.version,
+        setOptions(mapOf(
+            "doctype"               to "article",
+            "ruby"                  to "erubis"
+        ))
+        setAttributes(mapOf(
+            "latestRevision"        to project.version,
             "toc"                   to "left",
             "toclevels"             to "2",
             "source-highlighter"    to "coderay",
             "icons"                 to "font",
             "setanchors"            to "true",
             "idprefix"              to "asciidoc",
             "idseparator"           to "-",
-            "docinfo1"              to "true")
+            "docinfo1"              to "true"
+        ))
     }
 
     withType<JacocoReport> {
@@ -332,5 +335,5 @@ dependencies {
     implementation(gradleApi())
     implementation(gradleKotlinDsl())
 
-    implementation("com.intershop.version:semantic-version:2.0.0")
+    implementation("com.intershop.version:semantic-version:2.0.1")
 }
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
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.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/gradlew b/gradlew
@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # 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
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

diff --git a/gradlew.bat b/gradlew.bat
@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
@@ -43,11 +45,11 @@ set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
 if %ERRORLEVEL% equ 0 goto execute
 
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -57,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -1,11 +1,11 @@
 plugins {
-    id("com.gradle.enterprise") version "3.16.1"
+    id("com.gradle.develocity") version "3.18.1"
 }
 
-gradleEnterprise {
+develocity {
     buildScan {
-        termsOfServiceUrl = "https://gradle.com/terms-of-service"
-        termsOfServiceAgree = "yes"
+        termsOfUseUrl = "https://gradle.com/help/legal-terms-of-use"
+        termsOfUseAgree = "yes"
     }
 }
 

diff --git a/src/main/kotlin/com/intershop/gradle/icm/cartridge/CartridgePlugin.kt b/src/main/kotlin/com/intershop/gradle/icm/cartridge/CartridgePlugin.kt
@@ -20,7 +20,6 @@ import com.intershop.gradle.icm.extension.IntershopExtension
 import com.intershop.gradle.icm.tasks.WriteCartridgeDescriptor
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import org.gradle.api.plugins.BasePlugin
 import org.gradle.api.plugins.JavaPlugin
 import org.gradle.api.plugins.JavaPlugin.PROCESS_RESOURCES_TASK_NAME
 import org.gradle.api.tasks.TaskContainer

diff --git a/src/main/kotlin/com/intershop/gradle/icm/tasks/ProvideLibFilter.kt b/src/main/kotlin/com/intershop/gradle/icm/tasks/ProvideLibFilter.kt
@@ -19,10 +19,10 @@ package com.intershop.gradle.icm.tasks
 import com.intershop.gradle.icm.extension.IntershopExtension
 import org.gradle.api.DefaultTask
 import org.gradle.api.artifacts.ExternalModuleDependency
+import org.gradle.api.artifacts.ResolveException
 import org.gradle.api.file.ProjectLayout
 import org.gradle.api.file.RegularFile
 import org.gradle.api.file.RegularFileProperty
-import org.gradle.api.internal.artifacts.ivyservice.DefaultLenientConfiguration
 import org.gradle.api.model.ObjectFactory
 import org.gradle.api.provider.Property
 import org.gradle.api.provider.Provider
@@ -129,7 +129,7 @@ open class ProvideLibFilter @Inject constructor(
         try {
             val files = dcfg.resolve()
             return files.first()
-        } catch (anfe: DefaultLenientConfiguration.ArtifactResolveException) {
+        } catch (re: ResolveException) {
             project.logger.warn("No library filter is available!")
         }
         return null

diff --git a/src/main/kotlin/com/intershop/gradle/icm/tasks/WriteCartridgeDescriptor.kt b/src/main/kotlin/com/intershop/gradle/icm/tasks/WriteCartridgeDescriptor.kt
@@ -21,7 +21,6 @@ import com.intershop.gradle.icm.ICMBasePlugin.Companion.CONFIGURATION_CARTRIDGE_
 import com.intershop.gradle.icm.extension.IntershopExtension.Companion.INTERSHOP_GROUP_NAME
 import com.intershop.gradle.icm.utils.CartridgeUtil
 import org.gradle.api.DefaultTask
-import org.gradle.api.GradleException
 import org.gradle.api.artifacts.ResolvedArtifact
 import org.gradle.api.artifacts.ResolvedDependency
 import org.gradle.api.artifacts.component.ModuleComponentIdentifier

diff --git a/src/main/kotlin/com/intershop/gradle/icm/utils/PackageUtil.kt b/src/main/kotlin/com/intershop/gradle/icm/utils/PackageUtil.kt
@@ -20,9 +20,9 @@ package com.intershop.gradle.icm.utils
 import com.intershop.gradle.icm.extension.FilePackage
 import org.gradle.api.Project
 import org.gradle.api.artifacts.ExternalModuleDependency
+import org.gradle.api.artifacts.ResolveException
 import org.gradle.api.file.CopySpec
 import org.gradle.api.file.DuplicatesStrategy
-import org.gradle.api.internal.artifacts.ivyservice.DefaultLenientConfiguration
 import java.io.File
 
 /**
@@ -52,7 +52,7 @@ object PackageUtil {
         try {
             val files = configuration.resolve()
             return files.first()
-        } catch (anfe: DefaultLenientConfiguration.ArtifactResolveException) {
+        } catch (re: ResolveException) {
             project.logger.warn("No package '{}' is available for {}!", classifier, dependency)
         }
 

diff --git a/src/test/groovy/com/intershop/gradle/icm/ICMBasePluginIntegrationKotlinSpec.groovy b/src/test/groovy/com/intershop/gradle/icm/ICMBasePluginIntegrationKotlinSpec.groovy
@@ -55,7 +55,7 @@ class ICMBasePluginIntegrationKotlinSpec extends AbstractIntegrationKotlinSpec {
                 repositories {
                     maven {
                         // change to point to your repo, e.g. http://my.org/repo
-                        url = uri("\$buildDir/pubrepo")
+                        url = uri(project.rootProject.layout.buildDirectory.dir("pubrepo").get())
                     }
                 }
             }
@@ -75,17 +75,18 @@ class ICMBasePluginIntegrationKotlinSpec extends AbstractIntegrationKotlinSpec {
             implementation("io.prometheus:simpleclient:0.6.0")
             implementation("io.prometheus:simpleclient_hotspot:0.6.0")
             implementation("io.prometheus:simpleclient_servlet:0.6.0")
-        } 
+        }
         
         repositories {
-            jcenter()
+            mavenCentral()
+            gradlePluginPortal()
         }
         
         publishing {
             repositories {
                 maven {
                     // change to point to your repo, e.g. http://my.org/repo
-                    url = uri("\${project.rootProject.buildDir}/pubrepo")
+                    url = uri(project.rootProject.layout.buildDirectory.dir("pubrepo").get())
                 }
             }
         }
@@ -103,11 +104,12 @@ class ICMBasePluginIntegrationKotlinSpec extends AbstractIntegrationKotlinSpec {
             implementation("ch.qos.logback:logback-core:1.2.3")
             implementation("ch.qos.logback:logback-classic:1.2.3")
             implementation("commons-collections:commons-collections:3.2.2")
-        } 
+        }
         
         repositories {
-            jcenter()
-        } 
+            mavenCentral()
+            gradlePluginPortal()
+        }
         """.stripIndent())
 
         def prj3dir = createSubProject('prjCartridge_dev', """
@@ -117,17 +119,18 @@ class ICMBasePluginIntegrationKotlinSpec extends AbstractIntegrationKotlinSpec {
         }
         
         repositories {
-            jcenter()
-        }    
+            mavenCentral()
+            gradlePluginPortal()
+        }
         
         publishing {
             repositories {
                 maven {
                     // change to point to your repo, e.g. http://my.org/repo
-                    url = uri("\${project.rootProject.buildDir}/pubrepo")
+                    url = uri(project.rootProject.layout.buildDirectory.dir("pubrepo").get())
                 }
             }
-        }    
+        }
         """.stripIndent())
 
         def prj4dir = createSubProject('prjCartridge_adapter', """
@@ -139,20 +142,21 @@ class ICMBasePluginIntegrationKotlinSpec extends AbstractIntegrationKotlinSpec {
         dependencies {
             implementation("ch.qos.logback:logback-core:1.2.3")
             implementation("ch.qos.logback:logback-classic:1.2.3")
-        } 
+        }
         
         repositories {
-            jcenter()
-        }     
+            mavenCentral()
+            gradlePluginPortal()
+        }
         
         publishing {
             repositories {
                 maven {
                     // change to point to your repo, e.g. http://my.org/repo
-                    url = uri("\${project.rootProject.buildDir}/pubrepo")
+                    url = uri(project.rootProject.layout.buildDirectory.dir("pubrepo").get())
                 }
             }
-        }   
+        }
         """.stripIndent())
 
         writeJavaTestClass("com.intershop.prod", prj1dir)

diff --git a/src/test/groovy/com/intershop/gradle/icm/ICMBasePluginIntegrationSpec.groovy b/src/test/groovy/com/intershop/gradle/icm/ICMBasePluginIntegrationSpec.groovy
@@ -711,7 +711,7 @@ class ICMBasePluginIntegrationSpec extends AbstractIntegrationGroovySpec {
                 id 'com.intershop.icm.cartridge.adapter'
             }
 
-            def publishDir = "\$buildDir/repo"  
+            def publishDir = uri(project.rootProject.layout.buildDirectory.dir("pubrepo").get())
 
             group = "com.intershop"
             version = "1.0.0"
@@ -811,7 +811,7 @@ class ICMBasePluginIntegrationSpec extends AbstractIntegrationGroovySpec {
                 repositories {
                     maven {
                         // change to point to your repo, e.g. http://my.org/repo
-                        url = "\$buildDir/pubrepo"
+                        url = uri(project.rootProject.layout.buildDirectory.dir("pubrepo").get())
                     }
                 }
             }
@@ -843,7 +843,7 @@ class ICMBasePluginIntegrationSpec extends AbstractIntegrationGroovySpec {
             repositories {
                 maven {
                     // change to point to your repo, e.g. http://my.org/repo
-                    url = "\${project.rootProject.buildDir}/pubrepo"
+                    url = uri(project.rootProject.layout.buildDirectory.dir("pubrepo").get())
                 }
             }
         }
@@ -886,7 +886,7 @@ class ICMBasePluginIntegrationSpec extends AbstractIntegrationGroovySpec {
             repositories {
                 maven {
                     // change to point to your repo, e.g. http://my.org/repo
-                    url = "\${project.rootProject.buildDir}/pubrepo"
+                    url = uri(project.rootProject.layout.buildDirectory.dir("pubrepo").get())
                 }
             }
         }    
@@ -913,7 +913,7 @@ class ICMBasePluginIntegrationSpec extends AbstractIntegrationGroovySpec {
             repositories {
                 maven {
                     // change to point to your repo, e.g. http://my.org/repo
-                    url = "\${project.rootProject.buildDir}/pubrepo"
+                    url = uri(project.rootProject.layout.buildDirectory.dir("pubrepo").get())
                 }
             }
         }