diff options
-rw-r--r-- | gradle/libs.versions.toml | 4 | ||||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.jar | bin | 59536 -> 60756 bytes | |||
-rw-r--r-- | gradle/wrapper/gradle-wrapper.properties | 2 | ||||
-rwxr-xr-x | gradlew | 6 | ||||
-rw-r--r-- | gradlew.bat | 14 | ||||
-rw-r--r-- | subprojects/frontend/package.json | 2 | ||||
-rw-r--r-- | yarn.lock | 10 |
7 files changed, 23 insertions, 15 deletions
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index cb141d6f..4e722b68 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml | |||
@@ -4,8 +4,8 @@ jmh = "1.35" | |||
4 | junit = "5.9.0" | 4 | junit = "5.9.0" |
5 | mockito = "4.6.1" | 5 | mockito = "4.6.1" |
6 | mwe2 = "2.13.0" | 6 | mwe2 = "2.13.0" |
7 | slf4j = "2.0.0-alpha7" | 7 | slf4j = "2.0.0-beta1" |
8 | xtext = "2.28.0.M1" | 8 | xtext = "2.28.0.M2" |
9 | 9 | ||
10 | [libraries] | 10 | [libraries] |
11 | ecore = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore", version = "2.27.0" } | 11 | ecore = { group = "org.eclipse.emf", name = "org.eclipse.emf.ecore", version = "2.27.0" } |
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180f..249e5832 100644 --- a/gradle/wrapper/gradle-wrapper.jar +++ b/gradle/wrapper/gradle-wrapper.jar | |||
Binary files differ | |||
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8049c684..ae04661e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties | |||
@@ -1,5 +1,5 @@ | |||
1 | distributionBase=GRADLE_USER_HOME | 1 | distributionBase=GRADLE_USER_HOME |
2 | distributionPath=wrapper/dists | 2 | distributionPath=wrapper/dists |
3 | distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip | 3 | distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip |
4 | zipStoreBase=GRADLE_USER_HOME | 4 | zipStoreBase=GRADLE_USER_HOME |
5 | zipStorePath=wrapper/dists | 5 | zipStorePath=wrapper/dists |
@@ -205,6 +205,12 @@ set -- \ | |||
205 | org.gradle.wrapper.GradleWrapperMain \ | 205 | org.gradle.wrapper.GradleWrapperMain \ |
206 | "$@" | 206 | "$@" |
207 | 207 | ||
208 | # Stop when "xargs" is not available. | ||
209 | if ! command -v xargs >/dev/null 2>&1 | ||
210 | then | ||
211 | die "xargs is not available" | ||
212 | fi | ||
213 | |||
208 | # Use "xargs" to parse quoted args. | 214 | # Use "xargs" to parse quoted args. |
209 | # | 215 | # |
210 | # With -n1 it outputs one arg per line, with the quotes and backslashes removed. | 216 | # With -n1 it outputs one arg per line, with the quotes and backslashes removed. |
diff --git a/gradlew.bat b/gradlew.bat index ac1b06f9..53a6b238 100644 --- a/gradlew.bat +++ b/gradlew.bat | |||
@@ -14,7 +14,7 @@ | |||
14 | @rem limitations under the License. | 14 | @rem limitations under the License. |
15 | @rem | 15 | @rem |
16 | 16 | ||
17 | @if "%DEBUG%" == "" @echo off | 17 | @if "%DEBUG%"=="" @echo off |
18 | @rem ########################################################################## | 18 | @rem ########################################################################## |
19 | @rem | 19 | @rem |
20 | @rem Gradle startup script for Windows | 20 | @rem Gradle startup script for Windows |
@@ -25,7 +25,7 @@ | |||
25 | if "%OS%"=="Windows_NT" setlocal | 25 | if "%OS%"=="Windows_NT" setlocal |
26 | 26 | ||
27 | set DIRNAME=%~dp0 | 27 | set DIRNAME=%~dp0 |
28 | if "%DIRNAME%" == "" set DIRNAME=. | 28 | if "%DIRNAME%"=="" set DIRNAME=. |
29 | set APP_BASE_NAME=%~n0 | 29 | set APP_BASE_NAME=%~n0 |
30 | set APP_HOME=%DIRNAME% | 30 | set APP_HOME=%DIRNAME% |
31 | 31 | ||
@@ -40,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome | |||
40 | 40 | ||
41 | set JAVA_EXE=java.exe | 41 | set JAVA_EXE=java.exe |
42 | %JAVA_EXE% -version >NUL 2>&1 | 42 | %JAVA_EXE% -version >NUL 2>&1 |
43 | if "%ERRORLEVEL%" == "0" goto execute | 43 | if %ERRORLEVEL% equ 0 goto execute |
44 | 44 | ||
45 | echo. | 45 | echo. |
46 | echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. | 46 | 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 | |||
75 | 75 | ||
76 | :end | 76 | :end |
77 | @rem End local scope for the variables with windows NT shell | 77 | @rem End local scope for the variables with windows NT shell |
78 | if "%ERRORLEVEL%"=="0" goto mainEnd | 78 | if %ERRORLEVEL% equ 0 goto mainEnd |
79 | 79 | ||
80 | :fail | 80 | :fail |
81 | rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of | 81 | rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of |
82 | rem the _cmd.exe /c_ return code! | 82 | rem the _cmd.exe /c_ return code! |
83 | if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 | 83 | set EXIT_CODE=%ERRORLEVEL% |
84 | exit /b 1 | 84 | if %EXIT_CODE% equ 0 set EXIT_CODE=1 |
85 | if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% | ||
86 | exit /b %EXIT_CODE% | ||
85 | 87 | ||
86 | :mainEnd | 88 | :mainEnd |
87 | if "%OS%"=="Windows_NT" endlocal | 89 | if "%OS%"=="Windows_NT" endlocal |
diff --git a/subprojects/frontend/package.json b/subprojects/frontend/package.json index 59a042b3..d5e9bef4 100644 --- a/subprojects/frontend/package.json +++ b/subprojects/frontend/package.json | |||
@@ -73,7 +73,7 @@ | |||
73 | "prettier": "^2.7.1", | 73 | "prettier": "^2.7.1", |
74 | "rollup": "^2.77.3", | 74 | "rollup": "^2.77.3", |
75 | "typescript": "~4.7.4", | 75 | "typescript": "~4.7.4", |
76 | "vite": "^3.0.6", | 76 | "vite": "^3.0.7", |
77 | "vite-plugin-inject-preload": "^1.0.1" | 77 | "vite-plugin-inject-preload": "^1.0.1" |
78 | } | 78 | } |
79 | } | 79 | } |
@@ -1004,7 +1004,7 @@ __metadata: | |||
1004 | react-dom: ^18.2.0 | 1004 | react-dom: ^18.2.0 |
1005 | rollup: ^2.77.3 | 1005 | rollup: ^2.77.3 |
1006 | typescript: ~4.7.4 | 1006 | typescript: ~4.7.4 |
1007 | vite: ^3.0.6 | 1007 | vite: ^3.0.7 |
1008 | vite-plugin-inject-preload: ^1.0.1 | 1008 | vite-plugin-inject-preload: ^1.0.1 |
1009 | zod: ^3.18.0 | 1009 | zod: ^3.18.0 |
1010 | languageName: unknown | 1010 | languageName: unknown |
@@ -4698,9 +4698,9 @@ __metadata: | |||
4698 | languageName: node | 4698 | languageName: node |
4699 | linkType: hard | 4699 | linkType: hard |
4700 | 4700 | ||
4701 | "vite@npm:^3.0.6": | 4701 | "vite@npm:^3.0.7": |
4702 | version: 3.0.6 | 4702 | version: 3.0.7 |
4703 | resolution: "vite@npm:3.0.6" | 4703 | resolution: "vite@npm:3.0.7" |
4704 | dependencies: | 4704 | dependencies: |
4705 | esbuild: ^0.14.47 | 4705 | esbuild: ^0.14.47 |
4706 | fsevents: ~2.3.2 | 4706 | fsevents: ~2.3.2 |
@@ -4726,7 +4726,7 @@ __metadata: | |||
4726 | optional: true | 4726 | optional: true |
4727 | bin: | 4727 | bin: |
4728 | vite: bin/vite.js | 4728 | vite: bin/vite.js |
4729 | checksum: 73e9015e9432b81093da1d00a4086afc5e8f1da415e4b15277c4c6a6997990983b94a5021f7e39e3204731ee1f526e4b71bd7cd0476d0d38f7da63e116cd6448 | 4729 | checksum: 3cdcb68e16433b9addee61c117c379692e4d12d44ee7011da99ed9516b8c37ce76f1bb1728eab0e3a28957c9d2dc839024e1607c2ad03f38089e3be55d7dd456 |
4730 | languageName: node | 4730 | languageName: node |
4731 | linkType: hard | 4731 | linkType: hard |
4732 | 4732 | ||