Update dependencies

This commit is contained in:
Mikołaj Pich 2023-08-23 20:02:57 +02:00
parent e97fcc19ec
commit 1e39d83fd7
9 changed files with 22 additions and 30 deletions

View file

@ -15,7 +15,7 @@ jobs:
timeout-minutes: 10 timeout-minutes: 10
steps: steps:
- uses: fkirc/skip-duplicate-actions@master - uses: fkirc/skip-duplicate-actions@master
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- uses: gradle/wrapper-validation-action@v1 - uses: gradle/wrapper-validation-action@v1
- uses: actions/setup-java@v3 - uses: actions/setup-java@v3
with: with:
@ -53,7 +53,7 @@ jobs:
needs: deploy needs: deploy
steps: steps:
- name: "Call Cloudflare API" - name: "Call Cloudflare API"
uses: indiesdev/curl@v1.1 uses: indiesdev/curl@v1
with: with:
method: "POST" method: "POST"
url: https://api.cloudflare.com/client/v4/zones/0dd93531047ba376c2a1167f841c2bfd/purge_cache url: https://api.cloudflare.com/client/v4/zones/0dd93531047ba376c2a1167f841c2bfd/purge_cache

1
.gitignore vendored
View file

@ -76,3 +76,4 @@ dist/
!dist/favicon.ico !dist/favicon.ico
.idea/jsonSchemas.xml .idea/jsonSchemas.xml
.idea/kotlinc.xml .idea/kotlinc.xml
.idea/jpa-buddy.xml

View file

@ -1,7 +1,7 @@
buildscript { buildscript {
ext { ext {
kotlin_version = "1.7.21" kotlin_version = "1.9.0"
serialization_version = "1.4.1" serialization_version = "1.6.0"
} }
repositories { repositories {
google() google()

View file

@ -10,9 +10,9 @@ mainClassName = 'MainKt'
dependencies { dependencies {
implementation project(":pojos") implementation project(":pojos")
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.8.0' implementation 'org.jetbrains.kotlinx:kotlinx-html-jvm:0.9.1'
testImplementation platform('org.junit:junit-bom:5.9.0') testImplementation platform('org.junit:junit-bom:5.10.0')
testImplementation "org.junit.jupiter:junit-jupiter" testImplementation "org.junit.jupiter:junit-jupiter"
} }
@ -22,13 +22,3 @@ test {
events "passed", "skipped", "failed" events "passed", "skipped", "failed"
} }
} }
compileKotlin {
kotlinOptions {
jvmTarget = 11
freeCompilerArgs += ["-Xopt-in=kotlin.RequiresOptIn", "-Xjvm-default=all"]
}
}
compileTestKotlin {
kotlinOptions.jvmTarget = 11
}

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-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.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.

14
gradlew.bat vendored
View file

@ -14,7 +14,7 @@
@rem limitations under the License. @rem limitations under the License.
@rem @rem
@if "%DEBUG%" == "" @echo off @if "%DEBUG%"=="" @echo off
@rem ########################################################################## @rem ##########################################################################
@rem @rem
@rem Gradle startup script for Windows @rem Gradle startup script for Windows
@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal if "%OS%"=="Windows_NT" setlocal
set DIRNAME=%~dp0 set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=. if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0 set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME% set APP_HOME=%DIRNAME%
@ -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

@ -9,13 +9,6 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version" implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:$serialization_version"
} }
compileKotlin {
kotlinOptions.jvmTarget = 11
}
compileTestKotlin {
kotlinOptions.jvmTarget = 11
}
java { java {
withJavadocJar() withJavadocJar()
withSourcesJar() withSourcesJar()