diff --git a/build.gradle.kts b/build.gradle.kts index ecad53b..1a3e288 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.3.20" apply (false) + id("org.jetbrains.kotlin.jvm") version "2.3.21" apply (false) //id("org.jetbrains.dokka") version "2.0.0" apply (false) `maven-publish` `java-library` - id("com.diffplug.spotless") version "8.4.0" apply false - id("org.sonarqube") version "7.2.3.7755" + id("com.diffplug.spotless") version "8.6.0" apply false + id("org.sonarqube") version "7.3.0.8198" id("io.github.gradle-nexus.publish-plugin") version "2.0.0" - id("com.github.ben-manes.versions") version "0.53.0" + id("com.github.ben-manes.versions") version "0.54.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.17") + plugin("org.slf4j:slf4j-api:2.0.18") val testImplementation by configurations - testImplementation("org.junit.jupiter:junit-jupiter-api:6.0.3") - testImplementation("org.junit.jupiter:junit-jupiter-params:6.0.3") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:6.0.3") + testImplementation("org.junit.jupiter:junit-jupiter-api:6.1.0") + testImplementation("org.junit.jupiter:junit-jupiter-params:6.1.0") + testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:6.1.0") testImplementation("com.google.truth:truth:1.4.5") - testImplementation("org.slf4j:slf4j-simple:2.0.17") + testImplementation("org.slf4j:slf4j-simple:2.0.18") } val javaVersion = 21 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index d997cfc..b1b8ef5 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 c61a118..df6a6ad 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.4.1-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 739907d..b9bb139 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 e509b2d..aa5f10b --- 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/ide/build.gradle.kts b/ide/build.gradle.kts index 94a2c08..72f69a9 100644 --- a/ide/build.gradle.kts +++ b/ide/build.gradle.kts @@ -1,7 +1,7 @@ plugins { application antlr - id("com.gradleup.shadow") version "9.4.1" + id("com.gradleup.shadow") version "9.4.2" id("org.openjfx.javafxplugin") version "0.1.0" } @@ -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.44") + compileOnly("org.projectlombok:lombok:1.18.46") implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("org.slf4j:slf4j-simple:2.0.17") + implementation("org.slf4j:slf4j-simple:2.0.18") 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 07756c4..af14881 100644 --- a/miniweb/build.gradle.kts +++ b/miniweb/build.gradle.kts @@ -1,16 +1,16 @@ plugins { application - id("com.gradleup.shadow") version "9.4.1" + id("com.gradleup.shadow") version "9.4.2" } val ktor_version = "1.6.7" dependencies { implementation("org.jetbrains.kotlin:kotlin-reflect") - implementation("io.ktor:ktor-server-netty:3.4.2") + implementation("io.ktor:ktor-server-netty:3.5.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.17") + implementation("org.slf4j:slf4j-simple:2.0.18") implementation("org.key-project:key.core:2.12.3") implementation("org.key-project:key.util:2.12.3")