diff --git a/CHANGELOG.md b/CHANGELOG.md index b5f9406c50..b9997318f7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + + +### Bug Fixes + +* **rosetta:** crashes on behavioral interfaces ([#1169](https://github.com/aws/jsii/issues/1169)) ([5f3e9e0](https://github.com/aws/jsii/commit/5f3e9e048ba60b278627e9d4d69550bb10dadfd1)) + + + + + ## [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/lerna.json b/lerna.json index 050cc8368c..572e86c881 100644 --- a/lerna.json +++ b/lerna.json @@ -10,5 +10,5 @@ "rejectCycles": true } }, - "version": "0.21.0" + "version": "0.21.1" } diff --git a/package.json b/package.json index 5a0b77cb92..2fdf6ec87c 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "eslint-plugin-import": "^2.19.1", "eslint-import-resolver-node": "^0.3.2", "eslint-import-resolver-typescript": "^2.0.0", - "lerna": "^3.20.1" + "lerna": "^3.20.2" }, "repository": { "type": "git", diff --git a/packages/@jsii/dotnet-analyzers/CHANGELOG.md b/packages/@jsii/dotnet-analyzers/CHANGELOG.md index 593f5e5ac2..0df3a2ac0b 100644 --- a/packages/@jsii/dotnet-analyzers/CHANGELOG.md +++ b/packages/@jsii/dotnet-analyzers/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/dotnet-analyzers + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package @jsii/dotnet-analyzers diff --git a/packages/@jsii/dotnet-analyzers/package.json b/packages/@jsii/dotnet-analyzers/package.json index 52b971c0c5..5ca68026f5 100644 --- a/packages/@jsii/dotnet-analyzers/package.json +++ b/packages/@jsii/dotnet-analyzers/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-analyzers", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": ".NET Roslyn Analyzers for Jsii", "license": "Apache-2.0", @@ -38,7 +38,7 @@ }, "devDependencies": { "@types/node": "^10.17.13", - "jsii-build-tools": "^0.21.0", + "jsii-build-tools": "^0.21.1", "typescript": "~3.7.4" } } diff --git a/packages/@jsii/dotnet-jsonmodel/CHANGELOG.md b/packages/@jsii/dotnet-jsonmodel/CHANGELOG.md index 156650ddcb..26bcbe80f8 100644 --- a/packages/@jsii/dotnet-jsonmodel/CHANGELOG.md +++ b/packages/@jsii/dotnet-jsonmodel/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/dotnet-jsonmodel + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package @jsii/dotnet-jsonmodel diff --git a/packages/@jsii/dotnet-jsonmodel/package.json b/packages/@jsii/dotnet-jsonmodel/package.json index c9734fac70..aa0f8d9316 100644 --- a/packages/@jsii/dotnet-jsonmodel/package.json +++ b/packages/@jsii/dotnet-jsonmodel/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-jsonmodel", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": ".NET json model for jsii spec and api.", "license": "Apache-2.0", @@ -36,7 +36,7 @@ }, "devDependencies": { "@types/node": "^10.17.13", - "jsii-build-tools": "^0.21.0", + "jsii-build-tools": "^0.21.1", "typescript": "~3.7.4" } } diff --git a/packages/@jsii/dotnet-runtime-test/CHANGELOG.md b/packages/@jsii/dotnet-runtime-test/CHANGELOG.md index 1a3db7c97b..ef6f0e810b 100644 --- a/packages/@jsii/dotnet-runtime-test/CHANGELOG.md +++ b/packages/@jsii/dotnet-runtime-test/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/dotnet-runtime-test + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/@jsii/dotnet-runtime-test/package.json b/packages/@jsii/dotnet-runtime-test/package.json index 5dfe76878a..b041ee0a61 100644 --- a/packages/@jsii/dotnet-runtime-test/package.json +++ b/packages/@jsii/dotnet-runtime-test/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-runtime-test", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": "Tests for the .NET client for jsii runtime", "license": "Apache-2.0", @@ -30,10 +30,10 @@ "test:update": "UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@jsii/dotnet-runtime": "^0.21.0", + "@jsii/dotnet-runtime": "^0.21.1", "@types/node": "^10.17.13", - "jsii-calc": "^0.21.0", - "jsii-pacmak": "^0.21.0", + "jsii-calc": "^0.21.1", + "jsii-pacmak": "^0.21.1", "typescript": "~3.7.4" } } diff --git a/packages/@jsii/dotnet-runtime/CHANGELOG.md b/packages/@jsii/dotnet-runtime/CHANGELOG.md index c2834c1808..090d7fb72a 100644 --- a/packages/@jsii/dotnet-runtime/CHANGELOG.md +++ b/packages/@jsii/dotnet-runtime/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/dotnet-runtime + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/@jsii/dotnet-runtime/package.json b/packages/@jsii/dotnet-runtime/package.json index d1c8b9664b..9dfd0c082d 100644 --- a/packages/@jsii/dotnet-runtime/package.json +++ b/packages/@jsii/dotnet-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/dotnet-runtime", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": ".NET client for jsii runtime", "license": "Apache-2.0", @@ -37,11 +37,11 @@ "package": "package-dotnet" }, "devDependencies": { - "@jsii/dotnet-jsonmodel": "^0.21.0", - "@jsii/runtime": "^0.21.0", + "@jsii/dotnet-jsonmodel": "^0.21.1", + "@jsii/runtime": "^0.21.1", "@types/node": "^10.17.13", "@types/semver": "^6.2.0", - "jsii-build-tools": "^0.21.0", + "jsii-build-tools": "^0.21.1", "semver": "^7.1.1", "typescript": "~3.7.4" } diff --git a/packages/@jsii/java-runtime-test/CHANGELOG.md b/packages/@jsii/java-runtime-test/CHANGELOG.md index 3da7c17e74..bdcb26c98c 100644 --- a/packages/@jsii/java-runtime-test/CHANGELOG.md +++ b/packages/@jsii/java-runtime-test/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/java-runtime-test + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/@jsii/java-runtime-test/package.json b/packages/@jsii/java-runtime-test/package.json index 8bf0176128..42b940a3f8 100644 --- a/packages/@jsii/java-runtime-test/package.json +++ b/packages/@jsii/java-runtime-test/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/java-runtime-test", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": "Tests for the Java client for jsii runtime", "license": "Apache-2.0", @@ -28,8 +28,8 @@ "test:update": "UPDATE_DIFF=1 npm run test" }, "devDependencies": { - "@jsii/java-runtime": "^0.21.0", - "jsii-calc": "^0.21.0", - "jsii-pacmak": "^0.21.0" + "@jsii/java-runtime": "^0.21.1", + "jsii-calc": "^0.21.1", + "jsii-pacmak": "^0.21.1" } } diff --git a/packages/@jsii/java-runtime/CHANGELOG.md b/packages/@jsii/java-runtime/CHANGELOG.md index 41a1d4deaa..09b7210439 100644 --- a/packages/@jsii/java-runtime/CHANGELOG.md +++ b/packages/@jsii/java-runtime/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/java-runtime + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package @jsii/java-runtime diff --git a/packages/@jsii/java-runtime/package.json b/packages/@jsii/java-runtime/package.json index 2b92219d5b..69fe4dc916 100644 --- a/packages/@jsii/java-runtime/package.json +++ b/packages/@jsii/java-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/java-runtime", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": "Java client for jsii runtime", "license": "Apache-2.0", @@ -31,9 +31,9 @@ "package": "package-java" }, "devDependencies": { - "@jsii/runtime": "^0.21.0", + "@jsii/runtime": "^0.21.1", "@types/node": "^10.17.13", - "jsii-build-tools": "^0.21.0", + "jsii-build-tools": "^0.21.1", "typescript": "~3.7.4" } } diff --git a/packages/@jsii/kernel/CHANGELOG.md b/packages/@jsii/kernel/CHANGELOG.md index 8fc59975b0..09e21dc594 100644 --- a/packages/@jsii/kernel/CHANGELOG.md +++ b/packages/@jsii/kernel/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/kernel + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package @jsii/kernel diff --git a/packages/@jsii/kernel/package.json b/packages/@jsii/kernel/package.json index 278cfc63f6..1175131ef2 100644 --- a/packages/@jsii/kernel/package.json +++ b/packages/@jsii/kernel/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/kernel", - "version": "0.21.0", + "version": "0.21.1", "description": "kernel for jsii execution environment", "license": "Apache-2.0", "author": { @@ -30,14 +30,14 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^0.21.0", + "@jsii/spec": "^0.21.1", "fs-extra": "^8.1.0", "source-map": "^0.7.3", "tar": "^5.0.5" }, "devDependencies": { - "@scope/jsii-calc-base": "^0.21.0", - "@scope/jsii-calc-lib": "^0.21.0", + "@scope/jsii-calc-base": "^0.21.1", + "@scope/jsii-calc-lib": "^0.21.1", "@types/fs-extra": "^8.0.1", "@types/jest": "^24.0.25", "@types/jest-expect-message": "^1.0.1", @@ -46,8 +46,8 @@ "eslint": "^6.8.0", "jest": "^24.9.0", "jest-expect-message": "^1.0.2", - "jsii-build-tools": "^0.21.0", - "jsii-calc": "^0.21.0", + "jsii-build-tools": "^0.21.1", + "jsii-calc": "^0.21.1", "typescript": "~3.7.4" }, "jest": { diff --git a/packages/@jsii/python-runtime/CHANGELOG.md b/packages/@jsii/python-runtime/CHANGELOG.md index ac0a46c36d..265418dbbe 100644 --- a/packages/@jsii/python-runtime/CHANGELOG.md +++ b/packages/@jsii/python-runtime/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/python-runtime + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/@jsii/python-runtime/package.json b/packages/@jsii/python-runtime/package.json index c26faad37e..7dda0aa5f6 100644 --- a/packages/@jsii/python-runtime/package.json +++ b/packages/@jsii/python-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/python-runtime", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": "Python client for jsii runtime", "license": "Apache-2.0", @@ -30,9 +30,9 @@ "test:update": "UPDATE_DIFF=1 .env/bin/python bin/generate-calc && .env/bin/py.test -v --mypy" }, "dependencies": { - "@jsii/runtime": "^0.21.0", - "jsii-build-tools": "^0.21.0", - "jsii-calc": "^0.21.0", - "jsii-pacmak": "^0.21.0" + "@jsii/runtime": "^0.21.1", + "jsii-build-tools": "^0.21.1", + "jsii-calc": "^0.21.1", + "jsii-pacmak": "^0.21.1" } } diff --git a/packages/@jsii/ruby-runtime/CHANGELOG.md b/packages/@jsii/ruby-runtime/CHANGELOG.md index 39cf076cc7..9aa32d4a54 100644 --- a/packages/@jsii/ruby-runtime/CHANGELOG.md +++ b/packages/@jsii/ruby-runtime/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/ruby-runtime + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package @jsii/ruby-runtime diff --git a/packages/@jsii/ruby-runtime/package.json b/packages/@jsii/ruby-runtime/package.json index 524a9e5912..4da409df75 100644 --- a/packages/@jsii/ruby-runtime/package.json +++ b/packages/@jsii/ruby-runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/ruby-runtime", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": "Ruby client for jsii runtime", "license": "Apache-2.0", @@ -33,11 +33,11 @@ "package": "package-ruby" }, "devDependencies": { - "@jsii/runtime": "^0.21.0", + "@jsii/runtime": "^0.21.1", "@types/node": "^10.17.13", - "jsii-build-tools": "^0.21.0", - "jsii-calc": "^0.21.0", - "jsii-pacmak": "^0.21.0", + "jsii-build-tools": "^0.21.1", + "jsii-calc": "^0.21.1", + "jsii-pacmak": "^0.21.1", "typescript": "~3.7.4" } } diff --git a/packages/@jsii/ruby-runtime/project/Gemfile.lock b/packages/@jsii/ruby-runtime/project/Gemfile.lock index 4d7fbb0b16..1a43ce0831 100644 --- a/packages/@jsii/ruby-runtime/project/Gemfile.lock +++ b/packages/@jsii/ruby-runtime/project/Gemfile.lock @@ -1,7 +1,7 @@ PATH remote: . specs: - jsii_runtime (0.21.0) + jsii_runtime (0.21.1) GEM remote: https://rubygems.org/ diff --git a/packages/@jsii/runtime/CHANGELOG.md b/packages/@jsii/runtime/CHANGELOG.md index 9dbd123663..c3fdf19a3e 100644 --- a/packages/@jsii/runtime/CHANGELOG.md +++ b/packages/@jsii/runtime/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/runtime + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/@jsii/runtime/package.json b/packages/@jsii/runtime/package.json index baa48593ab..4eeb804e9b 100644 --- a/packages/@jsii/runtime/package.json +++ b/packages/@jsii/runtime/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/runtime", - "version": "0.21.0", + "version": "0.21.1", "description": "jsii runtime kernel process", "license": "Apache-2.0", "author": { @@ -33,18 +33,18 @@ "package": "package-js" }, "dependencies": { - "@jsii/kernel": "^0.21.0", - "@jsii/spec": "^0.21.0" + "@jsii/kernel": "^0.21.1", + "@jsii/spec": "^0.21.1" }, "devDependencies": { - "@scope/jsii-calc-base": "^0.21.0", - "@scope/jsii-calc-lib": "^0.21.0", + "@scope/jsii-calc-base": "^0.21.1", + "@scope/jsii-calc-lib": "^0.21.1", "@types/jest": "^24.0.25", "@types/node": "^10.17.13", "eslint": "^6.8.0", "jest": "^24.9.0", - "jsii-build-tools": "^0.21.0", - "jsii-calc": "^0.21.0", + "jsii-build-tools": "^0.21.1", + "jsii-calc": "^0.21.1", "source-map": "^0.7.3", "source-map-loader": "^0.2.4", "typescript": "~3.7.4", diff --git a/packages/@jsii/spec/CHANGELOG.md b/packages/@jsii/spec/CHANGELOG.md index e96b4bbc30..2599a48268 100644 --- a/packages/@jsii/spec/CHANGELOG.md +++ b/packages/@jsii/spec/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @jsii/spec + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/@jsii/spec/package.json b/packages/@jsii/spec/package.json index affce78ca1..b8b888e60e 100644 --- a/packages/@jsii/spec/package.json +++ b/packages/@jsii/spec/package.json @@ -1,6 +1,6 @@ { "name": "@jsii/spec", - "version": "0.21.0", + "version": "0.21.1", "description": "Specification for jsii assemblies", "license": "Apache-2.0", "author": { @@ -37,7 +37,7 @@ "@types/node": "^10.17.13", "eslint": "^6.8.0", "jest": "^24.9.0", - "jsii-build-tools": "^0.21.0", + "jsii-build-tools": "^0.21.1", "typescript": "~3.7.4", "typescript-json-schema": "^0.41.0" }, diff --git a/packages/@scope/jsii-calc-base-of-base/CHANGELOG.md b/packages/@scope/jsii-calc-base-of-base/CHANGELOG.md index 2de6156ba2..e0b3fa2be5 100644 --- a/packages/@scope/jsii-calc-base-of-base/CHANGELOG.md +++ b/packages/@scope/jsii-calc-base-of-base/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @scope/jsii-calc-base-of-base + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package @scope/jsii-calc-base-of-base diff --git a/packages/@scope/jsii-calc-base-of-base/package.json b/packages/@scope/jsii-calc-base-of-base/package.json index 6763d463dc..d7cf2cec40 100644 --- a/packages/@scope/jsii-calc-base-of-base/package.json +++ b/packages/@scope/jsii-calc-base-of-base/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-base-of-base", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": "An example transitive dependency for jsii-calc.", "license": "Apache-2.0", @@ -30,9 +30,9 @@ }, "devDependencies": { "@types/node": "^10.17.13", - "jsii": "^0.21.0", - "jsii-build-tools": "^0.21.0", - "jsii-rosetta": "^0.21.0" + "jsii": "^0.21.1", + "jsii-build-tools": "^0.21.1", + "jsii-rosetta": "^0.21.1" }, "jsii": { "outdir": "dist", diff --git a/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii b/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii index 5509a86b9c..e6cd5d2b32 100644 --- a/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii +++ b/packages/@scope/jsii-calc-base-of-base/test/assembly.jsii @@ -9,7 +9,7 @@ }, "description": "An example transitive dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.21.0", + "jsiiVersion": "0.21.1", "license": "Apache-2.0", "name": "@scope/jsii-calc-base-of-base", "repository": { @@ -110,6 +110,6 @@ ] } }, - "version": "0.21.0", - "fingerprint": "gc+tOk76xdogG3x794Ew557lXWpK4UI1oBCc2hUknW4=" + "version": "0.21.1", + "fingerprint": "MYCZai+u0ljJScDCCwyPCMmCmxOoNrBvurlUPKcD1Bg=" } diff --git a/packages/@scope/jsii-calc-base/CHANGELOG.md b/packages/@scope/jsii-calc-base/CHANGELOG.md index c918193b29..e80c57cc86 100644 --- a/packages/@scope/jsii-calc-base/CHANGELOG.md +++ b/packages/@scope/jsii-calc-base/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @scope/jsii-calc-base + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/@scope/jsii-calc-base/package.json b/packages/@scope/jsii-calc-base/package.json index 57f4d8880c..b284558b9b 100644 --- a/packages/@scope/jsii-calc-base/package.json +++ b/packages/@scope/jsii-calc-base/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-base", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": "An example direct dependency for jsii-calc.", "license": "Apache-2.0", @@ -29,16 +29,16 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "dependencies": { - "@scope/jsii-calc-base-of-base": "^0.21.0" + "@scope/jsii-calc-base-of-base": "^0.21.1" }, "peerDependencies": { - "@scope/jsii-calc-base-of-base": "^0.21.0" + "@scope/jsii-calc-base-of-base": "^0.21.1" }, "devDependencies": { "@types/node": "^10.17.13", - "jsii": "^0.21.0", - "jsii-build-tools": "^0.21.0", - "jsii-rosetta": "^0.21.0" + "jsii": "^0.21.1", + "jsii-build-tools": "^0.21.1", + "jsii-rosetta": "^0.21.1" }, "jsii": { "outdir": "dist", diff --git a/packages/@scope/jsii-calc-base/test/assembly.jsii b/packages/@scope/jsii-calc-base/test/assembly.jsii index 50f3d36812..94da22c9f3 100644 --- a/packages/@scope/jsii-calc-base/test/assembly.jsii +++ b/packages/@scope/jsii-calc-base/test/assembly.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base-of-base": "^0.21.0" + "@scope/jsii-calc-base-of-base": "^0.21.1" }, "dependencyClosure": { "@scope/jsii-calc-base-of-base": { @@ -36,7 +36,7 @@ }, "description": "An example direct dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.21.0", + "jsiiVersion": "0.21.1", "license": "Apache-2.0", "name": "@scope/jsii-calc-base", "repository": { @@ -150,6 +150,6 @@ "name": "IBaseInterface" } }, - "version": "0.21.0", - "fingerprint": "UFKm7HEKZJLtxjjWNjjVYwjd5k15lWSp12rN7EaeM2M=" + "version": "0.21.1", + "fingerprint": "lpmaMW3fo7fGqAeGGeohwt/fB7uAJcbAZOoVmGOPQcI=" } diff --git a/packages/@scope/jsii-calc-lib/CHANGELOG.md b/packages/@scope/jsii-calc-lib/CHANGELOG.md index 6586a9f5bf..aede09acca 100644 --- a/packages/@scope/jsii-calc-lib/CHANGELOG.md +++ b/packages/@scope/jsii-calc-lib/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package @scope/jsii-calc-lib + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/@scope/jsii-calc-lib/package.json b/packages/@scope/jsii-calc-lib/package.json index 28dfe531bf..e54fd4b553 100644 --- a/packages/@scope/jsii-calc-lib/package.json +++ b/packages/@scope/jsii-calc-lib/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-lib", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": "A simple calcuator library built on JSII.", "deprecated": "Really just deprecated for shows...", @@ -31,16 +31,16 @@ "test:update": "npm run build && UPDATE_DIFF=1 npm run test" }, "dependencies": { - "@scope/jsii-calc-base": "^0.21.0" + "@scope/jsii-calc-base": "^0.21.1" }, "peerDependencies": { - "@scope/jsii-calc-base": "^0.21.0" + "@scope/jsii-calc-base": "^0.21.1" }, "devDependencies": { "@types/node": "^10.17.13", - "jsii": "^0.21.0", - "jsii-build-tools": "^0.21.0", - "jsii-rosetta": "^0.21.0" + "jsii": "^0.21.1", + "jsii-build-tools": "^0.21.1", + "jsii-rosetta": "^0.21.1" }, "jsii": { "outdir": "dist", diff --git a/packages/@scope/jsii-calc-lib/test/assembly.jsii b/packages/@scope/jsii-calc-lib/test/assembly.jsii index 4131b3af4e..7858f26651 100644 --- a/packages/@scope/jsii-calc-lib/test/assembly.jsii +++ b/packages/@scope/jsii-calc-lib/test/assembly.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base": "^0.21.0" + "@scope/jsii-calc-base": "^0.21.1" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -62,7 +62,7 @@ "stability": "deprecated" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.21.0", + "jsiiVersion": "0.21.1", "license": "Apache-2.0", "name": "@scope/jsii-calc-lib", "repository": { @@ -515,6 +515,6 @@ ] } }, - "version": "0.21.0", - "fingerprint": "dxpsB5mfcQmuiNM+dCx35gM4b2sTWZHe02je7WyNeqA=" + "version": "0.21.1", + "fingerprint": "rAMRqdC/iKw1UR2fPbmrpeag3N0/JdJspfKUuHBStTA=" } diff --git a/packages/codemaker/CHANGELOG.md b/packages/codemaker/CHANGELOG.md index b0b90c3f4c..eed430f65c 100644 --- a/packages/codemaker/CHANGELOG.md +++ b/packages/codemaker/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package codemaker + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package codemaker diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index 52ae48d64a..16e0747414 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -1,6 +1,6 @@ { "name": "codemaker", - "version": "0.21.0", + "version": "0.21.1", "description": "A tiny utility for generating source code", "license": "Apache-2.0", "author": { diff --git a/packages/jsii-calc/CHANGELOG.md b/packages/jsii-calc/CHANGELOG.md index 0032bdbf93..da503a783a 100644 --- a/packages/jsii-calc/CHANGELOG.md +++ b/packages/jsii-calc/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package jsii-calc + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index c88a500924..1fd6a11f33 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -1,6 +1,6 @@ { "name": "jsii-calc", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": "A simple calcuator built on JSII.", "stability": "experimental", @@ -37,20 +37,20 @@ }, "dependencies": { "@fixtures/jsii-calc-bundled": "file:../@fixtures/jsii-calc-bundled", - "@scope/jsii-calc-base": "^0.21.0", - "@scope/jsii-calc-base-of-base": "^0.21.0", - "@scope/jsii-calc-lib": "^0.21.0" + "@scope/jsii-calc-base": "^0.21.1", + "@scope/jsii-calc-base-of-base": "^0.21.1", + "@scope/jsii-calc-lib": "^0.21.1" }, "peerDependencies": { - "@scope/jsii-calc-base": "^0.21.0", - "@scope/jsii-calc-base-of-base": "^0.21.0", - "@scope/jsii-calc-lib": "^0.21.0" + "@scope/jsii-calc-base": "^0.21.1", + "@scope/jsii-calc-base-of-base": "^0.21.1", + "@scope/jsii-calc-lib": "^0.21.1" }, "devDependencies": { "@types/node": "^10.17.13", - "jsii": "^0.21.0", - "jsii-build-tools": "^0.21.0", - "jsii-rosetta": "^0.21.0" + "jsii": "^0.21.1", + "jsii-build-tools": "^0.21.1", + "jsii-rosetta": "^0.21.1" }, "jsii": { "outdir": "dist", diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii index d4913cf5d4..684f13d879 100644 --- a/packages/jsii-calc/test/assembly.jsii +++ b/packages/jsii-calc/test/assembly.jsii @@ -34,9 +34,9 @@ } ], "dependencies": { - "@scope/jsii-calc-base": "^0.21.0", - "@scope/jsii-calc-base-of-base": "^0.21.0", - "@scope/jsii-calc-lib": "^0.21.0" + "@scope/jsii-calc-base": "^0.21.1", + "@scope/jsii-calc-base-of-base": "^0.21.1", + "@scope/jsii-calc-lib": "^0.21.1" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -113,7 +113,7 @@ "stability": "experimental" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.21.0", + "jsiiVersion": "0.21.1", "keywords": [ "aws", "jsii", @@ -12021,6 +12021,6 @@ "namespace": "composition.CompositeOperation" } }, - "version": "0.21.0", - "fingerprint": "cn1L9SnQU+2uMWZamhMUSZTPjlBniLlcQAlS50AXY2Q=" + "version": "0.21.1", + "fingerprint": "hHLKBWxZxJFgQd6fzw6Y3pkCRyKQpCYH15r+6b3ChwY=" } diff --git a/packages/jsii-config/CHANGELOG.md b/packages/jsii-config/CHANGELOG.md index ec82f68015..3f82917904 100644 --- a/packages/jsii-config/CHANGELOG.md +++ b/packages/jsii-config/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package jsii-config + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package jsii-config diff --git a/packages/jsii-config/package.json b/packages/jsii-config/package.json index 649ebe7638..81751a5ba2 100644 --- a/packages/jsii-config/package.json +++ b/packages/jsii-config/package.json @@ -1,6 +1,6 @@ { "name": "jsii-config", - "version": "0.21.0", + "version": "0.21.1", "description": "CLI tool for configuring jsii module configuration in package.json", "main": "lib/index.js", "repository": "https://github.com/aws/jsii", @@ -29,9 +29,9 @@ "typescript": "~3.7.4" }, "dependencies": { - "@jsii/spec": "^0.21.0", + "@jsii/spec": "^0.21.1", "inquirer": "^7.0.1", - "yargs": "^15.0.2" + "yargs": "^15.1.0" }, "jest": { "collectCoverage": true, diff --git a/packages/jsii-diff/CHANGELOG.md b/packages/jsii-diff/CHANGELOG.md index d50ed7936e..cc7fc48e84 100644 --- a/packages/jsii-diff/CHANGELOG.md +++ b/packages/jsii-diff/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package jsii-diff + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package jsii-diff diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index 2a154b801e..33e9443e25 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -1,6 +1,6 @@ { "name": "jsii-diff", - "version": "0.21.0", + "version": "0.21.1", "description": "Assembly comparison for jsii", "license": "Apache-2.0", "author": { @@ -32,12 +32,12 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^0.21.0", + "@jsii/spec": "^0.21.1", "fs-extra": "^8.1.0", - "jsii-reflect": "^0.21.0", + "jsii-reflect": "^0.21.1", "log4js": "^6.1.0", "typescript": "~3.7.4", - "yargs": "^15.0.2" + "yargs": "^15.1.0" }, "devDependencies": { "@types/fs-extra": "^8.0.1", @@ -49,8 +49,8 @@ "eslint": "^6.8.0", "jest": "^24.9.0", "jest-expect-message": "^1.0.2", - "jsii": "^0.21.0", - "jsii-build-tools": "^0.21.0" + "jsii": "^0.21.1", + "jsii-build-tools": "^0.21.1" }, "jest": { "collectCoverage": true, diff --git a/packages/jsii-pacmak/CHANGELOG.md b/packages/jsii-pacmak/CHANGELOG.md index 47f71be4cf..f98c1aa766 100644 --- a/packages/jsii-pacmak/CHANGELOG.md +++ b/packages/jsii-pacmak/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package jsii-pacmak + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 8d90653ad1..1ccc45d9ce 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -1,6 +1,6 @@ { "name": "jsii-pacmak", - "version": "0.21.0", + "version": "0.21.1", "description": "A code generation framework for jsii backend languages", "license": "Apache-2.0", "author": { @@ -34,25 +34,25 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^0.21.0", + "@jsii/spec": "^0.21.1", "camelcase": "^5.1.3", "clone": "^2.1.2", - "codemaker": "^0.21.0", + "codemaker": "^0.21.1", "commonmark": "^0.29.0", "escape-string-regexp": "^2.0.0", "fs-extra": "^8.1.0", - "jsii-reflect": "^0.21.0", - "jsii-rosetta": "^0.21.0", + "jsii-reflect": "^0.21.1", + "jsii-rosetta": "^0.21.1", "semver": "^7.1.1", "spdx-license-list": "^6.1.0", "xmlbuilder": "^13.0.2", - "yargs": "^15.0.2" + "yargs": "^15.1.0" }, "devDependencies": { - "@jsii/dotnet-jsonmodel": "^0.21.0", - "@jsii/dotnet-runtime": "^0.21.0", - "@jsii/java-runtime": "^0.21.0", - "@scope/jsii-calc-lib": "^0.21.0", + "@jsii/dotnet-jsonmodel": "^0.21.1", + "@jsii/dotnet-runtime": "^0.21.1", + "@jsii/java-runtime": "^0.21.1", + "@scope/jsii-calc-lib": "^0.21.1", "@types/clone": "^0.1.30", "@types/commonmark": "^0.27.4", "@types/fs-extra": "^8.0.1", @@ -63,8 +63,8 @@ "@types/yargs": "^13.0.4", "eslint": "^6.8.0", "jest": "^24.9.0", - "jsii-build-tools": "^0.21.0", - "jsii-calc": "^0.21.0", + "jsii-build-tools": "^0.21.1", + "jsii-calc": "^0.21.1", "mock-fs": "^4.10.4", "typescript": "~3.7.4" }, diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii index 5509a86b9c..e6cd5d2b32 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/.jsii @@ -9,7 +9,7 @@ }, "description": "An example transitive dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.21.0", + "jsiiVersion": "0.21.1", "license": "Apache-2.0", "name": "@scope/jsii-calc-base-of-base", "repository": { @@ -110,6 +110,6 @@ ] } }, - "version": "0.21.0", - "fingerprint": "gc+tOk76xdogG3x794Ew557lXWpK4UI1oBCc2hUknW4=" + "version": "0.21.1", + "fingerprint": "MYCZai+u0ljJScDCCwyPCMmCmxOoNrBvurlUPKcD1Bg=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj index 1c954ef7ba..f43c0a452c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId.csproj @@ -4,7 +4,7 @@ An example transitive dependency for jsii-calc. Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId Apache-2.0 - 0.21.0 + 0.21.1 Amazon Web Services Amazon Web Services @@ -21,10 +21,10 @@ netcoreapp3.0 - + - + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs index 11b2018994..270316c30c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("@scope/jsii-calc-base-of-base", "0.21.0", "scope-jsii-calc-base-of-base-0.21.0.tgz")] +[assembly: JsiiAssembly("@scope/jsii-calc-base-of-base", "0.21.1", "scope-jsii-calc-base-of-base-0.21.1.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-0.21.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-0.21.1.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-0.21.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BaseOfBasePackageId/scope-jsii-calc-base-of-base-0.21.1.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml index 68998b5771..7d314ab1e1 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/pom.xml @@ -27,7 +27,7 @@ software.amazon.jsii.tests calculator-base-of-base - 0.21.0 + 0.21.1 jar UTF-8 @@ -36,7 +36,7 @@ software.amazon.jsii jsii-runtime - [0.21.0,0.22.0) + [0.21.1,0.22.0) javax.annotation diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java index b198933ee2..18d41e1d93 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/java/software/amazon/jsii/tests/calculator/baseofbase/$Module.java @@ -4,7 +4,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("@scope/jsii-calc-base-of-base", "0.21.0", $Module.class, "jsii-calc-base-of-base@0.21.0.jsii.tgz"); + super("@scope/jsii-calc-base-of-base", "0.21.1", $Module.class, "jsii-calc-base-of-base@0.21.1.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/java/src/main/resources/software/amazon/jsii/tests/calculator/baseofbase/jsii-calc-base-of-base@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/js/jsii-calc-base-of-base@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py index 422e0026d3..77b3a2f851 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "scope.jsii-calc-base-of-base", - "version": "0.21.0", + "version": "0.21.1", "description": "An example transitive dependency for jsii-calc.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "scope.jsii_calc_base_of_base._jsii": [ - "jsii-calc-base-of-base@0.21.0.jsii.tgz" + "jsii-calc-base-of-base@0.21.1.jsii.tgz" ], "scope.jsii_calc_base_of_base": [ "py.typed" @@ -30,7 +30,7 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.21.0", + "jsii~=0.21.1", "publication>=0.0.3" ], "classifiers": [ diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py index 3d20d4c7ea..00f841b5e5 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/__init__.py @@ -8,7 +8,7 @@ import jsii.compat import publication -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base-of-base", "0.21.0", __name__, "jsii-calc-base-of-base@0.21.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base-of-base", "0.21.1", __name__, "jsii-calc-base-of-base@0.21.1.jsii.tgz") @jsii.interface(jsii_type="@scope/jsii-calc-base-of-base.IVeryBaseInterface") diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base-of-base/python/src/scope/jsii_calc_base_of_base/_jsii/jsii-calc-base-of-base@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii index 50f3d36812..94da22c9f3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base-of-base": "^0.21.0" + "@scope/jsii-calc-base-of-base": "^0.21.1" }, "dependencyClosure": { "@scope/jsii-calc-base-of-base": { @@ -36,7 +36,7 @@ }, "description": "An example direct dependency for jsii-calc.", "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.21.0", + "jsiiVersion": "0.21.1", "license": "Apache-2.0", "name": "@scope/jsii-calc-base", "repository": { @@ -150,6 +150,6 @@ "name": "IBaseInterface" } }, - "version": "0.21.0", - "fingerprint": "UFKm7HEKZJLtxjjWNjjVYwjd5k15lWSp12rN7EaeM2M=" + "version": "0.21.1", + "fingerprint": "lpmaMW3fo7fGqAeGGeohwt/fB7uAJcbAZOoVmGOPQcI=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj index 3332be9885..fc3cc24ac2 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId.csproj @@ -4,7 +4,7 @@ An example direct dependency for jsii-calc. Amazon.JSII.Tests.CalculatorPackageId.BasePackageId Apache-2.0 - 0.21.0 + 0.21.1 Amazon Web Services Amazon Web Services @@ -21,11 +21,11 @@ netcoreapp3.0 - + - - + + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs index 4a2b12a08f..49ce11642e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("@scope/jsii-calc-base", "0.21.0", "scope-jsii-calc-base-0.21.0.tgz")] +[assembly: JsiiAssembly("@scope/jsii-calc-base", "0.21.1", "scope-jsii-calc-base-0.21.1.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.21.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.21.1.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.21.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.21.1.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml index 578ffad4e1..8eda9c9b8d 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/pom.xml @@ -27,7 +27,7 @@ software.amazon.jsii.tests calculator-base - 0.21.0 + 0.21.1 jar UTF-8 @@ -36,12 +36,12 @@ software.amazon.jsii.tests calculator-base-of-base - [0.21.0,0.22.0) + [0.21.1,0.22.0) software.amazon.jsii jsii-runtime - [0.21.0,0.22.0) + [0.21.1,0.22.0) javax.annotation diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java index 23129af6ff..cd88e96488 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/java/software/amazon/jsii/tests/calculator/base/$Module.java @@ -7,7 +7,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("@scope/jsii-calc-base", "0.21.0", $Module.class, "jsii-calc-base@0.21.0.jsii.tgz"); + super("@scope/jsii-calc-base", "0.21.1", $Module.class, "jsii-calc-base@0.21.1.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/jsii-calc-base@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py index 58eeb7f536..c1e6b8a033 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "scope.jsii-calc-base", - "version": "0.21.0", + "version": "0.21.1", "description": "An example direct dependency for jsii-calc.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "scope.jsii_calc_base._jsii": [ - "jsii-calc-base@0.21.0.jsii.tgz" + "jsii-calc-base@0.21.1.jsii.tgz" ], "scope.jsii_calc_base": [ "py.typed" @@ -30,9 +30,9 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.21.0", + "jsii~=0.21.1", "publication>=0.0.3", - "scope.jsii-calc-base-of-base>=0.21.0, <0.22.0" + "scope.jsii-calc-base-of-base>=0.21.1, <0.22.0" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py index 7e0dc64950..d71ec69cf7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/__init__.py @@ -10,7 +10,7 @@ import scope.jsii_calc_base_of_base -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base", "0.21.0", __name__, "jsii-calc-base@0.21.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base", "0.21.1", __name__, "jsii-calc-base@0.21.1.jsii.tgz") class Base(metaclass=jsii.JSIIAbstractClass, jsii_type="@scope/jsii-calc-base.Base"): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii index 4131b3af4e..7858f26651 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "dependencies": { - "@scope/jsii-calc-base": "^0.21.0" + "@scope/jsii-calc-base": "^0.21.1" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -62,7 +62,7 @@ "stability": "deprecated" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.21.0", + "jsiiVersion": "0.21.1", "license": "Apache-2.0", "name": "@scope/jsii-calc-lib", "repository": { @@ -515,6 +515,6 @@ ] } }, - "version": "0.21.0", - "fingerprint": "dxpsB5mfcQmuiNM+dCx35gM4b2sTWZHe02je7WyNeqA=" + "version": "0.21.1", + "fingerprint": "rAMRqdC/iKw1UR2fPbmrpeag3N0/JdJspfKUuHBStTA=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj index 7a46241226..5b9e1bba01 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId.csproj @@ -4,7 +4,7 @@ A simple calcuator library built on JSII. (Stability: Deprecated) Amazon.JSII.Tests.CalculatorPackageId.LibPackageId Apache-2.0 - 0.21.0-devpreview + 0.21.1-devpreview Amazon Web Services Amazon Web Services @@ -21,11 +21,11 @@ netcoreapp3.0 - + - - + + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs index 14ff93f942..07edfc3475 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("@scope/jsii-calc-lib", "0.21.0", "scope-jsii-calc-lib-0.21.0.tgz")] +[assembly: JsiiAssembly("@scope/jsii-calc-lib", "0.21.1", "scope-jsii-calc-lib-0.21.1.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.21.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.21.1.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.21.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.21.1.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml index a453cd1b5d..37fe99673a 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/pom.xml @@ -27,7 +27,7 @@ software.amazon.jsii.tests calculator-lib - 0.21.0.DEVPREVIEW + 0.21.1.DEVPREVIEW jar UTF-8 @@ -36,12 +36,12 @@ software.amazon.jsii.tests calculator-base - [0.21.0,0.22.0) + [0.21.1,0.22.0) software.amazon.jsii jsii-runtime - [0.21.0,0.22.0) + [0.21.1,0.22.0) javax.annotation diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java index f4b7429d17..a3f31de2f3 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/java/software/amazon/jsii/tests/calculator/lib/$Module.java @@ -7,7 +7,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("@scope/jsii-calc-lib", "0.21.0", $Module.class, "jsii-calc-lib@0.21.0.jsii.tgz"); + super("@scope/jsii-calc-lib", "0.21.1", $Module.class, "jsii-calc-lib@0.21.1.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/jsii-calc-lib@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py index cd3c99ac25..b25a54cbb7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "scope.jsii-calc-lib", - "version": "0.21.0", + "version": "0.21.1", "description": "A simple calcuator library built on JSII.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "scope.jsii_calc_lib._jsii": [ - "jsii-calc-lib@0.21.0.jsii.tgz" + "jsii-calc-lib@0.21.1.jsii.tgz" ], "scope.jsii_calc_lib": [ "py.typed" @@ -30,9 +30,9 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.21.0", + "jsii~=0.21.1", "publication>=0.0.3", - "scope.jsii-calc-base>=0.21.0, <0.22.0" + "scope.jsii-calc-base>=0.21.1, <0.22.0" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py index d64a21e452..906d17c58b 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/__init__.py @@ -10,7 +10,7 @@ import scope.jsii_calc_base -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "0.21.0", __name__, "jsii-calc-lib@0.21.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "0.21.1", __name__, "jsii-calc-lib@0.21.1.jsii.tgz") @jsii.enum(jsii_type="@scope/jsii-calc-lib.EnumFromScopedModule") diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii index d4913cf5d4..684f13d879 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/.jsii @@ -34,9 +34,9 @@ } ], "dependencies": { - "@scope/jsii-calc-base": "^0.21.0", - "@scope/jsii-calc-base-of-base": "^0.21.0", - "@scope/jsii-calc-lib": "^0.21.0" + "@scope/jsii-calc-base": "^0.21.1", + "@scope/jsii-calc-base-of-base": "^0.21.1", + "@scope/jsii-calc-lib": "^0.21.1" }, "dependencyClosure": { "@scope/jsii-calc-base": { @@ -113,7 +113,7 @@ "stability": "experimental" }, "homepage": "https://github.com/aws/jsii", - "jsiiVersion": "0.21.0", + "jsiiVersion": "0.21.1", "keywords": [ "aws", "jsii", @@ -12021,6 +12021,6 @@ "namespace": "composition.CompositeOperation" } }, - "version": "0.21.0", - "fingerprint": "cn1L9SnQU+2uMWZamhMUSZTPjlBniLlcQAlS50AXY2Q=" + "version": "0.21.1", + "fingerprint": "hHLKBWxZxJFgQd6fzw6Y3pkCRyKQpCYH15r+6b3ChwY=" } diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj index 064690b3dc..b43a1bb2ee 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/Amazon.JSII.Tests.CalculatorPackageId.csproj @@ -5,7 +5,7 @@ https://sdk-for-net.amazonwebservices.com/images/AWSLogo128x128.png Amazon.JSII.Tests.CalculatorPackageId Apache-2.0 - 0.21.0 + 0.21.1 Amazon Web Services Amazon Web Services @@ -23,13 +23,13 @@ netcoreapp3.0 - + - - - - + + + + 0612,0618 diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs index cc5514dffc..cb40bc290e 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs +++ b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/AssemblyInfo.cs @@ -1,3 +1,3 @@ using Amazon.JSII.Runtime.Deputy; -[assembly: JsiiAssembly("jsii-calc", "0.21.0", "jsii-calc-0.21.0.tgz")] +[assembly: JsiiAssembly("jsii-calc", "0.21.1", "jsii-calc-0.21.1.tgz")] diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.21.0.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.21.1.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.21.0.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.21.1.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml b/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml index ca1e09283b..3073f790c0 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/pom.xml @@ -48,7 +48,7 @@ software.amazon.jsii.tests calculator - 0.21.0 + 0.21.1 jar UTF-8 @@ -57,22 +57,22 @@ software.amazon.jsii.tests calculator-base - [0.21.0,0.22.0) + [0.21.1,0.22.0) software.amazon.jsii.tests calculator-base-of-base - [0.21.0,0.22.0) + [0.21.1,0.22.0) software.amazon.jsii.tests calculator-lib - [0.21.0.DEVPREVIEW,0.22.0.DEVPREVIEW) + [0.21.1.DEVPREVIEW,0.22.0.DEVPREVIEW) software.amazon.jsii jsii-runtime - [0.21.0,0.22.0) + [0.21.1,0.22.0) javax.annotation diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java index d350e44df5..e15c206dc1 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java +++ b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/java/software/amazon/jsii/tests/calculator/$Module.java @@ -7,7 +7,7 @@ public final class $Module extends JsiiModule { public $Module() { - super("jsii-calc", "0.21.0", $Module.class, "jsii-calc@0.21.0.jsii.tgz"); + super("jsii-calc", "0.21.1", $Module.class, "jsii-calc@0.21.1.jsii.tgz"); } @Override diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.21.1.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py index df82a21d33..06b222b3cb 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/setup.py @@ -4,7 +4,7 @@ kwargs = json.loads(""" { "name": "jsii-calc", - "version": "0.21.0", + "version": "0.21.1", "description": "A simple calcuator built on JSII.", "license": "Apache-2.0", "url": "https://github.com/aws/jsii", @@ -22,7 +22,7 @@ ], "package_data": { "jsii_calc._jsii": [ - "jsii-calc@0.21.0.jsii.tgz" + "jsii-calc@0.21.1.jsii.tgz" ], "jsii_calc": [ "py.typed" @@ -30,11 +30,11 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.21.0", + "jsii~=0.21.1", "publication>=0.0.3", - "scope.jsii-calc-base>=0.21.0, <0.22.0", - "scope.jsii-calc-base-of-base>=0.21.0, <0.22.0", - "scope.jsii-calc-lib>=0.21.0, <0.22.0" + "scope.jsii-calc-base>=0.21.1, <0.22.0", + "scope.jsii-calc-base-of-base>=0.21.1, <0.22.0", + "scope.jsii-calc-lib>=0.21.1, <0.22.0" ], "classifiers": [ "Intended Audience :: Developers", diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py index 64d5082c80..16049ff0b4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py +++ b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/__init__.py @@ -41,7 +41,7 @@ import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.21.0", __name__, "jsii-calc@0.21.0.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.21.1", __name__, "jsii-calc@0.21.1.jsii.tgz") class AbstractClassBase(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.AbstractClassBase"): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.21.0.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.21.1.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.21.0.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.21.1.jsii.tgz diff --git a/packages/jsii-reflect/CHANGELOG.md b/packages/jsii-reflect/CHANGELOG.md index 82bc55c67c..8287db081f 100644 --- a/packages/jsii-reflect/CHANGELOG.md +++ b/packages/jsii-reflect/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package jsii-reflect + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index cdb392d73a..e42ccde430 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -1,6 +1,6 @@ { "name": "jsii-reflect", - "version": "0.21.0", + "version": "0.21.1", "description": "strongly-typed reflection library and tools for jsii", "license": "Apache-2.0", "author": { @@ -33,23 +33,23 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^0.21.0", + "@jsii/spec": "^0.21.1", "colors": "^1.4.0", "fs-extra": "^8.1.0", - "oo-ascii-tree": "^0.21.0", - "yargs": "^15.0.2" + "oo-ascii-tree": "^0.21.1", + "yargs": "^15.1.0" }, "devDependencies": { - "@scope/jsii-calc-lib": "^0.21.0", + "@scope/jsii-calc-lib": "^0.21.1", "@types/fs-extra": "^8.0.1", "@types/jest": "^24.0.25", "@types/node": "^10.17.13", "@types/yargs": "^13.0.4", "eslint": "^6.8.0", "jest": "^24.9.0", - "jsii": "^0.21.0", - "jsii-build-tools": "^0.21.0", - "jsii-calc": "^0.21.0", + "jsii": "^0.21.1", + "jsii-build-tools": "^0.21.1", + "jsii-calc": "^0.21.1", "typescript": "~3.7.4" }, "jest": { diff --git a/packages/jsii-rosetta/CHANGELOG.md b/packages/jsii-rosetta/CHANGELOG.md index 61288383f5..737dca2c43 100644 --- a/packages/jsii-rosetta/CHANGELOG.md +++ b/packages/jsii-rosetta/CHANGELOG.md @@ -3,6 +3,17 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + + +### Bug Fixes + +* **rosetta:** crashes on behavioral interfaces ([#1169](https://github.com/aws/jsii/issues/1169)) ([5f3e9e0](https://github.com/aws/jsii/commit/5f3e9e048ba60b278627e9d4d69550bb10dadfd1)) + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/jsii-rosetta/lib/commands/extract.ts b/packages/jsii-rosetta/lib/commands/extract.ts index 6d994b3f00..4200342490 100644 --- a/packages/jsii-rosetta/lib/commands/extract.ts +++ b/packages/jsii-rosetta/lib/commands/extract.ts @@ -96,12 +96,25 @@ async function translateAll(snippets: IterableIterator, inclu export function singleThreadedTranslateAll(snippets: IterableIterator, includeCompilerDiagnostics: boolean): TranslateAllResult { const translatedSnippets = new Array(); + const failures = new Array(); + const translator = new Translator(includeCompilerDiagnostics); for (const block of snippets) { - translatedSnippets.push(translator.translate(block)); + try { + translatedSnippets.push(translator.translate(block)); + } catch(e) { + failures.push({ + category: ts.DiagnosticCategory.Error, + code: 999, + messageText: `rosetta: error translating snippet: ${e}\n${block.completeSource}`, + file: undefined, + start: undefined, + length: undefined, + }); + } } - return { translatedSnippets, diagnostics: translator.diagnostics }; + return { translatedSnippets, diagnostics: [...translator.diagnostics, ...failures] }; } /** diff --git a/packages/jsii-rosetta/lib/languages/csharp.ts b/packages/jsii-rosetta/lib/languages/csharp.ts index 81eeed4443..9756c10cf7 100644 --- a/packages/jsii-rosetta/lib/languages/csharp.ts +++ b/packages/jsii-rosetta/lib/languages/csharp.ts @@ -24,6 +24,11 @@ interface CSharpLanguageContext { */ readonly inStructInterface: boolean; + /** + * So we know how to render property signatures + */ + readonly inRegularInterface: boolean; + /** * So we know how to render property assignments */ @@ -53,9 +58,12 @@ interface CSharpLanguageContext { type CSharpRenderer = AstRenderer; export class CSharpVisitor extends DefaultVisitor { + public readonly language = 'csharp'; + public readonly defaultContext = { propertyOrMethod: false, inStructInterface: false, + inRegularInterface: false, inKeyValueList: false, stringAsIdentifier: false, identifierAsString: false, @@ -136,6 +144,17 @@ export class CSharpVisitor extends DefaultVisitor { return this.functionLike(node, renderer); } + public methodSignature(node: ts.MethodSignature, renderer: CSharpRenderer): OTree { + return new OTree([ + this.renderTypeNode(node.type, false, renderer), + ' ', + renderer.updateContext({ propertyOrMethod: true }).convert(node.name), + '(', + new OTree([], renderer.convertAll(node.parameters), { separator: ', ' }), + ');' + ], [], { canBreakLine: true }); + } + // tslint:disable-next-line:max-line-length public functionLike(node: ts.FunctionLikeDeclarationBase, renderer: CSharpRenderer, opts: { isConstructor?: boolean } = {}): OTree { const methodName = opts.isConstructor ? renderer.currentContext.currentClassName || 'MyClass' : renderer.updateContext({ propertyOrMethod: true }).convert(node.name); @@ -248,13 +267,15 @@ export class CSharpVisitor extends DefaultVisitor { } public propertySignature(node: ts.PropertySignature, renderer: CSharpRenderer): OTree { + const canSet = renderer.currentContext.inStructInterface || !isReadOnly(node); + return new OTree([ - visibility(node), - ' ', + !renderer.currentContext.inRegularInterface ? `${visibility(node)} ` : NO_SYNTAX, this.renderTypeNode(node.type, node.questionToken !== undefined, renderer), ' ', renderer.updateContext({ propertyOrMethod: true }).convert(node.name), - ';', + ' ', + canSet ? '{ get; set; }' : '{ get; }', ], [], { canBreakLine: true }); } @@ -308,7 +329,7 @@ export class CSharpVisitor extends DefaultVisitor { ...this.classHeritage(node, renderer), '\n{', ], - renderer.convertAll(node.members), + renderer.updateContext({ inRegularInterface: true }).convertAll(node.members), { indent: 4, canBreakLine: true, @@ -503,7 +524,7 @@ function typeNameFromType(type: ts.Type, fallback: string): string { } function csharpTypeName(jsTypeName: string | undefined): string { - if (jsTypeName === undefined) { return '???'; } + if (jsTypeName === undefined) { return 'void'; } switch (jsTypeName) { case 'number': return 'int'; case 'any': return 'object'; diff --git a/packages/jsii-rosetta/lib/languages/default.ts b/packages/jsii-rosetta/lib/languages/default.ts index 6cc274435c..f62853ef69 100644 --- a/packages/jsii-rosetta/lib/languages/default.ts +++ b/packages/jsii-rosetta/lib/languages/default.ts @@ -5,12 +5,14 @@ import { ImportStatement } from '../typescript/imports'; import { isStructInterface, isStructType } from '../jsii/jsii-utils'; import { mapElementType, typeWithoutUndefinedUnion } from '../typescript/types'; import { voidExpressionString } from '../typescript/ast-utils'; +import { TargetLanguage } from '.'; /** * A basic visitor that applies for most curly-braces-based languages */ export abstract class DefaultVisitor implements AstHandler { public abstract readonly defaultContext: C; + public abstract readonly language: TargetLanguage; public abstract mergeContext(old: C, update: C): C; @@ -240,6 +242,10 @@ export abstract class DefaultVisitor implements AstHandler { return this.notImplemented(node, context); } + public methodSignature(node: ts.MethodSignature, context: AstRenderer): OTree { + return this.notImplemented(node, context); + } + public asExpression(node: ts.AsExpression, context: AstRenderer): OTree { return this.notImplemented(node, context); } @@ -284,7 +290,7 @@ export abstract class DefaultVisitor implements AstHandler { } private notImplemented(node: ts.Node, context: AstRenderer) { - context.reportUnsupported(node); + context.reportUnsupported(node, this.language); return nimpl(node, context); } } diff --git a/packages/jsii-rosetta/lib/languages/java.ts b/packages/jsii-rosetta/lib/languages/java.ts index c815978851..e8f09000d6 100644 --- a/packages/jsii-rosetta/lib/languages/java.ts +++ b/packages/jsii-rosetta/lib/languages/java.ts @@ -1,7 +1,7 @@ import * as ts from 'typescript'; import { DefaultVisitor } from './default'; import { AstRenderer } from '../renderer'; -import { OTree } from '../o-tree'; +import { OTree, NO_SYNTAX } from '../o-tree'; import { builtInTypeName, mapElementType, typeWithoutUndefinedUnion } from '../typescript/types'; import { isReadOnly, matchAst, nodeOfType, quoteStringLiteral, visibility } from '../typescript/ast-utils'; import { ImportStatement } from '../typescript/imports'; @@ -72,11 +72,17 @@ interface InsideTypeDeclaration { * Needed to correctly generate the constructor. */ readonly typeName: ts.Node | undefined; + + /** + * Is this an interface (true) or a class (unset/false) + */ + readonly isInterface?: boolean; } type JavaRenderer = AstRenderer; export class JavaVisitor extends DefaultVisitor { + public readonly language = 'java'; public readonly defaultContext = {}; public mergeContext(old: JavaContext, update: Partial): JavaContext { @@ -110,11 +116,34 @@ export class JavaVisitor extends DefaultVisitor { return this.renderClassDeclaration(node, renderer); } + public regularInterfaceDeclaration(node: ts.InterfaceDeclaration, renderer: JavaRenderer): OTree { + return new OTree( + [ + 'public ', + 'interface ', + renderer.convert(node.name), + ...this.typeHeritage(node, renderer.updateContext({ ignorePropertyPrefix: true })), + ' {', + ], + renderer + .updateContext({ insideTypeDeclaration: { typeName: node.name, isInterface: true } }) + .convertAll(node.members), + { + indent: 4, + canBreakLine: true, + suffix: '\n}', + }, + ); + } + public propertySignature(node: ts.PropertySignature, renderer: JavaRenderer): OTree { const propertyType = this.renderTypeNode(node.type, renderer, 'Object'); const propertyName = renderer.convert(node.name); - const field = new OTree( + const isClass = !renderer.currentContext.insideTypeDeclaration?.isInterface; + const blockSep = isClass ? ' ' : ';'; + + const field = isClass ? new OTree( [], [ 'private ', @@ -126,16 +155,16 @@ export class JavaVisitor extends DefaultVisitor { { canBreakLine: true, }, - ); + ) : NO_SYNTAX; const getter = new OTree( [], [ - 'public ', + isClass ? 'public ' : NO_SYNTAX, propertyType, ' ', - `get${capitalize(renderer.textOf(node.name))}() `, - this.renderBlock([ + `get${capitalize(renderer.textOf(node.name))}()${blockSep}`, + isClass ? this.renderBlock([ new OTree( [ '\n', @@ -146,17 +175,19 @@ export class JavaVisitor extends DefaultVisitor { ';', ], ), - ]), + ]) : NO_SYNTAX, ], { canBreakLine: true, }, ); - const setter = new OTree( + const hasSetter = isClass || !isReadOnly(node); + + const setter = hasSetter ? new OTree( [], [ - 'public ', + isClass ? 'public ' : NO_SYNTAX, renderer.convert(renderer.currentContext.insideTypeDeclaration!.typeName), ' ', propertyName, // don't prefix the setter with `set` - makes it more aligned with JSII builders @@ -164,8 +195,8 @@ export class JavaVisitor extends DefaultVisitor { propertyType, ' ', propertyName, - ') ', - this.renderBlock([ + `)${blockSep}`, + isClass ? this.renderBlock([ new OTree( [ '\n', @@ -186,12 +217,12 @@ export class JavaVisitor extends DefaultVisitor { 'return this;', ], ), - ]), + ]) : NO_SYNTAX, ], { canBreakLine: true, }, - ); + ) : NO_SYNTAX; return new OTree([], [field, getter, setter], { canBreakLine: true, separator: '\n' }); } @@ -234,6 +265,17 @@ export class JavaVisitor extends DefaultVisitor { this.renderTypeNode(node.type, renderer, 'void')); } + public methodSignature(node: ts.MethodSignature, renderer: JavaRenderer): OTree { + return new OTree([ + this.renderTypeNode(node.type, renderer, 'void'), + ' ', + renderer.convert(node.name), + '(', + new OTree([], renderer.convertAll(node.parameters), { separator: ', ' }), + ');', + ], [], { canBreakLine: true }); + } + public parameterDeclaration(node: ts.ParameterDeclaration, renderer: JavaRenderer): OTree { return new OTree([ this.renderTypeNode(node.type, renderer), @@ -472,8 +514,14 @@ export class JavaVisitor extends DefaultVisitor { public propertyAssignment(node: ts.PropertyAssignment, renderer: JavaRenderer): OTree { return renderer.currentContext.inKeyValueList - ? this.singlePropertyInJavaScriptObjectLiteralToJavaMap(node, renderer) - : this.singlePropertyInJavaScriptObjectLiteralToFluentSetters(node, renderer); + ? this.singlePropertyInJavaScriptObjectLiteralToJavaMap(node.name, node.initializer, renderer) + : this.singlePropertyInJavaScriptObjectLiteralToFluentSetters(node.name, node.initializer, renderer); + } + + public shorthandPropertyAssignment(node: ts.ShorthandPropertyAssignment, renderer: JavaRenderer): OTree { + return renderer.currentContext.inKeyValueList + ? this.singlePropertyInJavaScriptObjectLiteralToJavaMap(node.name, node.name, renderer) + : this.singlePropertyInJavaScriptObjectLiteralToFluentSetters(node.name, node.name, renderer); } public propertyAccessExpression(node: ts.PropertyAccessExpression, renderer: JavaRenderer): OTree { @@ -530,13 +578,13 @@ export class JavaVisitor extends DefaultVisitor { ); } - private singlePropertyInJavaScriptObjectLiteralToJavaMap(node: ts.PropertyAssignment, renderer: JavaRenderer): OTree { + private singlePropertyInJavaScriptObjectLiteralToJavaMap(name: ts.Node, initializer: ts.Node, renderer: JavaRenderer): OTree { return new OTree( [], [ - renderer.updateContext({ identifierAsString: true }).convert(node.name), + renderer.updateContext({ identifierAsString: true }).convert(name), ', ', - renderer.updateContext({ inKeyValueList: false }).convert(node.initializer), + renderer.updateContext({ inKeyValueList: false }).convert(initializer), ], { canBreakLine: true, @@ -544,14 +592,14 @@ export class JavaVisitor extends DefaultVisitor { ); } - private singlePropertyInJavaScriptObjectLiteralToFluentSetters(node: ts.PropertyAssignment, renderer: JavaRenderer): OTree { + private singlePropertyInJavaScriptObjectLiteralToFluentSetters(name: ts.Node, initializer: ts.Node, renderer: JavaRenderer): OTree { return new OTree( [], [ '.', - renderer.updateContext({ stringLiteralAsIdentifier: true }).convert(node.name), + renderer.updateContext({ stringLiteralAsIdentifier: true }).convert(name), '(', - renderer.updateContext({ inNewExprWithObjectLiteralAsLastArg: false }).convert(node.initializer), + renderer.updateContext({ inNewExprWithObjectLiteralAsLastArg: false }).convert(initializer), ')', ], { diff --git a/packages/jsii-rosetta/lib/languages/python.ts b/packages/jsii-rosetta/lib/languages/python.ts index 4ee050f89d..0899dc5df6 100644 --- a/packages/jsii-rosetta/lib/languages/python.ts +++ b/packages/jsii-rosetta/lib/languages/python.ts @@ -69,6 +69,7 @@ export interface PythonVisitorOptions { } export class PythonVisitor extends DefaultVisitor { + public readonly language = 'python'; public readonly defaultContext = {}; public constructor(private readonly options: PythonVisitorOptions = {}) { @@ -442,6 +443,11 @@ export class PythonVisitor extends DefaultVisitor { return NO_SYNTAX; } + public methodSignature(_node: ts.MethodSignature, _context: PythonVisitorContext): OTree { + // Does not represent in Python + return NO_SYNTAX; + } + public asExpression(node: ts.AsExpression, context: PythonVisitorContext): OTree { return context.convert(node.expression); } diff --git a/packages/jsii-rosetta/lib/languages/visualize.ts b/packages/jsii-rosetta/lib/languages/visualize.ts index 619b46e7f0..1a81248309 100644 --- a/packages/jsii-rosetta/lib/languages/visualize.ts +++ b/packages/jsii-rosetta/lib/languages/visualize.ts @@ -138,6 +138,10 @@ export class VisualizeAstVisitor implements AstHandler { return this.defaultNode('propertySignature', node, context); } + public methodSignature(node: ts.MethodSignature, context: AstRenderer): OTree { + return this.defaultNode('methodSignature', node, context); + } + public asExpression(node: ts.AsExpression, context: AstRenderer): OTree { return this.defaultNode('asExpression', node, context); } diff --git a/packages/jsii-rosetta/lib/renderer.ts b/packages/jsii-rosetta/lib/renderer.ts index dfe8452eb3..7c608b2d76 100644 --- a/packages/jsii-rosetta/lib/renderer.ts +++ b/packages/jsii-rosetta/lib/renderer.ts @@ -3,6 +3,7 @@ import { NO_SYNTAX, OTree, UnknownSyntax, Span } from './o-tree'; import { commentRangeFromTextRange, extractMaskingVoidExpression, extractShowingVoidExpression, nodeChildren, repeatNewlines, scanText } from './typescript/ast-utils'; import { analyzeImportDeclaration, analyzeImportEquals, ImportStatement } from './typescript/imports'; +import { TargetLanguage } from './languages'; /** * Render a TypeScript AST to some other representation (encoded in OTrees) @@ -136,10 +137,14 @@ export class AstRenderer { }); } - public reportUnsupported(node: ts.Node): void { + public reportUnsupported(node: ts.Node, language: TargetLanguage | undefined): void { const nodeKind = ts.SyntaxKind[node.kind]; // tslint:disable-next-line:max-line-length - this.report(node, `This TypeScript language feature (${nodeKind}) is not supported in examples because we cannot translate it. Please rewrite this example.`); + if (language) { + this.report(node, `This TypeScript feature (${nodeKind}) is not supported in examples because we cannot translate it to ${language}. Please rewrite this example.`); + } else { + this.report(node, `This TypeScript feature (${nodeKind}) is not supported in examples. Please rewrite this example.`); + } } /** @@ -208,6 +213,7 @@ export class AstRenderer { if (ts.isMethodDeclaration(tree)) { return visitor.methodDeclaration(tree, this); } if (ts.isInterfaceDeclaration(tree)) { return visitor.interfaceDeclaration(tree, this); } if (ts.isPropertySignature(tree)) { return visitor.propertySignature(tree, this); } + if (ts.isMethodSignature(tree)) { return visitor.methodSignature(tree, this); } if (ts.isAsExpression(tree)) { return visitor.asExpression(tree, this); } if (ts.isPrefixUnaryExpression(tree)) { return visitor.prefixUnaryExpression(tree, this); } if (ts.isSpreadAssignment(tree)) { @@ -223,7 +229,7 @@ export class AstRenderer { if (ts.isParenthesizedExpression(tree)) { return visitor.parenthesizedExpression(tree, this); } if (ts.isVoidExpression(tree)) { return visitor.maskingVoidExpression(tree, this); } - this.reportUnsupported(tree); + this.reportUnsupported(tree, undefined); if (this.options.bestEffort !== false) { // When doing best-effort conversion and we don't understand the node type, just return the complete text of it as-is @@ -322,6 +328,7 @@ export interface AstHandler { methodDeclaration(node: ts.MethodDeclaration, context: AstRenderer): OTree; interfaceDeclaration(node: ts.InterfaceDeclaration, context: AstRenderer): OTree; propertySignature(node: ts.PropertySignature, context: AstRenderer): OTree; + methodSignature(node: ts.MethodSignature, context: AstRenderer): OTree; asExpression(node: ts.AsExpression, context: AstRenderer): OTree; prefixUnaryExpression(node: ts.PrefixUnaryExpression, context: AstRenderer): OTree; spreadElement(node: ts.SpreadElement, context: AstRenderer): OTree; diff --git a/packages/jsii-rosetta/package.json b/packages/jsii-rosetta/package.json index 1b41483306..4905a41816 100644 --- a/packages/jsii-rosetta/package.json +++ b/packages/jsii-rosetta/package.json @@ -1,6 +1,6 @@ { "name": "jsii-rosetta", - "version": "0.21.0", + "version": "0.21.1", "description": "Translate TypeScript code snippets to other languages", "main": "lib/index.js", "bin": { @@ -23,18 +23,18 @@ "@types/yargs": "^13.0.4", "eslint": "^6.8.0", "jest": "^24.9.0", - "jsii": "^0.21.0", - "jsii-build-tools": "^0.21.0", + "jsii": "^0.21.1", + "jsii-build-tools": "^0.21.1", "memory-streams": "^0.1.3", "mock-fs": "^4.10.4", "typescript": "~3.7.4" }, "dependencies": { - "@jsii/spec": "^0.21.0", + "@jsii/spec": "^0.21.1", "commonmark": "^0.29.0", "fs-extra": "^8.1.0", "typescript": "~3.7.4", - "yargs": "^15.0.2" + "yargs": "^15.1.0" }, "jest": { "moduleFileExtensions": [ diff --git a/packages/jsii-rosetta/test/translations.test.ts b/packages/jsii-rosetta/test/translations.test.ts index f3acd790e9..ad7680aaa0 100644 --- a/packages/jsii-rosetta/test/translations.test.ts +++ b/packages/jsii-rosetta/test/translations.test.ts @@ -85,9 +85,8 @@ function makeTests() { testConstructor(`to ${supportedLanguage.name}`, () => { const expected = fs.readFileSync(languageFile, { encoding: 'utf-8' }); - const translation = translator.renderUsing(supportedLanguage.visitor); - try { + const translation = translator.renderUsing(supportedLanguage.visitor); expect(stripEmptyLines(translation)).toEqual(stripEmptyLines(stripCommonWhitespace(expected))); } catch(e) { anyFailed = true; diff --git a/packages/jsii-rosetta/test/translations/calls/default_struct_fields.cs b/packages/jsii-rosetta/test/translations/calls/default_struct_fields.cs index dd66b67b4e..d75f42f3dd 100644 --- a/packages/jsii-rosetta/test/translations/calls/default_struct_fields.cs +++ b/packages/jsii-rosetta/test/translations/calls/default_struct_fields.cs @@ -1,7 +1,7 @@ class Struct { - public string? X; - public string? Y; + public string? X { get; set; } + public string? Y { get; set; } } public void Foo(Struct s) { diff --git a/packages/jsii-rosetta/test/translations/calls/shorthand_property.cs b/packages/jsii-rosetta/test/translations/calls/shorthand_property.cs new file mode 100644 index 0000000000..595427e1b6 --- /dev/null +++ b/packages/jsii-rosetta/test/translations/calls/shorthand_property.cs @@ -0,0 +1,2 @@ +string foo = "hello"; +CallFunction(new Struct { Foo = foo }); \ No newline at end of file diff --git a/packages/jsii-rosetta/test/translations/calls/shorthand_property.java b/packages/jsii-rosetta/test/translations/calls/shorthand_property.java new file mode 100644 index 0000000000..32e91fafb4 --- /dev/null +++ b/packages/jsii-rosetta/test/translations/calls/shorthand_property.java @@ -0,0 +1,2 @@ +String foo = "hello"; +callFunction(Map.of("foo", foo)); \ No newline at end of file diff --git a/packages/jsii-rosetta/test/translations/calls/shorthand_property.py b/packages/jsii-rosetta/test/translations/calls/shorthand_property.py new file mode 100644 index 0000000000..23a24fccb8 --- /dev/null +++ b/packages/jsii-rosetta/test/translations/calls/shorthand_property.py @@ -0,0 +1,2 @@ +foo = "hello" +call_function(foo=foo) \ No newline at end of file diff --git a/packages/jsii-rosetta/test/translations/calls/shorthand_property.ts b/packages/jsii-rosetta/test/translations/calls/shorthand_property.ts new file mode 100644 index 0000000000..418bd61844 --- /dev/null +++ b/packages/jsii-rosetta/test/translations/calls/shorthand_property.ts @@ -0,0 +1,2 @@ +const foo = 'hello'; +callFunction({ foo }); \ No newline at end of file diff --git a/packages/jsii-rosetta/test/translations/calls/will_type_deep_structs_directly_if_type_info_is_available.cs b/packages/jsii-rosetta/test/translations/calls/will_type_deep_structs_directly_if_type_info_is_available.cs index 4f21a6833a..5a887695c9 100644 --- a/packages/jsii-rosetta/test/translations/calls/will_type_deep_structs_directly_if_type_info_is_available.cs +++ b/packages/jsii-rosetta/test/translations/calls/will_type_deep_structs_directly_if_type_info_is_available.cs @@ -1,16 +1,16 @@ class BaseDeeperStruct { - public int A; + public int A { get; set; } } class DeeperStruct : BaseDeeperStruct { - public int B; + public int B { get; set; } } class OuterStruct { - public int Foo; - public DeeperStruct Deeper; + public int Foo { get; set; } + public DeeperStruct Deeper { get; set; } } public void Foo(int x, OuterStruct outer) diff --git a/packages/jsii-rosetta/test/translations/classes/class_with_props_argument.cs b/packages/jsii-rosetta/test/translations/classes/class_with_props_argument.cs index 3838adc964..0deadc6097 100644 --- a/packages/jsii-rosetta/test/translations/classes/class_with_props_argument.cs +++ b/packages/jsii-rosetta/test/translations/classes/class_with_props_argument.cs @@ -1,7 +1,7 @@ class MyClassProps { - public string Prop1; - public int Prop2; + public string Prop1 { get; set; } + public int Prop2 { get; set; } } class MyClass : cdk.SomeOtherClass diff --git a/packages/jsii-rosetta/test/translations/expressions/struct_assignment.cs b/packages/jsii-rosetta/test/translations/expressions/struct_assignment.cs index b79d92274d..975d97e10f 100644 --- a/packages/jsii-rosetta/test/translations/expressions/struct_assignment.cs +++ b/packages/jsii-rosetta/test/translations/expressions/struct_assignment.cs @@ -1,6 +1,6 @@ class Test { - public string Key; + public string Key { get; set; } } Test x = new Test { Key = "value" }; diff --git a/packages/jsii-rosetta/test/translations/interfaces/interface_with_method.cs b/packages/jsii-rosetta/test/translations/interfaces/interface_with_method.cs new file mode 100644 index 0000000000..441b04e9f4 --- /dev/null +++ b/packages/jsii-rosetta/test/translations/interfaces/interface_with_method.cs @@ -0,0 +1,4 @@ +interface IThing +{ + void DoAThing(); +} \ No newline at end of file diff --git a/packages/jsii-rosetta/test/translations/interfaces/interface_with_method.java b/packages/jsii-rosetta/test/translations/interfaces/interface_with_method.java new file mode 100644 index 0000000000..9d0c527e92 --- /dev/null +++ b/packages/jsii-rosetta/test/translations/interfaces/interface_with_method.java @@ -0,0 +1,3 @@ +public interface IThing { + void doAThing(); +} \ No newline at end of file diff --git a/packages/jsii-rosetta/test/translations/interfaces/interface_with_method.ts b/packages/jsii-rosetta/test/translations/interfaces/interface_with_method.ts new file mode 100644 index 0000000000..93eb57145a --- /dev/null +++ b/packages/jsii-rosetta/test/translations/interfaces/interface_with_method.ts @@ -0,0 +1,3 @@ +interface IThing { + doAThing(): void; +} \ No newline at end of file diff --git a/packages/jsii-rosetta/test/translations/interfaces/interface_with_props.cs b/packages/jsii-rosetta/test/translations/interfaces/interface_with_props.cs new file mode 100644 index 0000000000..b387d2810f --- /dev/null +++ b/packages/jsii-rosetta/test/translations/interfaces/interface_with_props.cs @@ -0,0 +1,4 @@ +interface IThing +{ + string ThingArn { get; } +} \ No newline at end of file diff --git a/packages/jsii-rosetta/test/translations/interfaces/interface_with_props.java b/packages/jsii-rosetta/test/translations/interfaces/interface_with_props.java new file mode 100644 index 0000000000..060a9dc09e --- /dev/null +++ b/packages/jsii-rosetta/test/translations/interfaces/interface_with_props.java @@ -0,0 +1,3 @@ +public interface IThing { + String getThingArn(); +} \ No newline at end of file diff --git a/packages/jsii-rosetta/test/translations/interfaces/interface_with_props.ts b/packages/jsii-rosetta/test/translations/interfaces/interface_with_props.ts new file mode 100644 index 0000000000..8d5fba3de7 --- /dev/null +++ b/packages/jsii-rosetta/test/translations/interfaces/interface_with_props.ts @@ -0,0 +1,3 @@ +interface IThing { + readonly thingArn: string; +} diff --git a/packages/jsii/CHANGELOG.md b/packages/jsii/CHANGELOG.md index fd372bf800..e70aa83ede 100644 --- a/packages/jsii/CHANGELOG.md +++ b/packages/jsii/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package jsii + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) diff --git a/packages/jsii/package.json b/packages/jsii/package.json index dd6416544e..aef59f7720 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -1,6 +1,6 @@ { "name": "jsii", - "version": "0.21.0", + "version": "0.21.1", "description": "TypeScript compiler for jsii", "license": "Apache-2.0", "author": { @@ -33,7 +33,7 @@ "package": "package-js" }, "dependencies": { - "@jsii/spec": "^0.21.0", + "@jsii/spec": "^0.21.1", "case": "^1.6.2", "colors": "^1.4.0", "deep-equal": "^2.0.1", @@ -44,7 +44,7 @@ "sort-json": "^2.0.0", "spdx-license-list": "^6.1.0", "typescript": "~3.7.4", - "yargs": "^15.0.2" + "yargs": "^15.1.0" }, "devDependencies": { "@types/clone": "^0.1.30", @@ -59,7 +59,7 @@ "eslint": "^6.8.0", "jest": "^24.9.0", "jest-expect-message": "^1.0.2", - "jsii-build-tools": "^0.21.0" + "jsii-build-tools": "^0.21.1" }, "jest": { "collectCoverage": true, diff --git a/packages/oo-ascii-tree/CHANGELOG.md b/packages/oo-ascii-tree/CHANGELOG.md index 0366a9735d..396731e6a3 100644 --- a/packages/oo-ascii-tree/CHANGELOG.md +++ b/packages/oo-ascii-tree/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package oo-ascii-tree + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package oo-ascii-tree diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index 1f25b3c746..354f4a9bb3 100644 --- a/packages/oo-ascii-tree/package.json +++ b/packages/oo-ascii-tree/package.json @@ -1,6 +1,6 @@ { "name": "oo-ascii-tree", - "version": "0.21.0", + "version": "0.21.1", "description": "object-oriented ascii tree renderer", "license": "Apache-2.0", "author": { @@ -34,7 +34,7 @@ "@types/node": "^10.17.13", "eslint": "^6.8.0", "jest": "^24.9.0", - "jsii-build-tools": "^0.21.0", + "jsii-build-tools": "^0.21.1", "typescript": "~3.7.4" }, "jest": { diff --git a/tools/jsii-build-tools/CHANGELOG.md b/tools/jsii-build-tools/CHANGELOG.md index 50972e9730..d2668a0935 100644 --- a/tools/jsii-build-tools/CHANGELOG.md +++ b/tools/jsii-build-tools/CHANGELOG.md @@ -3,6 +3,14 @@ All notable changes to this project will be documented in this file. See [Conventional Commits](https://conventionalcommits.org) for commit guidelines. +## [0.21.1](https://github.com/aws/jsii/compare/v0.21.0...v0.21.1) (2020-01-03) + +**Note:** Version bump only for package jsii-build-tools + + + + + # [0.21.0](https://github.com/aws/jsii/compare/v0.20.11...v0.21.0) (2020-01-02) **Note:** Version bump only for package jsii-build-tools diff --git a/tools/jsii-build-tools/package.json b/tools/jsii-build-tools/package.json index d1fdf9913b..96ce399390 100644 --- a/tools/jsii-build-tools/package.json +++ b/tools/jsii-build-tools/package.json @@ -1,6 +1,6 @@ { "name": "jsii-build-tools", - "version": "0.21.0", + "version": "0.21.1", "private": true, "description": "Internal repository-level tools", "license": "Apache-2.0", diff --git a/yarn.lock b/yarn.lock index 27ca6e664c..eaf22b9bdc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -869,10 +869,10 @@ inquirer "^6.2.0" npmlog "^4.1.2" -"@lerna/publish@3.20.1": - version "3.20.1" - resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.20.1.tgz#740acc4af52ec69eb603b46b476eab093a72e95b" - integrity sha512-F0Eb2lyIkwMiucGVzOq91RyhJSkJsuh/9xKnKgm6VK8tuVbLDD8cNE7dLRIIDtBYWPtEmujTW+nBg/aDdJBjWg== +"@lerna/publish@3.20.2": + version "3.20.2" + resolved "https://registry.yarnpkg.com/@lerna/publish/-/publish-3.20.2.tgz#a45d29813099b3249657ea913d0dc3f8ebc5cc2e" + integrity sha512-N7Y6PdhJ+tYQPdI1tZum8W25cDlTp4D6brvRacKZusweWexxaopbV8RprBaKexkEX/KIbncuADq7qjDBdQHzaA== dependencies: "@evocateur/libnpmaccess" "^3.1.2" "@evocateur/npm-registry-fetch" "^4.0.0" @@ -895,7 +895,7 @@ "@lerna/run-lifecycle" "3.16.2" "@lerna/run-topologically" "3.18.5" "@lerna/validation-error" "3.13.0" - "@lerna/version" "3.20.1" + "@lerna/version" "3.20.2" figgy-pudding "^3.5.1" fs-extra "^8.1.0" npm-package-arg "^6.1.0" @@ -1008,10 +1008,10 @@ dependencies: npmlog "^4.1.2" -"@lerna/version@3.20.1": - version "3.20.1" - resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.20.1.tgz#1b6b7f30705ecb37af5c796ae2ef7f24f81d073e" - integrity sha512-MY80FV4uqdjxHNl6WaZ5k9hr0IGeQXo1+bKTKzMUudpr3HlTS0c0PoAwSGB2KHafGFpoyb9WHBhb1uDyhL+OfQ== +"@lerna/version@3.20.2": + version "3.20.2" + resolved "https://registry.yarnpkg.com/@lerna/version/-/version-3.20.2.tgz#3709141c0f537741d9bc10cb24f56897bcb30428" + integrity sha512-ckBJMaBWc+xJen0cMyCE7W67QXLLrc0ELvigPIn8p609qkfNM0L0CF803MKxjVOldJAjw84b8ucNWZLvJagP/Q== dependencies: "@lerna/check-working-tree" "3.16.5" "@lerna/child-process" "3.16.5" @@ -5176,10 +5176,10 @@ left-pad@^1.3.0: resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.3.0.tgz#5b8a3a7765dfe001261dde915589e782f8c94d1e" integrity sha512-XI5MPzVNApjAyhQzphX8BkmKsKUxD4LdyK24iZeQGinBN9yTQT3bFlCBy/aVx2HrNcqQGsdot8ghrjyrvMCoEA== -lerna@^3.20.1: - version "3.20.1" - resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.20.1.tgz#68d42768fc1a243db144558a10d4191c9337646a" - integrity sha512-TUS6aSyVdOoXLF1CMwUsT0zCGwgO1LvRUP9zUqWRYdvZP8NofSEzd4ChkRXZWGwXyQ8ozA9bIfwWxMck2QpfIA== +lerna@^3.20.2: + version "3.20.2" + resolved "https://registry.yarnpkg.com/lerna/-/lerna-3.20.2.tgz#abf84e73055fe84ee21b46e64baf37b496c24864" + integrity sha512-bjdL7hPLpU3Y8CBnw/1ys3ynQMUjiK6l9iDWnEGwFtDy48Xh5JboR9ZJwmKGCz9A/sarVVIGwf1tlRNKUG9etA== dependencies: "@lerna/add" "3.20.0" "@lerna/bootstrap" "3.20.0" @@ -5194,9 +5194,9 @@ lerna@^3.20.1: "@lerna/init" "3.18.5" "@lerna/link" "3.18.5" "@lerna/list" "3.20.0" - "@lerna/publish" "3.20.1" + "@lerna/publish" "3.20.2" "@lerna/run" "3.20.0" - "@lerna/version" "3.20.1" + "@lerna/version" "3.20.2" import-local "^2.0.0" npmlog "^4.1.2" @@ -8629,10 +8629,10 @@ yargs@^14.0.0, yargs@^14.2.2: y18n "^4.0.0" yargs-parser "^15.0.0" -yargs@^15.0.2: - version "15.0.2" - resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.0.2.tgz#4248bf218ef050385c4f7e14ebdf425653d13bd3" - integrity sha512-GH/X/hYt+x5hOat4LMnCqMd8r5Cv78heOMIJn1hr7QPPBqfeC6p89Y78+WB9yGDvfpCvgasfmWLzNzEioOUD9Q== +yargs@^15.1.0: + version "15.1.0" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.1.0.tgz#e111381f5830e863a89550bd4b136bb6a5f37219" + integrity sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg== dependencies: cliui "^6.0.0" decamelize "^1.2.0"