Skip to content

Commit 9e9bfca

Browse files
authored
Merge branch 'main' into upgrade_catch2_to_3.7.0
2 parents 72bf656 + 10dc799 commit 9e9bfca

File tree

4 files changed

+19
-36
lines changed

4 files changed

+19
-36
lines changed

.github/workflows/ratCheck.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ jobs:
3030

3131
steps:
3232
- name: Setup Java ☕
33-
uses: actions/setup-java@v4.2.1
33+
uses: actions/setup-java@v4.4.0
3434
with:
3535
distribution: temurin
3636
java-version: 8

.github/workflows/release.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -190,7 +190,7 @@ jobs:
190190
echo "UPLOAD_URL=$UPLOAD_URL" >> $GITHUB_ENV
191191
192192
- name: Setup Java ☕
193-
uses: actions/setup-java@v4.2.1
193+
uses: actions/setup-java@v4.4.0
194194
with:
195195
distribution: temurin
196196
java-version: 8

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"typedoc": "^0.25.13",
3939
"typescript": "^5.4.5",
4040
"unzip-stream": "^0.3.4",
41-
"webpack": "^5.91.0",
41+
"webpack": "^5.95.0",
4242
"webpack-cli": "^5.1.4"
4343
},
4444
"prettier": {

yarn.lock

Lines changed: 16 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -275,23 +275,7 @@
275275
resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.12.tgz#b192fe1c553b54f45d20543adc2ab88455a07d5e"
276276
integrity sha512-zNKDHG/1yxm8Il6uCCVsm+dRdEsJlFoDu73X17y09bId6UwoYww+vFBsAcRzl8knM1sab3Dp1VRikFQwDOtDDw==
277277

278-
"@types/eslint-scope@^3.7.3":
279-
version "3.7.5"
280-
resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.5.tgz#e28b09dbb1d9d35fdfa8a884225f00440dfc5a3e"
281-
integrity sha512-JNvhIEyxVW6EoMIFIvj93ZOywYFatlpu9deeH6eSx6PE3WHYvHaQtmHmQeNw7aA81bYGBPPQqdtBm6b1SsQMmA==
282-
dependencies:
283-
"@types/eslint" "*"
284-
"@types/estree" "*"
285-
286-
"@types/eslint@*":
287-
version "8.44.3"
288-
resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-8.44.3.tgz#96614fae4875ea6328f56de38666f582d911d962"
289-
integrity sha512-iM/WfkwAhwmPff3wZuPLYiHX18HI24jU8k1ZSH7P8FHwxTjZ2P6CoX2wnF43oprR+YXJM6UUxATkNvyv/JHd+g==
290-
dependencies:
291-
"@types/estree" "*"
292-
"@types/json-schema" "*"
293-
294-
"@types/estree@*", "@types/estree@^1.0.5":
278+
"@types/estree@^1.0.5":
295279
version "1.0.5"
296280
resolved "https://registry.yarnpkg.com/@types/estree/-/estree-1.0.5.tgz#a6ce3e556e00fd9895dd872dd172ad0d4bd687f4"
297281
integrity sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==
@@ -309,7 +293,7 @@
309293
resolved "https://registry.yarnpkg.com/@types/google-protobuf/-/google-protobuf-3.15.12.tgz#eb2ba0eddd65712211a2b455dc6071d665ccf49b"
310294
integrity sha512-40um9QqwHjRS92qnOaDpL7RmDK15NuZYo9HihiJRbYkMQZlWnuH8AdvbMy8/o6lgLmKbDUKa+OALCltHdbOTpQ==
311295

312-
"@types/json-schema@*", "@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
296+
"@types/json-schema@^7.0.8", "@types/json-schema@^7.0.9":
313297
version "7.0.13"
314298
resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.13.tgz#02c24f4363176d2d18fc8b70b9f3c54aba178a85"
315299
integrity sha512-RbSSoHliUbnXj3ny0CNFOoxrIDV6SUGyStHsvDqosw6CkdPV8TtWGlfecuK4ToyMEAql6pzNxgCFKanovUzlgQ==
@@ -494,10 +478,10 @@ abort-controller@^3.0.0:
494478
dependencies:
495479
event-target-shim "^5.0.0"
496480

497-
acorn-import-assertions@^1.9.0:
498-
version "1.9.0"
499-
resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.9.0.tgz#507276249d684797c84e0734ef84860334cfb1ac"
500-
integrity sha512-cmMwop9x+8KFhxvKrKfPYmN6/pKTYYHBqLa0DfvVZcKMJWNyWLnaqND7dx/qn66R7ewM1UX5XMaDVP5wlVTaVA==
481+
acorn-import-attributes@^1.9.5:
482+
version "1.9.5"
483+
resolved "https://registry.yarnpkg.com/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz#7eb1557b1ba05ef18b5ed0ec67591bfab04688ef"
484+
integrity sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==
501485

502486
acorn-jsx@^5.3.2:
503487
version "5.3.2"
@@ -1025,10 +1009,10 @@ emoji-regex@^8.0.0:
10251009
resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37"
10261010
integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==
10271011

1028-
enhanced-resolve@^5.0.0, enhanced-resolve@^5.16.0:
1029-
version "5.16.0"
1030-
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.16.0.tgz#65ec88778083056cb32487faa9aef82ed0864787"
1031-
integrity sha512-O+QWCviPNSSLAD9Ucn8Awv+poAkqn3T1XY5/N7kR7rQO9yfSGWkYZDwpJ+iKF7B8rxaQKWngSqACpgzeapSyoA==
1012+
enhanced-resolve@^5.0.0, enhanced-resolve@^5.17.1:
1013+
version "5.17.1"
1014+
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz#67bfbbcc2f81d511be77d686a90267ef7f898a15"
1015+
integrity sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==
10321016
dependencies:
10331017
graceful-fs "^4.2.4"
10341018
tapable "^2.2.0"
@@ -2915,21 +2899,20 @@ webpack-sources@^3.2.3:
29152899
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.3.tgz#2d4daab8451fd4b240cc27055ff6a0c2ccea0cde"
29162900
integrity sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==
29172901

2918-
webpack@^5.91.0:
2919-
version "5.91.0"
2920-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.91.0.tgz#ffa92c1c618d18c878f06892bbdc3373c71a01d9"
2921-
integrity sha512-rzVwlLeBWHJbmgTC/8TvAcu5vpJNII+MelQpylD4jNERPwpBJOE2lEcko1zJX3QJeLjTTAnQxn/OJ8bjDzVQaw==
2902+
webpack@^5.95.0:
2903+
version "5.95.0"
2904+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.95.0.tgz#8fd8c454fa60dad186fbe36c400a55848307b4c0"
2905+
integrity sha512-2t3XstrKULz41MNMBF+cJ97TyHdyQ8HCt//pqErqDvNjU9YQBnZxIHa11VXsi7F3mb5/aO2tuDxdeTPdU7xu9Q==
29222906
dependencies:
2923-
"@types/eslint-scope" "^3.7.3"
29242907
"@types/estree" "^1.0.5"
29252908
"@webassemblyjs/ast" "^1.12.1"
29262909
"@webassemblyjs/wasm-edit" "^1.12.1"
29272910
"@webassemblyjs/wasm-parser" "^1.12.1"
29282911
acorn "^8.7.1"
2929-
acorn-import-assertions "^1.9.0"
2912+
acorn-import-attributes "^1.9.5"
29302913
browserslist "^4.21.10"
29312914
chrome-trace-event "^1.0.2"
2932-
enhanced-resolve "^5.16.0"
2915+
enhanced-resolve "^5.17.1"
29332916
es-module-lexer "^1.2.1"
29342917
eslint-scope "5.1.1"
29352918
events "^3.2.0"

0 commit comments

Comments
 (0)