diff --git a/gradle.properties b/gradle.properties index a2e0dcf4..cfa2db26 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ versions.arrow=1.2.4 versions.failgood=0.9.1 versions.filepeek=0.1.3 versions.jackson=2.17.2 -versions.junit=5.10.3 +versions.junit=5.11.0 versions.kotlin=2.0.10 versions.kotlinx-coroutines=1.8.1 versions.minutest=1.13.0 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index e6441136..a4b76b95 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 09523c0e..9355b415 100644 --- 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.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index b740cf13..f5feea6d 100755 --- 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 +# ############################################################################## # @@ -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 index 25da30db..9b42019c 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,92 +1,94 @@ -@rem -@rem Copyright 2015 the original author or authors. -@rem -@rem Licensed under the Apache License, Version 2.0 (the "License"); -@rem you may not use this file except in compliance with the License. -@rem You may obtain a copy of the License at -@rem -@rem https://www.apache.org/licenses/LICENSE-2.0 -@rem -@rem Unless required by applicable law or agreed to in writing, software -@rem distributed under the License is distributed on an "AS IS" BASIS, -@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -@rem See the License for the specific language governing permissions and -@rem limitations under the License. -@rem - -@if "%DEBUG%"=="" @echo off -@rem ########################################################################## -@rem -@rem Gradle startup script for Windows -@rem -@rem ########################################################################## - -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal - -set DIRNAME=%~dp0 -if "%DIRNAME%"=="" set DIRNAME=. -@rem This is normally unused -set APP_BASE_NAME=%~n0 -set APP_HOME=%DIRNAME% - -@rem Resolve any "." and ".." in APP_HOME to make it shorter. -for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi - -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" - -@rem Find java.exe -if defined JAVA_HOME goto findJavaFromJavaHome - -set JAVA_EXE=java.exe -%JAVA_EXE% -version >NUL 2>&1 -if %ERRORLEVEL% equ 0 goto execute - -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 - -:findJavaFromJavaHome -set JAVA_HOME=%JAVA_HOME:"=% -set JAVA_EXE=%JAVA_HOME%/bin/java.exe - -if exist "%JAVA_EXE%" goto execute - -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 - -:execute -@rem Setup the command line - -set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar - - -@rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* - -:end -@rem End local scope for the variables with windows NT shell -if %ERRORLEVEL% equ 0 goto mainEnd - -:fail -rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of -rem the _cmd.exe /c_ return code! -set EXIT_CODE=%ERRORLEVEL% -if %EXIT_CODE% equ 0 set EXIT_CODE=1 -if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% -exit /b %EXIT_CODE% - -:mainEnd -if "%OS%"=="Windows_NT" endlocal - -:omega +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@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 ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +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 + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +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 + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/site/site.gradle.kts b/site/site.gradle.kts index b05736e7..88a4381e 100644 --- a/site/site.gradle.kts +++ b/site/site.gradle.kts @@ -24,6 +24,7 @@ plugins { repositories { mavenCentral() + @Suppress("DEPRECATION") jcenter() } diff --git a/strikt-arrow/strikt-arrow.gradle.kts b/strikt-arrow/strikt-arrow.gradle.kts index 5466a4be..e22c32cf 100644 --- a/strikt-arrow/strikt-arrow.gradle.kts +++ b/strikt-arrow/strikt-arrow.gradle.kts @@ -1,4 +1,5 @@ import org.jetbrains.dokka.gradle.DokkaTaskPartial +import java.net.URI import java.net.URL plugins { @@ -22,8 +23,8 @@ tasks.withType().configureEach { configureEach { "https://arrow-kt.io/docs/apidocs/arrow-core/".also { externalDocumentationLink { - url.set(URL(it)) - packageListUrl.set(URL("${it}package-list")) + url.set(URI(it).toURL()) + packageListUrl.set(URI("${it}package-list").toURL()) } } } diff --git a/strikt-gradle/strikt-gradle.gradle.kts b/strikt-gradle/strikt-gradle.gradle.kts index c511dde5..fa3d3e3d 100644 --- a/strikt-gradle/strikt-gradle.gradle.kts +++ b/strikt-gradle/strikt-gradle.gradle.kts @@ -22,8 +22,8 @@ tasks.dokka { configuration { "https://docs.gradle.org/${GradleVersion.current().version}/javadoc/".also { externalDocumentationLink { - url = URL(it) - packageListUrl = URL(it + "package-list") + url = URI(it).toURL() + packageListUrl = URI(it + "package-list").toURL() } } } diff --git a/strikt-jackson/strikt-jackson.gradle.kts b/strikt-jackson/strikt-jackson.gradle.kts index 7cfb613e..44065ee0 100644 --- a/strikt-jackson/strikt-jackson.gradle.kts +++ b/strikt-jackson/strikt-jackson.gradle.kts @@ -1,5 +1,5 @@ import org.jetbrains.dokka.gradle.DokkaTaskPartial -import java.net.URL +import java.net.URI plugins { kotlin("jvm") @@ -24,8 +24,8 @@ tasks.withType().configureEach { configureEach { "https://fasterxml.github.io/jackson-databind/javadoc/2.12/".also { externalDocumentationLink { - url.set(URL(it)) - packageListUrl.set(URL("${it}package-list")) + url.set(URI(it).toURL()) + packageListUrl.set(URI("${it}package-list").toURL()) } } } diff --git a/strikt-protobuf/strikt-protobuf.gradle.kts b/strikt-protobuf/strikt-protobuf.gradle.kts index 5f681c73..d759e28e 100644 --- a/strikt-protobuf/strikt-protobuf.gradle.kts +++ b/strikt-protobuf/strikt-protobuf.gradle.kts @@ -1,7 +1,7 @@ @file:Suppress("KDocMissingDocumentation") import org.jetbrains.dokka.gradle.DokkaTaskPartial -import java.net.URL +import java.net.URI plugins { kotlin("jvm") @@ -23,8 +23,8 @@ tasks.withType().configureEach { configureEach { "https://developers.google.com/protocol-buffers/docs/reference/java/".also { externalDocumentationLink { - url.set(URL(it)) - packageListUrl.set(URL("${it}package-list")) + url.set(URI(it).toURL()) + packageListUrl.set(URI("${it}package-list").toURL()) } } } diff --git a/strikt-spring/strikt-spring.gradle.kts b/strikt-spring/strikt-spring.gradle.kts index b16a43f5..dca3f240 100644 --- a/strikt-spring/strikt-spring.gradle.kts +++ b/strikt-spring/strikt-spring.gradle.kts @@ -1,5 +1,5 @@ import org.jetbrains.dokka.gradle.DokkaTaskPartial -import java.net.URL +import java.net.URI plugins { kotlin("jvm") @@ -28,8 +28,8 @@ tasks.withType().configureEach { configureEach { "https://docs.spring.io/spring-framework/docs/current/javadoc-api/".also { externalDocumentationLink { - url.set(URL(it)) - packageListUrl.set(URL("${it}package-list")) + url.set(URI(it).toURL()) + packageListUrl.set(URI("${it}package-list").toURL()) } } }