Merge pull request #19 from wiremock/upgrade-dependencies

Upgrade dependencies

build.gradle.kts

@@ -1,15 +1,18 @@
+@file:Suppress("UnstableApiUsage")
+
 plugins {
     `kotlin-dsl`
     `groovy-gradle-plugin`
-    id("org.jetbrains.kotlin.jvm") version "1.8.20"
-    `idea`
+    id("org.jetbrains.kotlin.jvm") version "2.0.20"
+    idea
 
     `java-library`
     `maven-publish`
-    id("com.gradle.plugin-publish") version "1.2.1"
-    id("com.palantir.git-version") version "3.0.0" apply false
+    id("com.gradle.plugin-publish") version "1.3.0"
+    id("com.palantir.git-version") version "3.1.0" apply false
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
-    id("io.github.gradle-nexus.publish-plugin") version "1.3.0" apply false
+    id("io.github.gradle-nexus.publish-plugin") version "2.0.0" apply false
+    id("com.github.ben-manes.versions") version "0.51.0"
 }
 
 group = "org.wiremock.tools.gradle"
@@ -45,14 +48,14 @@ gradlePlugin {
 dependencies {
 
     implementation(kotlin("stdlib-jdk8"))
-    implementation("com.palantir.gradle.gitversion:gradle-git-version:3.0.0")
+    implementation("com.palantir.gradle.gitversion:gradle-git-version:3.1.0")
     implementation("com.github.johnrengelman:shadow:8.1.1")
-    implementation("io.github.gradle-nexus:publish-plugin:1.3.0")
+    implementation("io.github.gradle-nexus:publish-plugin:2.0.0")
 
     runtimeOnly(kotlin("gradle-plugin"))
 
     testImplementation(gradleTestKit())
-    testImplementation("junit:junit:4.12")
+    testImplementation("junit:junit:4.13.2")
 }
 
 tasks {

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

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

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
 

src/test/kotlin/org/wiremock/tools/gradle/conventions/WireMockExtensionConventionTest.kt

@@ -11,9 +11,10 @@ import org.junit.rules.TemporaryFolder
 import java.io.File
 
 import org.hamcrest.CoreMatchers.containsString
-import org.junit.Assert.assertThat
+import org.hamcrest.MatcherAssert.assertThat
 import org.junit.Test
 
+@Suppress("unused")
 class WireMockExtensionConventionTest {
     @Rule
     @JvmField
@@ -22,7 +23,7 @@ class WireMockExtensionConventionTest {
     private val projectDir: File
         get() = tmpDir.root
 
-    private val BASE_SCRIPT : String
+    private val baseScript : String
         get() =
             """
             buildscript {
@@ -50,7 +51,7 @@ class WireMockExtensionConventionTest {
             githubRepo = wiremock-my-test-extension 
             """.trimIndent()
         )
-        withBuildScript(BASE_SCRIPT)
+        withBuildScript(baseScript)
         withFile("src/main/java/Test.java",
             """
             public class Test
@@ -73,7 +74,7 @@ class WireMockExtensionConventionTest {
 
     @Test
     fun shading() {
-        withBuildScript(BASE_SCRIPT +
+        withBuildScript(baseScript +
                 """
                 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
                 
@@ -96,6 +97,7 @@ class WireMockExtensionConventionTest {
     }
 
 
+    @Suppress("SameParameterValue")
     private
     fun build(vararg arguments: String) =
             gradleRunnerFor(*arguments).build()