diff --git a/build-logic/build.gradle.kts b/build-logic/build.gradle.kts index e3d9b79740..4541c260cf 100644 --- a/build-logic/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -12,7 +12,7 @@ repositories { dependencies { implementation("com.diffplug.spotless:com.diffplug.spotless.gradle.plugin:8.8.0") - implementation("com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin:0.36.0") + implementation("com.vanniktech.maven.publish:com.vanniktech.maven.publish.gradle.plugin:0.37.0") implementation("com.github.ben-manes:gradle-versions-plugin:0.53.0") diff --git a/build.gradle.kts b/build.gradle.kts index 88a2a67878..9f28c687ad 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,4 +1,4 @@ plugins { - id("com.diffplug.spotless") version "8.4.0" apply false + id("com.diffplug.spotless") version "8.8.0" apply false id("standard-kotlin") apply false } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 69d55923af..e2e714db6c 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -2,28 +2,28 @@ # https://docs.gradle.org/current/userguide/version_catalogs.html#sec::toml-dependencies-format [versions] -com-google-guava-guava = "33.5.0-jre" +com-google-guava-guava = "33.6.0-jre" com-google-truth-truth = "1.4.5" -com-squareup-okhttp3-okhttp = "5.3.2" -com-squareup-okhttp3-okhttp-jvm = "5.3.2" +com-squareup-okhttp3-okhttp = "5.4.0" +com-squareup-okhttp3-okhttp-jvm = "5.4.0" jakarta-json-jakarta-json-api = "2.1.3" -net-bytebuddy-byte-buddy-agent = "1.18.4" +net-bytebuddy-byte-buddy-agent = "1.18.11" org-assertj-assertj-core = "3.27.7" -org-checkerframework-checker-qual = "3.53.1" -org-eclipse-parsson-parsson = "1.1.7" +org-checkerframework-checker-qual = "4.2.1" +org-eclipse-parsson-parsson = "1.1.9" org-hamcrest-hamcrest = "3.0" org-hamcrest-hamcrest-library = "3.0" -org-javassist-javassist = "3.30.2-GA" +org-javassist-javassist = "3.32.0-GA" org-jbehave-jbehave-core = "5.2.0" org-jspecify-jspecify = "1.0.0" -org-junit = "6.0.3" +org-junit = "6.1.1" org-mockito-mockito-inline = "5.2.0" -gson = "2.13.2" -logback = "1.5.32" +gson = "2.14.0" +logback = "1.5.37" clickt = "5.1.0" -kotlin = "2.2.21" -ktor = "3.4.1" +kotlin = "2.4.0" +ktor = "3.5.1" palantirJavaFormat = "2.86.0" checkstyleVersion = "13.1.0" @@ -56,7 +56,7 @@ org-hamcrest-hamcrest-library = { module = "org.hamcrest:hamcrest-library", vers clickt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clickt" } gson = { module = "com.google.code.gson:gson", version.ref = "gson" } logback = { module = "ch.qos.logback:logback-classic", version.ref = "logback" } -lombok = { module = "org.projectlombok:lombok", version = "1.18.42" } +lombok = { module = "org.projectlombok:lombok", version = "1.18.46" } snakeyaml = { module = "org.yaml:snakeyaml", version = "2.6" } kotlin-gradle = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b52fb7e713..a9db11550c 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-9.5.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/gradlew b/gradlew index b9bb139f79..249efbb032 100755 --- a/gradlew +++ b/gradlew @@ -20,7 +20,7 @@ ############################################################################## # -# Gradle start up script for POSIX generated by Gradle. +# gradlew start up script for POSIX generated by Gradle. # # Important for running: # @@ -29,7 +29,7 @@ # bash, then to run this script, type that shell name before the whole # command line, like: # -# ksh Gradle +# ksh gradlew # # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: diff --git a/gradlew.bat b/gradlew.bat index 24c62d56f2..8508ef684d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,82 +1,82 @@ -@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, and ensure extensions are enabled -setlocal EnableExtensions - -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 - -"%COMSPEC%" /c exit 1 - -: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 - -"%COMSPEC%" /c exit 1 - -:execute -@rem Setup the command line - - - -@rem Execute Gradle -@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 - -:exitWithErrorLevel -@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts -"%COMSPEC%" /c exit %ERRORLEVEL% +@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 gradlew startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables, and ensure extensions are enabled +setlocal EnableExtensions + +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 + +"%COMSPEC%" /c exit 1 + +: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 + +"%COMSPEC%" /c exit 1 + +:execute +@rem Setup the command line + + + +@rem Execute gradlew +@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 + +:exitWithErrorLevel +@rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts +"%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/javaparser-core/build.gradle.kts b/javaparser-core/build.gradle.kts index 182f802247..8ecda40047 100644 --- a/javaparser-core/build.gradle.kts +++ b/javaparser-core/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { api(libs.org.jspecify.jspecify) api(libs.net.bytebuddy.byte.buddy.agent) //javacc("com.helger:parser-generator-cc:2.0.1") - javacc("com.helger:parser-generator-cc:1.1.4") + javacc("com.helger:parser-generator-cc:2.0.1") } val javaBuildFile by tasks.registering(Copy::class) { diff --git a/tools/lint/build.gradle.kts b/tools/lint/build.gradle.kts index c638d70786..9e0ee2638d 100644 --- a/tools/lint/build.gradle.kts +++ b/tools/lint/build.gradle.kts @@ -6,6 +6,6 @@ dependencies { api(project(":jmlparser-symbol-solver-core")) api(libs.gson) implementation(libs.logback) - implementation("se.bjurr.violations:violations-lib:1.160.4") + implementation("se.bjurr.violations:violations-lib:1.160.5") testImplementation(project(":tools:utils")) } diff --git a/tools/lsp/build.gradle.kts b/tools/lsp/build.gradle.kts index 4720457ae2..68025c1432 100644 --- a/tools/lsp/build.gradle.kts +++ b/tools/lsp/build.gradle.kts @@ -1,7 +1,7 @@ plugins { id("standard-kotlin") kotlin("plugin.serialization") version libs.versions.kotlin.get() - id("com.gradleup.shadow") version "9.3.2" + id("com.gradleup.shadow") version "9.4.3" id("application") } @@ -11,12 +11,12 @@ dependencies { api(project(":jmlparser-symbol-solver-core")) testImplementation(kotlin("test")) - implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.10.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-core:1.11.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0") //implementation(kotlin("serialization")) implementation(kotlin("serialization")) - runtimeOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0") - implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.10.0") + runtimeOnly("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0") + implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.11.0") implementation(project(":tools:utils")) implementation(project(":tools:smt"))