Skip to content
Snippets Groups Projects
Commit 464ecf95 authored by Griefed's avatar Griefed :joystick:
Browse files

Merge branch 'main' into 'renovate-core-js-3.x' 

# Conflicts:
#   frontend/package.json
parents 6ef3a1bf f2a7c124
No related branches found
No related tags found
1 merge request!78Update dependency core-js to v3.21.1
This commit is part of merge request !78. Comments created here will be created in the context of that merge request.
Hide whitespace changes
Inline Side-by-side
.gitlab-ci.yml
+ 2
− 2
Edit View file @ 464ecf95
...@@ -16,7 +16,7 @@ variables: ...@@ -16,7 +16,7 @@ variables:
SECRET_DETECTION_EXCLUDED_PATHS: "" SECRET_DETECTION_EXCLUDED_PATHS: ""
services: services:
- name: griefed/gitlab-ci-cd:2.0.0 - name: griefed/gitlab-ci-cd:2.0.2
alias: docker alias: docker
sast: sast:
...@@ -357,7 +357,7 @@ coverage: ...@@ -357,7 +357,7 @@ coverage:
cobertura: build/cobertura.xml cobertura: build/cobertura.xml
Gradle Dependency-Checks: Gradle Dependency-Checks:
image: griefed/baseimage-ubuntu-jdk-8:2.0.3 image: griefed/baseimage-ubuntu-jdk-8:2.0.5
stage: Other stage: Other
allow_failure: true allow_failure: true
before_script: before_script:
......
Dockerfile.gradle
+ 2
− 2
Edit View file @ 464ecf95
FROM griefed/baseimage-ubuntu-jdk-8:2.0.3 AS builder FROM griefed/baseimage-ubuntu-jdk-8:2.0.5 AS builder
ARG BRANCH_OR_TAG=main ARG BRANCH_OR_TAG=main
...@@ -15,7 +15,7 @@ RUN \ ...@@ -15,7 +15,7 @@ RUN \
./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \ ./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \
ls -ahl ./build/libs/ ls -ahl ./build/libs/
FROM griefed/baseimage-ubuntu-jdk-8:2.0.3 FROM griefed/baseimage-ubuntu-jdk-8:2.0.5
LABEL maintainer="Griefed <griefed@griefed.de>" LABEL maintainer="Griefed <griefed@griefed.de>"
LABEL description="DESCRIPTION" LABEL description="DESCRIPTION"
......
Dockerfile.gradle.develop
+ 2
− 2
Edit View file @ 464ecf95
FROM griefed/baseimage-ubuntu-jdk-8:2.0.3 AS builder FROM griefed/baseimage-ubuntu-jdk-8:2.0.5 AS builder
ARG BRANCH_OR_TAG=main ARG BRANCH_OR_TAG=main
...@@ -15,7 +15,7 @@ RUN \ ...@@ -15,7 +15,7 @@ RUN \
./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \ ./gradlew about installQuasar cleanFrontend assembleFrontend copyDist build --info -x test && \
ls -ahl ./build/libs/ ls -ahl ./build/libs/
FROM griefed/baseimage-ubuntu-jdk-8:2.0.3 FROM griefed/baseimage-ubuntu-jdk-8:2.0.5
LABEL maintainer="Griefed <griefed@griefed.de>" LABEL maintainer="Griefed <griefed@griefed.de>"
LABEL description="DESCRIPTION" LABEL description="DESCRIPTION"
......
frontend/package-lock.json
+ 20
− 20
Edit View file @ 464ecf95
...@@ -12,12 +12,12 @@ ...@@ -12,12 +12,12 @@
"axios": "0.25.0", "axios": "0.25.0",
"core-js": "3.21.1", "core-js": "3.21.1",
"quasar": "2.5.5", "quasar": "2.5.5",
"tsparticles": "1.40.0" "tsparticles": "1.41.2"
}, },
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "7.17.0", "@babel/eslint-parser": "7.17.0",
"@quasar/app": "3.3.3", "@quasar/app": "3.3.3",
"electron": "17.0.0", "electron": "17.0.1",
"electron-packager": "15.4.0", "electron-packager": "15.4.0",
"eslint": "8.9.0", "eslint": "8.9.0",
"eslint-config-prettier": "8.3.0", "eslint-config-prettier": "8.3.0",
...@@ -4985,9 +4985,9 @@ ...@@ -4985,9 +4985,9 @@
} }
}, },
"node_modules/electron": { "node_modules/electron": {
"version": "17.0.0", "version": "17.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-17.0.0.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-17.0.1.tgz",
"integrity": "sha512-3UXcBQMwbMWdPvGHaSdPMluHrd+/bc+K143MyvE5zVZ+S1XCHt4sau7dj6svJHns5llN0YG/c6h/vRfadIp8Zg==", "integrity": "sha512-CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA==",
"dev": true, "dev": true,
"hasInstallScript": true, "hasInstallScript": true,
"dependencies": { "dependencies": {
...@@ -5185,9 +5185,9 @@ ...@@ -5185,9 +5185,9 @@
"dev": true "dev": true
}, },
"node_modules/electron/node_modules/@types/node": { "node_modules/electron/node_modules/@types/node": {
"version": "14.18.0", "version": "14.18.12",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.0.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz",
"integrity": "sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ==", "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==",
"dev": true "dev": true
}, },
"node_modules/elementtree": { "node_modules/elementtree": {
...@@ -11925,9 +11925,9 @@ ...@@ -11925,9 +11925,9 @@
"dev": true "dev": true
}, },
"node_modules/tsparticles": { "node_modules/tsparticles": {
"version": "1.40.0", "version": "1.41.2",
"resolved": "https://registry.npmjs.org/tsparticles/-/tsparticles-1.40.0.tgz", "resolved": "https://registry.npmjs.org/tsparticles/-/tsparticles-1.41.2.tgz",
"integrity": "sha512-BqmVHm1+w0lRW7+lawZ1Mych2J5AgYKDLs+CpnDk/KBeOOwwEa9y1x7Sp0lUz21TZN0wfwmUnu2rlYsS/QfhEA==", "integrity": "sha512-DWnttSF4adMlvKWMTXuP0BvKEGXuwamatgzgEKp7nF4YqHzejjKySGeUpmEDCKAR0BnsmatYNZ+8cU8eMrTFjw==",
"funding": [ "funding": [
{ {
"type": "github", "type": "github",
...@@ -16814,9 +16814,9 @@ ...@@ -16814,9 +16814,9 @@
"dev": true "dev": true
}, },
"electron": { "electron": {
"version": "17.0.0", "version": "17.0.1",
"resolved": "https://registry.npmjs.org/electron/-/electron-17.0.0.tgz", "resolved": "https://registry.npmjs.org/electron/-/electron-17.0.1.tgz",
"integrity": "sha512-3UXcBQMwbMWdPvGHaSdPMluHrd+/bc+K143MyvE5zVZ+S1XCHt4sau7dj6svJHns5llN0YG/c6h/vRfadIp8Zg==", "integrity": "sha512-CBReR/QEOpgwMdt59lWCtj9wC8oHB6aAjMF1lhXcGew132xtp+C5N6EaXb/fmDceVYLouziYjbNcpeXsWrqdpA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@electron/get": "^1.13.0", "@electron/get": "^1.13.0",
...@@ -16825,9 +16825,9 @@ ...@@ -16825,9 +16825,9 @@
}, },
"dependencies": { "dependencies": {
"@types/node": { "@types/node": {
"version": "14.18.0", "version": "14.18.12",
"resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.0.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.12.tgz",
"integrity": "sha512-0GeIl2kmVMXEnx8tg1SlG6Gg8vkqirrW752KqolYo1PHevhhZN3bhJ67qHj+bQaINhX0Ra3TlWwRvMCd9iEfNQ==", "integrity": "sha512-q4jlIR71hUpWTnGhXWcakgkZeHa3CCjcQcnuzU8M891BAWA2jHiziiWEPEkdS5pFsz7H9HJiy8BrK7tBRNrY7A==",
"dev": true "dev": true
} }
} }
...@@ -21986,9 +21986,9 @@ ...@@ -21986,9 +21986,9 @@
"dev": true "dev": true
}, },
"tsparticles": { "tsparticles": {
"version": "1.40.0", "version": "1.41.2",
"resolved": "https://registry.npmjs.org/tsparticles/-/tsparticles-1.40.0.tgz", "resolved": "https://registry.npmjs.org/tsparticles/-/tsparticles-1.41.2.tgz",
"integrity": "sha512-BqmVHm1+w0lRW7+lawZ1Mych2J5AgYKDLs+CpnDk/KBeOOwwEa9y1x7Sp0lUz21TZN0wfwmUnu2rlYsS/QfhEA==" "integrity": "sha512-DWnttSF4adMlvKWMTXuP0BvKEGXuwamatgzgEKp7nF4YqHzejjKySGeUpmEDCKAR0BnsmatYNZ+8cU8eMrTFjw=="
}, },
"tunnel": { "tunnel": {
"version": "0.0.6", "version": "0.0.6",
......
frontend/package.json
+ 2
− 2
Edit View file @ 464ecf95
...@@ -30,11 +30,11 @@ ...@@ -30,11 +30,11 @@
"axios": "0.25.0", "axios": "0.25.0",
"quasar": "2.5.5", "quasar": "2.5.5",
"core-js": "3.21.1", "core-js": "3.21.1",
"tsparticles": "1.40.0" "tsparticles": "1.41.2"
}, },
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "7.17.0", "@babel/eslint-parser": "7.17.0",
"electron": "17.0.0", "electron": "17.0.1",
"@quasar/app": "3.3.3", "@quasar/app": "3.3.3",
"electron-packager": "15.4.0", "electron-packager": "15.4.0",
"eslint": "8.9.0", "eslint": "8.9.0",
......
gradle/wrapper/gradle-wrapper.jar
+ 0
− 0
View file @ 464ecf95
No preview for this file type
gradle/wrapper/gradle-wrapper.properties
+ 1
− 1
Edit View file @ 464ecf95
distributionBase=GRADLE_USER_HOME distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
gradlew
+ 5
− 5
Edit View file @ 464ecf95
#!/bin/sh #!/bin/sh
# #
# Copyright © 2015-2021 the original authors. # Copyright © 2015-2021 the original authors.
# #
# Licensed under the Apache License, Version 2.0 (the "License"); # Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License. # you may not use this file except in compliance with the License.
...@@ -32,10 +32,10 @@ ...@@ -32,10 +32,10 @@
# Busybox and similar reduced shells will NOT work, because this script # Busybox and similar reduced shells will NOT work, because this script
# requires all of these POSIX shell features: # requires all of these POSIX shell features:
# * functions; # * functions;
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», # * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
# «${var#prefix}», «${var%suffix}», and «$( cmd )»; # «${var#prefix}», «${var%suffix}», and «$( cmd )»;
# * compound commands having a testable exit status, especially «case»; # * compound commands having a testable exit status, especially «case»;
# * various built-in commands including «command», «set», and «ulimit». # * various built-in commands including «command», «set», and «ulimit».
# #
# Important for patching: # Important for patching:
# #
......
gradlew.bat
+ 89
− 89
Edit View file @ 464ecf95
@rem @rem
@rem Copyright 2015 the original author or authors. @rem Copyright 2015 the original author or authors.
@rem @rem
@rem Licensed under the Apache License, Version 2.0 (the "License"); @rem Licensed under the Apache License, Version 2.0 (the "License");
@rem you may not use this file except in compliance with the License. @rem you may not use this file except in compliance with the License.
@rem You may obtain a copy of the License at @rem You may obtain a copy of the License at
@rem @rem
@rem https://www.apache.org/licenses/LICENSE-2.0 @rem https://www.apache.org/licenses/LICENSE-2.0
@rem @rem
@rem Unless required by applicable law or agreed to in writing, software @rem Unless required by applicable law or agreed to in writing, software
@rem distributed under the License is distributed on an "AS IS" BASIS, @rem distributed under the License is distributed on an "AS IS" BASIS,
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@rem See the License for the specific language governing permissions and @rem See the License for the specific language governing permissions and
@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
@rem @rem
@rem ########################################################################## @rem ##########################################################################
@rem Set local scope for the variables with windows NT shell @rem Set local scope for the variables with windows NT shell
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%
@rem Resolve any "." and ".." in APP_HOME to make it shorter. @rem Resolve any "." and ".." in APP_HOME to make it shorter.
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe @rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome 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%" == "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.
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. echo location of your Java installation.
goto fail goto fail
:findJavaFromJavaHome :findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=% set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute if exist "%JAVA_EXE%" goto execute
echo. echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo. echo.
echo Please set the JAVA_HOME variable in your environment to match the echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation. echo location of your Java installation.
goto fail goto fail
:execute :execute
@rem Setup the command line @rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
@rem Execute Gradle @rem Execute Gradle
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
: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%"=="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 if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1 exit /b 1
:mainEnd :mainEnd
if "%OS%"=="Windows_NT" endlocal if "%OS%"=="Windows_NT" endlocal
:omega :omega
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Me haz all ze repositoriiiiiiiiiiiiiiiiiies