Update dependencies

This commit is contained in:
Mikołaj Pich 2024-07-05 00:17:36 +02:00
parent cbece4ee1a
commit 8df4d22c58
No known key found for this signature in database
7 changed files with 112 additions and 100 deletions

View file

@ -5,9 +5,9 @@ val exposed_version: String by project
val h2_version: String by project val h2_version: String by project
plugins { plugins {
kotlin("jvm") version "1.9.10" kotlin("jvm") version "1.9.24"
id("io.ktor.plugin") version "2.3.4" id("io.ktor.plugin") version "2.3.12"
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10" id("org.jetbrains.kotlin.plugin.serialization") version "1.9.24"
} }
group = "io.github.wulkanowy" group = "io.github.wulkanowy"
@ -24,10 +24,10 @@ val compileKotlin: org.jetbrains.kotlin.gradle.tasks.KotlinCompile by tasks
val compileTestKotlin: org.jetbrains.kotlin.gradle.tasks.KotlinCompile by tasks val compileTestKotlin: org.jetbrains.kotlin.gradle.tasks.KotlinCompile by tasks
compileKotlin.kotlinOptions { compileKotlin.kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString() jvmTarget = JavaVersion.VERSION_17.toString()
} }
compileTestKotlin.kotlinOptions { compileTestKotlin.kotlinOptions {
jvmTarget = JavaVersion.VERSION_11.toString() jvmTarget = JavaVersion.VERSION_17.toString()
} }
repositories { repositories {

View file

@ -1,6 +1,6 @@
ktor_version=2.3.4 ktor_version=2.3.12
kotlin_version=1.9.10 kotlin_version=1.9.24
logback_version=1.4.11 logback_version=1.5.6
kotlin.code.style=official kotlin.code.style=official
exposed_version = 0.41.1 exposed_version = 0.52.0
h2_version = 2.2.222 h2_version = 2.2.224

Binary file not shown.

View file

@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists

6
gradlew vendored
View file

@ -205,6 +205,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \ org.gradle.wrapper.GradleWrapperMain \
"$@" "$@"
# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi
# Use "xargs" to parse quoted args. # Use "xargs" to parse quoted args.
# #
# With -n1 it outputs one arg per line, with the quotes and backslashes removed. # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

10
gradlew.bat vendored
View file

@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1 %JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute if %ERRORLEVEL% equ 0 goto execute
echo. echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
:end :end
@rem End local scope for the variables with windows NT shell @rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd if %ERRORLEVEL% equ 0 goto mainEnd
:fail :fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code! rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 set EXIT_CODE=%ERRORLEVEL%
exit /b 1 if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal

View file

@ -7,6 +7,7 @@ import io.ktor.client.request.*
import io.ktor.http.* import io.ktor.http.*
import io.ktor.serialization.kotlinx.json.* import io.ktor.serialization.kotlinx.json.*
import io.ktor.server.testing.* import io.ktor.server.testing.*
import java.util.UUID
import kotlin.test.Test import kotlin.test.Test
import kotlin.test.assertEquals import kotlin.test.assertEquals
@ -31,6 +32,9 @@ class RoutingKtTest {
scraperBaseUrl = "https://fakelog.cf", scraperBaseUrl = "https://fakelog.cf",
symbol = "powiatwulkanowy", symbol = "powiatwulkanowy",
loginType = "STANDARD", loginType = "STANDARD",
uuid = UUID.randomUUID().toString(),
schoolId = "",
schoolShort = ""
) )
) )
} }