diff --git a/build.gradle.kts b/build.gradle.kts index 6efcdd3..1d64c1d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -2,15 +2,15 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile import org.sonarqube.gradle.SonarQubePlugin plugins { - id("org.jetbrains.kotlin.jvm") version "2.4.10" apply (false) + id("org.jetbrains.kotlin.jvm") version "2.4.20" apply (false) //id("org.jetbrains.dokka") version "2.0.0" apply (false) `maven-publish` `java-library` - id("com.diffplug.spotless") version "8.9.0" apply false - id("org.sonarqube") version "7.3.1.8318" + id("com.diffplug.spotless") version "8.10.3" apply false + id("org.sonarqube") version "7.5.0.8588" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("com.github.ben-manes.versions") version "0.56.0" + id("com.github.ben-manes.versions") version "0.64.0" } repositories { @@ -53,14 +53,14 @@ subprojects { plugin("org.jetbrains.kotlin:kotlin-stdlib-jdk8") plugin("com.github.ajalt:clikt:2.8.0") plugin("org.jetbrains:annotations:26.1.0") - plugin("org.slf4j:slf4j-api:2.0.18") + plugin("org.slf4j:slf4j-api:2.0.20") val testImplementation by configurations - testImplementation("org.junit.jupiter:junit-jupiter-api:6.1.2") - testImplementation("org.junit.jupiter:junit-jupiter-params:6.1.2") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:6.1.2") + testImplementation("org.junit.jupiter:junit-jupiter-api:6.1.3") + testImplementation("org.junit.jupiter:junit-jupiter-params:6.1.3") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:6.1.3") testImplementation("com.google.truth:truth:1.4.5") - testImplementation("org.slf4j:slf4j-simple:2.0.18") + testImplementation("org.slf4j:slf4j-simple:2.0.20") } val javaVersion = 21 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b1b8ef5..5097068 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 a351597..299848b 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.6.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew.bat b/gradlew.bat index 8508ef6..03754c4 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -26,6 +26,33 @@ @rem Set local scope for the variables, and ensure extensions are enabled setlocal EnableExtensions +@rem Catch executions from older scripts and ensure they exit cleanly. +@rem This can be removed once we can be reasonably confident that few people +@rem will be migrating directly to this new wrapper. +goto afterSafetyNet +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +:::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: +goto exitWithErrorLevel +:afterSafetyNet + set DIRNAME=%~dp0 if "%DIRNAME%"=="" set DIRNAME=. @rem This is normally unused @@ -45,13 +72,14 @@ 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 +1>&2 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. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :findJavaFromJavaHome set JAVA_HOME=%JAVA_HOME:"=% @@ -59,13 +87,14 @@ 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 +1>&2 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. "%COMSPEC%" /c exit 1 +goto exitWithErrorLevel :execute @rem Setup the command line @@ -75,8 +104,9 @@ echo location of your Java installation. 1>&2 @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 +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 & goto exitWithErrorLevel +@rem This label must not be changed. We rely on old scripts being able to jump to this point. :exitWithErrorLevel @rem Use "%COMSPEC%" /c exit to allow operators to work properly in scripts "%COMSPEC%" /c exit %ERRORLEVEL% diff --git a/ide/build.gradle.kts b/ide/build.gradle.kts index 968a5be..ebf085f 100644 --- a/ide/build.gradle.kts +++ b/ide/build.gradle.kts @@ -14,9 +14,9 @@ dependencies { implementation("org.kordamp.ikonli:ikonli-antdesignicons-pack:12.4.0") implementation("org.kordamp.ikonli:ikonli-fontawesome5-pack:12.4.0") implementation("org.kordamp.ikonli:ikonli-javafx:12.4.0") - compileOnly("org.projectlombok:lombok:1.18.46") + compileOnly("org.projectlombok:lombok:1.18.48") implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.slf4j:slf4j-simple:2.0.18") + implementation("org.slf4j:slf4j-simple:2.0.20") implementation("no.tornado:tornadofx:1.7.20") implementation("org.antlr:antlr4-runtime:4.13.2") antlr("org.antlr:antlr4:4.13.2") diff --git a/miniweb/build.gradle.kts b/miniweb/build.gradle.kts index 1c23e31..d82d4a1 100644 --- a/miniweb/build.gradle.kts +++ b/miniweb/build.gradle.kts @@ -7,10 +7,10 @@ val ktor_version = "1.6.7" dependencies { implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("io.ktor:ktor-server-netty:3.5.1") + implementation("io.ktor:ktor-server-netty:3.6.0") implementation("io.ktor:ktor-html-builder:1.6.8") implementation("io.github.microutils:kotlin-logging:4.0.0-beta-2") - implementation("org.slf4j:slf4j-simple:2.0.18") + implementation("org.slf4j:slf4j-simple:2.0.20") implementation("org.key-project:key.core:3.0.0") implementation("org.key-project:key.util:3.0.0")