Skip to content

Commit

Permalink
tsp, bump typespec dependencies to 0.56 (#2747)
Browse files Browse the repository at this point in the history
  • Loading branch information
weidongxu-microsoft committed May 8, 2024
1 parent 4c651a4 commit bfd37c4
Show file tree
Hide file tree
Showing 29 changed files with 424 additions and 558 deletions.
4 changes: 4 additions & 0 deletions typespec-extension/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# Release History

## 0.15.16 (2024-05-08)

Compatible with compiler 0.56.

## 0.15.15 (2024-05-06)

Compatible with compiler 0.55.
Expand Down
331 changes: 187 additions & 144 deletions typespec-extension/package-lock.json

Large diffs are not rendered by default.

41 changes: 22 additions & 19 deletions typespec-extension/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@azure-tools/typespec-java",
"version": "0.15.15",
"version": "0.15.16",
"description": "TypeSpec library for emitting Java client from the TypeSpec REST protocol binding",
"keywords": [
"TypeSpec"
Expand Down Expand Up @@ -45,13 +45,14 @@
"target/emitter.jar"
],
"peerDependencies": {
"@typespec/compiler": ">=0.55.0 <1.0.0",
"@typespec/http": ">=0.55.0 <1.0.0",
"@typespec/rest": ">=0.55.0 <1.0.0",
"@typespec/openapi": ">=0.55.0 <1.0.0",
"@typespec/versioning": ">=0.55.0 <1.0.0",
"@azure-tools/typespec-azure-core": ">=0.41.0 <1.0.0",
"@azure-tools/typespec-client-generator-core": ">=0.41.6 <1.0.0"
"@typespec/compiler": ">=0.56.0 <1.0.0",
"@typespec/http": ">=0.56.0 <1.0.0",
"@typespec/rest": ">=0.56.0 <1.0.0",
"@typespec/openapi": ">=0.56.0 <1.0.0",
"@typespec/versioning": ">=0.56.0 <1.0.0",
"@azure-tools/typespec-azure-core": ">=0.42.0 <1.0.0",
"@azure-tools/typespec-client-generator-core": ">=0.42.0 <1.0.0",
"@azure-tools/typespec-azure-resource-manager": ">=0.42.0 <1.0.0"
},
"dependencies": {
"@autorest/codemodel": "~4.20.0",
Expand All @@ -60,24 +61,26 @@
},
"devDependencies": {
"prettier": "~3.2.5",
"@types/lodash": "~4.17.0",
"@types/lodash": "~4.17.1",
"@types/js-yaml": "~4.0.9",
"@types/mocha": "~10.0.6",
"@types/node": "~20.12.7",
"@types/node": "~20.12.10",
"c8": "~9.1.0",
"eslint": "~8.57.0",
"mocha": "~10.4.0",
"rimraf": "~5.0.5",
"typescript": "~5.4.5",
"@typescript-eslint/parser": "~7.7.0",
"@typescript-eslint/eslint-plugin": "~7.7.0",
"@typescript-eslint/parser": "~7.8.0",
"@typescript-eslint/eslint-plugin": "~7.8.0",
"eslint-plugin-deprecation": "~2.0.0",
"@azure-tools/typespec-azure-core": "0.41.0",
"@azure-tools/typespec-client-generator-core": "0.41.8",
"@typespec/compiler": "0.55.0",
"@typespec/http": "0.55.0",
"@typespec/openapi": "0.55.0",
"@typespec/rest": "0.55.0",
"@typespec/versioning": "0.55.0"
"@typespec/compiler": "0.56.0",
"@typespec/http": "0.56.0",
"@typespec/openapi": "0.56.0",
"@typespec/rest": "0.56.0",
"@typespec/versioning": "0.56.0",
"@azure-tools/typespec-azure-core": "0.42.0",
"@azure-tools/typespec-client-generator-core": "0.42.0",
"@azure-tools/typespec-azure-resource-manager": "0.42.0",
"@azure-tools/typespec-autorest": "0.42.0"
}
}
23 changes: 12 additions & 11 deletions typespec-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,24 @@
"testserver-run": "npx cadl-ranch serve ./node_modules/@azure-tools/cadl-ranch-specs/http --coverageFile ./cadl-ranch-coverage-java.json"
},
"dependencies": {
"@azure-tools/cadl-ranch-specs": "0.33.2",
"@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.15.15.tgz"
"@azure-tools/cadl-ranch-specs": "0.33.4",
"@azure-tools/typespec-java": "file:/../typespec-extension/azure-tools-typespec-java-0.15.16.tgz"
},
"devDependencies": {
"@typespec/prettier-plugin-typespec": "~0.55.0",
"@azure-tools/typespec-azure-resource-manager": "~0.41.0",
"@typespec/prettier-plugin-typespec": "~0.56.0",
"prettier-plugin-organize-imports": "3.2.4",
"prettier": "~3.2.5"
},
"overrides": {
"@typespec/compiler": ">=0.55.0 <1.0.0",
"@typespec/http": ">=0.55.0 <1.0.0",
"@typespec/rest": ">=0.55.0 <1.0.0",
"@typespec/versioning": ">=0.55.0 <1.0.0",
"@typespec/openapi": ">=0.55.0 <1.0.0",
"@azure-tools/typespec-azure-core": ">=0.41.0 <1.0.0",
"@azure-tools/typespec-client-generator-core": ">=0.41.8 <1.0.0"
"@typespec/compiler": ">=0.56.0 <1.0.0",
"@typespec/http": ">=0.56.0 <1.0.0",
"@typespec/rest": ">=0.56.0 <1.0.0",
"@typespec/versioning": ">=0.56.0 <1.0.0",
"@typespec/openapi": ">=0.56.0 <1.0.0",
"@azure-tools/typespec-azure-core": ">=0.42.0 <1.0.0",
"@azure-tools/typespec-client-generator-core": ">=0.42.0 <1.0.0",
"@azure-tools/typespec-azure-resource-manager": ">=0.42.0 <1.0.0",
"@azure-tools/typespec-autorest": ">=0.42.0 <1.0.0"
},
"private": true
}
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import com.azure.core.annotation.Fluent;
import com.azure.core.management.Resource;
import com.azure.core.management.SystemData;
import com.cadl.armresourceprovider.models.ManagedIdentityProperties;
import com.cadl.armresourceprovider.models.ManagedServiceIdentity;
import com.cadl.armresourceprovider.models.ProvisioningState;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.Map;
Expand All @@ -27,7 +27,7 @@ public final class CustomTemplateResourceInner extends Resource {
* Managed identity.
*/
@JsonProperty(value = "identity")
private ManagedIdentityProperties identity;
private ManagedServiceIdentity identity;

/*
* Azure Resource Manager metadata containing createdBy and modifiedBy information.
Expand Down Expand Up @@ -55,7 +55,7 @@ private CustomTemplateResourceProperties innerProperties() {
*
* @return the identity value.
*/
public ManagedIdentityProperties identity() {
public ManagedServiceIdentity identity() {
return this.identity;
}

Expand All @@ -65,7 +65,7 @@ public ManagedIdentityProperties identity() {
* @param identity the identity value to set.
* @return the CustomTemplateResourceInner object itself.
*/
public CustomTemplateResourceInner withIdentity(ManagedIdentityProperties identity) {
public CustomTemplateResourceInner withIdentity(ManagedServiceIdentity identity) {
this.identity = identity;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public final class OperationInner {
private Origin origin;

/*
* Enum. Indicates the action type. "Internal" refers to actions that are for internal only APIs.
* Extensible enum. Indicates the action type. "Internal" refers to actions that are for internal only APIs.
*/
@JsonProperty(value = "actionType")
private ActionType actionType;
Expand Down Expand Up @@ -91,8 +91,8 @@ public Origin origin() {
}

/**
* Get the actionType property: Enum. Indicates the action type. "Internal" refers to actions that are for internal
* only APIs.
* Get the actionType property: Extensible enum. Indicates the action type. "Internal" refers to actions that are
* for internal only APIs.
*
* @return the actionType value.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import com.cadl.armresourceprovider.fluent.models.CustomTemplateResourceInner;
import com.cadl.armresourceprovider.models.CustomTemplateResource;
import com.cadl.armresourceprovider.models.CustomTemplateResourcePatch;
import com.cadl.armresourceprovider.models.ManagedIdentityProperties;
import com.cadl.armresourceprovider.models.ManagedServiceIdentity;
import com.cadl.armresourceprovider.models.ProvisioningState;
import java.util.Collections;
import java.util.Map;
Expand Down Expand Up @@ -46,7 +46,7 @@ public Map<String, String> tags() {
}
}

public ManagedIdentityProperties identity() {
public ManagedServiceIdentity identity() {
return this.innerModel().identity();
}

Expand Down Expand Up @@ -160,7 +160,7 @@ public CustomTemplateResourceImpl withTags(Map<String, String> tags) {
return this;
}

public CustomTemplateResourceImpl withIdentity(ManagedIdentityProperties identity) {
public CustomTemplateResourceImpl withIdentity(ManagedServiceIdentity identity) {
if (isInCreateMode()) {
this.innerModel().withIdentity(identity);
return this;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
import java.util.Collection;

/**
* Enum. Indicates the action type. "Internal" refers to actions that are for internal only APIs.
* Extensible enum. Indicates the action type. "Internal" refers to actions that are for internal only APIs.
*/
public final class ActionType extends ExpandableStringEnum<ActionType> {
/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public interface CustomTemplateResource {
*
* @return the identity value.
*/
ManagedIdentityProperties identity();
ManagedServiceIdentity identity();

/**
* Gets the systemData property: Azure Resource Manager metadata containing createdBy and modifiedBy information.
Expand Down Expand Up @@ -194,7 +194,7 @@ interface WithIdentity {
* @param identity Managed identity.
* @return the next definition stage.
*/
WithCreate withIdentity(ManagedIdentityProperties identity);
WithCreate withIdentity(ManagedServiceIdentity identity);
}

/**
Expand Down Expand Up @@ -265,7 +265,7 @@ interface WithIdentity {
* @param identity Managed identity.
* @return the next definition stage.
*/
Update withIdentity(ManagedIdentityProperties identity);
Update withIdentity(ManagedServiceIdentity identity);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ public final class CustomTemplateResourcePatch {
* Managed identity.
*/
@JsonProperty(value = "identity")
private ManagedIdentityProperties identity;
private ManagedServiceIdentity identity;

/**
* Creates an instance of CustomTemplateResourcePatch class.
Expand All @@ -29,7 +29,7 @@ public CustomTemplateResourcePatch() {
*
* @return the identity value.
*/
public ManagedIdentityProperties identity() {
public ManagedServiceIdentity identity() {
return this.identity;
}

Expand All @@ -39,7 +39,7 @@ public ManagedIdentityProperties identity() {
* @param identity the identity value to set.
* @return the CustomTemplateResourcePatch object itself.
*/
public CustomTemplateResourcePatch withIdentity(ManagedIdentityProperties identity) {
public CustomTemplateResourcePatch withIdentity(ManagedServiceIdentity identity) {
this.identity = identity;
return this;
}
Expand Down

This file was deleted.

Loading

0 comments on commit bfd37c4

Please sign in to comment.