Skip to content

Commit

Permalink
Merge pull request #4 from PascalHonegger/dep-upgrades
Browse files Browse the repository at this point in the history
Dep upgrades
  • Loading branch information
PascalHonegger committed Aug 11, 2022
2 parents 464ed67 + ca053f0 commit c1b586f
Show file tree
Hide file tree
Showing 9 changed files with 2,422 additions and 1,839 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/backend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
- name: Build
run: ./gradlew assemble
- name: 'Qodana JVM Scan'
uses: JetBrains/qodana-action@v5.1.0
uses: JetBrains/qodana-action@v2022.2.1
with:
args: '--linter,jetbrains/qodana-jvm'
artifact-name: 'qodana-jvm-report'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/frontend.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
- run: npm ci
working-directory: Frontend
- name: 'Qodana JS Scan'
uses: JetBrains/qodana-action@v5.1.0
uses: JetBrains/qodana-action@v2022.2.1
with:
args: '-i,Frontend,--linter,jetbrains/qodana-js'
artifact-name: 'qodana-js-report'
Expand Down
4,219 changes: 2,397 additions & 1,822 deletions Frontend/package-lock.json

Large diffs are not rendered by default.

8 changes: 4 additions & 4 deletions Frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"pinia": "~2.0",
"vue": "~3.2",
"vue-draggable-next": "~2.1",
"vue-router": "~4.0",
"vue-router": "~4.1",
"vue-toastification": "2.0.0-rc.5",
"vue3-charts": "~1.1.31"
},
Expand All @@ -25,10 +25,10 @@
"@vue/cli-service": "~5.0",
"@vue/eslint-config-typescript": "~11.0",
"autoprefixer": "~10.4",
"eslint": "~8.18",
"eslint": "~8.21",
"eslint-config-prettier": "~8.5",
"eslint-plugin-prettier": "~4.0",
"eslint-plugin-vue": "~9.1",
"eslint-plugin-prettier": "~4.2",
"eslint-plugin-vue": "~9.3",
"lint-staged": "~13.0",
"node-sass": "~7.0",
"postcss": "~8.4",
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
6 changes: 6 additions & 0 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,12 @@ set -- \
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.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
14 changes: 8 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,7 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +75,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
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!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
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
Expand Down
8 changes: 4 additions & 4 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,17 +9,17 @@ dependencyResolutionManagement {
versionCatalogs {
val kotlin = "1.6.21"
val mockk = "1.12.4"
val ktor = "2.0.2"
val ktor = "2.0.3"
val logback = "1.2.11"
val shadow = "7.1.2"
val kotlinxDatetime = "0.3.3"
val kotlinxDatetime = "0.4.0"
val kotlinLogging = "2.1.23"
val flyway = "8.5.13"
val flyway = "9.1.3"
val postgresql = "42.4.0"
val jooq = "3.16.5"
val jooqPlugin = "7.1.1"
val kover = "0.5.1"
val testcontainers = "1.17.2"
val testcontainers = "1.17.3"
val javaJwt = "3.19.2"
val argon2 = "2.11"
val versions = "0.42.0"
Expand Down

0 comments on commit c1b586f

Please sign in to comment.