Skip to content

Commit

Permalink
Merge branch 'trunk' into dotnet-bidi-second-round
Browse files Browse the repository at this point in the history
  • Loading branch information
nvborisenko authored Oct 26, 2024
2 parents a6ca10a + 215e20b commit 56c8e42
Show file tree
Hide file tree
Showing 28 changed files with 1,171 additions and 737 deletions.
2 changes: 1 addition & 1 deletion MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ maven.install(
"com.github.spotbugs:spotbugs:4.8.6",
"com.github.stephenc.jcip:jcip-annotations:1.0-1",
"com.google.code.gson:gson:2.11.0",
"com.google.guava:guava:33.3.0-jre",
"com.google.guava:guava:33.3.1-jre",
"com.google.auto:auto-common:1.2.2",
"com.google.auto.service:auto-service:1.1.1",
"com.google.auto.service:auto-service-annotations:1.1.1",
Expand Down
12 changes: 6 additions & 6 deletions java/maven_install.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -1369959342,
"__RESOLVED_ARTIFACTS_HASH": 2051378450,
"__INPUT_ARTIFACTS_HASH": 1327312787,
"__RESOLVED_ARTIFACTS_HASH": -2038995232,
"conflict_resolution": {
"com.google.code.gson:gson:2.8.9": "com.google.code.gson:gson:2.11.0",
"com.google.errorprone:error_prone_annotations:2.3.2": "com.google.errorprone:error_prone_annotations:2.28.0",
"com.google.guava:guava:31.1-jre": "com.google.guava:guava:33.3.0-jre",
"com.google.guava:guava:31.1-jre": "com.google.guava:guava:33.3.1-jre",
"com.google.j2objc:j2objc-annotations:1.3": "com.google.j2objc:j2objc-annotations:3.0.0",
"org.mockito:mockito-core:4.3.1": "org.mockito:mockito-core:5.13.0"
},
Expand Down Expand Up @@ -159,10 +159,10 @@
},
"com.google.guava:guava": {
"shasums": {
"jar": "dfadc3bce3101eff1452aae47d7c833fee443b47bdf9ef13311b6c7cab663ddf",
"sources": "f91f8619f533db55f37d13369c2fee39d5e1d2f72cef7f69f735d5be1a601f14"
"jar": "4bf0e2c5af8e4525c96e8fde17a4f7307f97f8478f11c4c8e35a0e3298ae4e90",
"sources": "b7cbdad958b791f2a036abff7724570bf9836531c460966f8a3d0df8eaa1c21d"
},
"version": "33.3.0-jre"
"version": "33.3.1-jre"
},
"com.google.guava:guava-testlib": {
"shasums": {
Expand Down
22 changes: 11 additions & 11 deletions javascript/grid-ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
"private": true,
"type": "module",
"dependencies": {
"@apollo/client": "3.10.4",
"@emotion/react": "11.11.4",
"@emotion/styled": "11.11.5",
"@apollo/client": "3.11.8",
"@emotion/react": "11.13.3",
"@emotion/styled": "11.13.0",
"@mui/icons-material": "5.15.18",
"@mui/material": "5.15.18",
"@novnc/novnc": "1.4.0",
"@types/jest": "29.5.12",
"@types/jest": "29.5.14",
"@types/node": "20.12.12",
"@types/react": "18.2.72",
"@types/react-dom": "18.2.22",
Expand All @@ -20,10 +20,10 @@
"graphql.macro": "1.4.2",
"path-browserify": "1.0.1",
"pretty-ms": "9.0.0",
"react": "18.2.0",
"react-dom": "18.2.0",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-modal": "3.16.1",
"react-router-dom": "6.22.3",
"react-router-dom": "6.27.0",
"source-map-explorer": "2.5.3"
},
"scripts": {
Expand All @@ -47,13 +47,13 @@
]
},
"devDependencies": {
"@babel/preset-react": "7.24.7",
"@testing-library/jest-dom": "6.4.5",
"@babel/preset-react": "7.25.9",
"@testing-library/jest-dom": "6.6.2",
"@testing-library/react": "14.3.1",
"@testing-library/user-event": "14.5.2",
"esbuild": "0.19.12",
"esbuild": "0.24.0",
"ts-standard": "12.0.2",
"typescript": "5.4.5"
"typescript": "5.6.3"
},
"jest": {
"testMatch": [
Expand Down
14 changes: 7 additions & 7 deletions javascript/node/selenium-webdriver/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,24 +23,24 @@
"node": ">= 14.21.0"
},
"dependencies": {
"@bazel/runfiles": "^6.3.0",
"@bazel/runfiles": "^6.3.1",
"jszip": "^3.10.1",
"tmp": "^0.2.3",
"ws": "^8.18.0"
},
"devDependencies": {
"@eslint/js": "^9.12.0",
"@eslint/js": "^9.13.0",
"clean-jsdoc-theme": "^4.3.0",
"eslint": "^9.12.0",
"eslint": "^9.13.0",
"eslint-config-prettier": "^9.1.0",
"eslint-plugin-mocha": "^10.5.0",
"eslint-plugin-n": "^17.10.3",
"eslint-plugin-n": "^17.11.1",
"eslint-plugin-no-only-tests": "^3.3.0",
"eslint-plugin-prettier": "^5.2.1",
"express": "^4.21.0",
"globals": "^15.10.0",
"express": "^4.21.1",
"globals": "^15.11.0",
"has-flag": "^5.0.1",
"jsdoc": "^4.0.3",
"jsdoc": "^4.0.4",
"mocha": "^10.7.3",
"mocha-junit-reporter": "^2.2.1",
"multer": "1.4.5-lts.1",
Expand Down
Loading

0 comments on commit 56c8e42

Please sign in to comment.