diff --git a/build.gradle b/build.gradle index 56aac88f403..33b2fc1f65a 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ plugins { id("eclipse") //support for Eclipse // Code formatting - id "com.diffplug.spotless" version "8.4.0" + id "com.diffplug.spotless" version "8.6.0" // EISOP Checker Framework id "org.checkerframework" version "0.6.61" @@ -63,8 +63,8 @@ subprojects { } dependencies { - implementation("org.slf4j:slf4j-api:2.0.17") - testImplementation("ch.qos.logback:logback-classic:1.5.32") + implementation("org.slf4j:slf4j-api:2.0.18") + testImplementation("ch.qos.logback:logback-classic:1.5.34") compileOnly("org.jspecify:jspecify:1.0.0") @@ -76,11 +76,11 @@ subprojects { checkerFramework "io.github.eisop:checker-qual:$eisop_version" checkerFramework "io.github.eisop:checker:$eisop_version" - testImplementation("ch.qos.logback:logback-classic:1.5.32") + testImplementation("ch.qos.logback:logback-classic:1.5.34") testImplementation("org.assertj:assertj-core:3.27.7") - testImplementation("ch.qos.logback:logback-classic:1.5.32") + testImplementation("ch.qos.logback:logback-classic:1.5.34") - testImplementation(platform("org.junit:junit-bom:6.0.3")) + testImplementation(platform("org.junit:junit-bom:6.1.0")) testImplementation ("org.junit.jupiter:junit-jupiter-api") testImplementation ("org.junit.jupiter:junit-jupiter-params") testRuntimeOnly ("org.junit.jupiter:junit-jupiter-engine") @@ -90,8 +90,8 @@ subprojects { testImplementation (testFixtures(project(":key.util"))) // test fixtures - testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.3") - testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3") + testImplementation("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.4") + testImplementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.0") testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine' } @@ -438,9 +438,9 @@ tasks.register('alldoc', Javadoc){ bottom = "Copyright © 2003-2026 The KeY-Project." use = true links += "https://docs.oracle.com/en/java/javase/21/docs/api/" - links += "https://www.javadoc.io/doc/org.slf4j/slf4j-api/2.0.17/" + links += "https://www.javadoc.io/doc/org.slf4j/slf4j-api/2.0.18/" links += "https://www.javadoc.io/doc/org.antlr/antlr4-runtime/4.13.2/" - links +="https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.5.32/" + links +="https://www.javadoc.io/doc/ch.qos.logback/logback-classic/1.5.34/" links +="https://www.javadoc.io/doc/com.formdev/flatlaf/3.7/" links +="https://www.javadoc.io/doc/com.miglayout/miglayout-swing/11.4.3/" links +="https://www.javadoc.io/doc/com.squareup/javapoet/1.13.0/" @@ -449,7 +449,7 @@ tasks.register('alldoc', Javadoc){ links +="https://www.javadoc.io/doc/org.antlr/ST4/4.3.4/" links +="https://www.javadoc.io/doc/org.antlr/antlr4-runtime/4.13.2/" links +="https://www.javadoc.io/doc/org.jspecify/jspecify/1.0.0/" - links +="https://www.javadoc.io/doc/org.slf4j/slf4j-api/2.0.17/" + links +="https://www.javadoc.io/doc/org.slf4j/slf4j-api/2.0.18/" linkSource() author() diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc60f4..b1b8ef56b44 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 1a704683a00..df6a6ad763d 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,7 +1,9 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.1-bin.zip networkTimeout=10000 +retries=0 +retryBackOffMs=500 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 739907dfd15..b9bb139f790 100755 --- a/gradlew +++ b/gradlew @@ -57,7 +57,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/2d6327017519d23b96af35865dc997fcb544fb40/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/3d91ce3b8caaf77ad09f381f43615b715b53f72c/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/. diff --git a/gradlew.bat b/gradlew.bat old mode 100755 new mode 100644 index e509b2dd8fe..aa5f10b069f --- a/gradlew.bat +++ b/gradlew.bat @@ -23,8 +23,8 @@ @rem @rem ########################################################################## -@rem Set local scope for the variables with windows NT shell -if "%OS%"=="Windows_NT" setlocal +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @@ -51,7 +51,7 @@ 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 +"%COMSPEC%" /c exit 1 :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -65,7 +65,7 @@ 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 +"%COMSPEC%" /c exit 1 :execute @rem Setup the command line @@ -73,21 +73,10 @@ goto fail @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* +@rem endlocal doesn't take effect until after the line is parsed and variables are expanded +@rem which allows us to clear the local environment before executing the java command +endlocal & "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* & call :exitWithErrorLevel -: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 +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/key.core.example/build.gradle b/key.core.example/build.gradle index c96f606393f..1074cc8f0d1 100644 --- a/key.core.example/build.gradle +++ b/key.core.example/build.gradle @@ -10,5 +10,5 @@ application { dependencies { implementation project(":key.core") - implementation 'ch.qos.logback:logback-classic:1.5.32' + implementation 'ch.qos.logback:logback-classic:1.5.34' } \ No newline at end of file diff --git a/key.core/build.gradle b/key.core/build.gradle index eedd94a7f58..172b194883c 100644 --- a/key.core/build.gradle +++ b/key.core/build.gradle @@ -25,7 +25,7 @@ dependencies { testImplementation(project(":key.core")) // https://mvnrepository.com/artifact/com.fasterxml.jackson.dataformat/jackson-dataformat-yaml - testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.3' + testImplementation 'com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.4' // test fixtures testFixturesApi(testFixtures(project(":key.util"))) diff --git a/key.ui/build.gradle b/key.ui/build.gradle index 70e3e7819a8..2347faba4d0 100644 --- a/key.ui/build.gradle +++ b/key.ui/build.gradle @@ -8,7 +8,7 @@ plugins { // Used to create a single executable jar file with all dependencies // see task "shadowJar" below // https://github.com/GradleUp/shadow - id 'com.gradleup.shadow' version "9.4.1" + id 'com.gradleup.shadow' version "9.4.2" } description = "User interface for the deductive verification of Java programs" @@ -31,7 +31,7 @@ dependencies { implementation("info.picocli:picocli:4.7.7") //logging implementation used by the slf4j - implementation 'ch.qos.logback:logback-classic:1.5.32' + implementation 'ch.qos.logback:logback-classic:1.5.34' api 'org.key-project:docking-frames-common:1.1.3p1' api 'org.key-project:docking-frames-core:1.1.3p1' diff --git a/key.util/build.gradle b/key.util/build.gradle index 4d678dec38b..2638cba31b8 100644 --- a/key.util/build.gradle +++ b/key.util/build.gradle @@ -10,17 +10,17 @@ dependencies { // we also export these dependency into src/test/java. testFixturesApi(project(':key.util')) - testFixturesApi(platform("org.junit:junit-bom:6.0.3")) + testFixturesApi(platform("org.junit:junit-bom:6.1.0")) testFixturesApi("org.junit.jupiter:junit-jupiter-api") testFixturesApi("org.junit.jupiter:junit-jupiter-params") testFixturesApi("org.assertj:assertj-core:3.27.7") testFixturesApi("org.jspecify:jspecify:1.0.0") - testFixturesApi("ch.qos.logback:logback-classic:1.5.32") + testFixturesApi("ch.qos.logback:logback-classic:1.5.34") // test fixtures - testFixturesApi("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.3") - testFixturesApi("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.3") + testFixturesApi("com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.21.4") + testFixturesApi("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.22.0") def eisop_version = "3.49.5-eisop1" testFixturesCompileOnly( "io.github.eisop:checker-qual:$eisop_version") diff --git a/keyext.proofmanagement/build.gradle b/keyext.proofmanagement/build.gradle index 21caa654900..e6d14e4f8e1 100644 --- a/keyext.proofmanagement/build.gradle +++ b/keyext.proofmanagement/build.gradle @@ -1,6 +1,6 @@ plugins { id 'application' - id 'com.gradleup.shadow' version "9.4.1" + id 'com.gradleup.shadow' version "9.4.2" } description = "Management of larger verification with KeY."