Skip to content

Commit

Permalink
Merge branch 'main' into elinor/add-kiota-workspace
Browse files Browse the repository at this point in the history
  • Loading branch information
andrueastman authored Jun 5, 2024
2 parents 0e05d3a + c37d9c8 commit c703500
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 52 deletions.
2 changes: 1 addition & 1 deletion it/java/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>

<kiota-java.version>1.1.12</kiota-java.version>
<kiota-java.version>1.1.13</kiota-java.version>
</properties>

<dependencies>
Expand Down
6 changes: 3 additions & 3 deletions it/python/requirements-dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pluggy==1.5.0 ; python_version >= '3.7'

pylint==3.2.2

pytest==8.2.1
pytest==8.2.2

pytest-asyncio==0.23.7

Expand All @@ -64,7 +64,7 @@ wrapt==1.15.0 ; python_version < '3.11'

yapf==0.40.2

zipp==3.19.1 ; python_version >= '3.7'
zipp==3.19.2 ; python_version >= '3.7'

aiohttp==3.9.5 ; python_version >= '3.6'

Expand All @@ -82,7 +82,7 @@ azure-identity==1.16.0

cffi==1.16.0

cryptography==42.0.7 ; python_version >= '3.7'
cryptography==42.0.8 ; python_version >= '3.7'

frozenlist==1.4.1 ; python_version >= '3.7'

Expand Down
64 changes: 32 additions & 32 deletions it/typescript/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

16 changes: 8 additions & 8 deletions it/typescript/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"prettier": "./.prettierrc.json",
"devDependencies": {
"@es-exec/esbuild-plugin-start": "^0.0.5",
"@types/node": "^20.14.1",
"@types/node": "^20.14.2",
"@typescript-eslint/eslint-plugin": "^7.7.1",
"@typescript-eslint/parser": "^7.8.0",
"esbuild": "^0.21.4",
Expand All @@ -31,13 +31,13 @@
},
"dependencies": {
"@azure/identity": "^4.2.0",
"@microsoft/kiota-abstractions": "^1.0.0-preview.53",
"@microsoft/kiota-authentication-azure": "^1.0.0-preview.48",
"@microsoft/kiota-http-fetchlibrary": "^1.0.0-preview.52",
"@microsoft/kiota-serialization-form": "^1.0.0-preview.42",
"@microsoft/kiota-serialization-json": "^1.0.0-preview.53",
"@microsoft/kiota-serialization-multipart": "^1.0.0-preview.31",
"@microsoft/kiota-serialization-text": "^1.0.0-preview.50",
"@microsoft/kiota-abstractions": "^1.0.0-preview.54",
"@microsoft/kiota-authentication-azure": "^1.0.0-preview.49",
"@microsoft/kiota-http-fetchlibrary": "^1.0.0-preview.53",
"@microsoft/kiota-serialization-form": "^1.0.0-preview.43",
"@microsoft/kiota-serialization-json": "^1.0.0-preview.54",
"@microsoft/kiota-serialization-multipart": "^1.0.0-preview.32",
"@microsoft/kiota-serialization-text": "^1.0.0-preview.51",
"express": "^4.19.2",
"node-fetch": "^2.7.0"
}
Expand Down
14 changes: 7 additions & 7 deletions vscode/microsoft-kiota/package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion vscode/microsoft-kiota/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@
"dependencies": {
"@vscode/extension-telemetry": "^0.9.6",
"@vscode/l10n": "^0.0.18",
"adm-zip": "^0.5.13",
"adm-zip": "^0.5.14",
"is-online": "^10.0.0",
"original-fs": "^1.2.0",
"vscode-jsonrpc": "^8.2.1"
Expand Down

0 comments on commit c703500

Please sign in to comment.