Skip to content

Commit 132e859

Browse files
authored
Prepare autorest 4.1.43/typespec 0.26.1 (#2994)
* bump core * sync tests * bump autorest.java * bump typespec-java * bump tcgc/cadl-ranch-specs * fix typespec-test dependency * regen typespec * regen swagger * modify Generate.ps1 * revert cadl-ranch * Revert "regen swagger" This reverts commit d6af8b0. * revert customization test * fix inconsistency in setup script * fix Generate.ps1 * bump core * update release date * regen
1 parent ef83b1b commit 132e859

File tree

28 files changed

+450
-63
lines changed

28 files changed

+450
-63
lines changed

.github/workflows/generate-test-code.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
5757
- name: Build autorest-java, install modules
5858
run: |
59-
mvn install -f pom.xml -P local,tsp --no-transfer-progress
59+
mvn clean install -f pom.xml -P local,tsp --no-transfer-progress
6060
6161
- name: Generate test code for autorest-java
6262
if: ${{ inputs.scope == 'all' || inputs.scope == 'autorest' }}

core

Submodule core updated 338 files

package-lock.json

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@autorest/java",
3-
"version": "4.1.42",
3+
"version": "4.1.43",
44
"description": "The Java extension for classic generators in AutoRest.",
55
"scripts": {
66
"autorest": "autorest",

typespec-extension/changelog.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Release History
22

3+
## 0.26.1 (2024-12-10)
4+
5+
Compatible with compiler 0.62.
6+
7+
- Fixed `equals()` for `ExpandableEnum` implementations.
8+
- Removed unnecessary parent read-only property shadowing for stream-style-serialization, when all polymorphic models are in the same package.
9+
310
## 0.26.0 (2024-11-22)
411

512
Compatible with compiler 0.62.

typespec-extension/package-lock.json

Lines changed: 8 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

typespec-extension/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@azure-tools/typespec-java",
3-
"version": "0.26.0",
3+
"version": "0.26.1",
44
"description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
55
"keywords": [
66
"TypeSpec"
@@ -49,7 +49,7 @@
4949
"@azure-tools/typespec-azure-resource-manager": ">=0.48.0 <1.0.0",
5050
"@azure-tools/typespec-autorest": ">=0.48.0 <1.0.0",
5151
"@azure-tools/typespec-azure-rulesets": ">=0.48.0 <1.0.0",
52-
"@azure-tools/typespec-client-generator-core": ">=0.48.2 <1.0.0",
52+
"@azure-tools/typespec-client-generator-core": ">=0.48.5 <1.0.0",
5353
"@typespec/compiler": ">=0.62.0 <1.0.0",
5454
"@typespec/http": ">=0.62.0 <1.0.0",
5555
"@typespec/openapi": ">=0.62.0 <1.0.0",
@@ -67,7 +67,7 @@
6767
"@azure-tools/typespec-azure-resource-manager": "0.48.0",
6868
"@azure-tools/typespec-autorest": "0.48.0",
6969
"@azure-tools/typespec-azure-rulesets": "0.48.0",
70-
"@azure-tools/typespec-client-generator-core": "0.48.2",
70+
"@azure-tools/typespec-client-generator-core": "0.48.5",
7171
"@types/js-yaml": "~4.0.9",
7272
"@types/lodash": "~4.17.13",
7373
"@types/mocha": "~10.0.9",

typespec-tests/Generate.ps1

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ $generateScript = {
7979
$tspOptions += " --option ""@azure-tools/typespec-java.generate-tests=false"""
8080
# also generate with group-etag-headers=false since mgmt doesn't support etag grouping yet
8181
$tspOptions += " --option ""@azure-tools/typespec-java.group-etag-headers=false"""
82+
} elseif ($tspFile -match "subclient.tsp") {
83+
$tspOptions += " --option ""@azure-tools/typespec-java.enable-subclient=true"""
8284
}
8385

8486
# Test customization for one of the TypeSpec definitions - naming.tsp

typespec-tests/Setup.ps1

Lines changed: 4 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,13 @@ param (
55

66
Set-Location $PSScriptRoot
77

8-
if ($RebuildJar) {
9-
Set-Location ../
8+
Push-Location ../
9+
try {
1010
./Build-TypeSpec.ps1
11-
} else {
12-
Set-Location ../typespec-extension/
13-
# re-build typespec-java
14-
npm ci
15-
npm run build
16-
npm run lint
17-
npm pack
18-
if ($LASTEXITCODE -ne 0) {
19-
exit $LASTEXITCODE
20-
}
11+
} finally {
12+
Pop-Location
2113
}
2214

23-
# re-install
24-
Set-Location ../typespec-tests/
2515
if (Test-Path node_modules) {
2616
Remove-Item node_modules -Recurse -Force
2717
}

typespec-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111
"dependencies": {
1212
"@azure-tools/cadl-ranch-specs": "0.39.4",
13-
"@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.26.0.tgz"
13+
"@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.26.1.tgz"
1414
},
1515
"devDependencies": {
1616
"@typespec/prettier-plugin-typespec": "~0.62.0",

0 commit comments

Comments
 (0)