From a02f688a0ecd642e0fe559e9c3accca1a9d1b892 Mon Sep 17 00:00:00 2001 From: Elad Ben-Israel Date: Sun, 5 May 2019 13:52:46 +0300 Subject: [PATCH 1/2] v0.10.4 See CHANGELOG --- CHANGELOG.md | 11 ++++++++++ lerna.json | 2 +- packages/codemaker/CHANGELOG.md | 8 ++++++++ packages/codemaker/package.json | 2 +- packages/jsii-build-tools/CHANGELOG.md | 8 ++++++++ packages/jsii-build-tools/package.json | 2 +- packages/jsii-calc-base-of-base/CHANGELOG.md | 8 ++++++++ packages/jsii-calc-base-of-base/package.json | 6 +++--- packages/jsii-calc-base/CHANGELOG.md | 8 ++++++++ packages/jsii-calc-base/package.json | 10 +++++----- packages/jsii-calc-bundled/CHANGELOG.md | 8 ++++++++ packages/jsii-calc-bundled/package.json | 2 +- packages/jsii-calc-lib/CHANGELOG.md | 8 ++++++++ packages/jsii-calc-lib/package.json | 10 +++++----- packages/jsii-calc/CHANGELOG.md | 11 ++++++++++ packages/jsii-calc/package.json | 20 +++++++++---------- packages/jsii-diff/CHANGELOG.md | 8 ++++++++ packages/jsii-diff/package.json | 10 +++++----- packages/jsii-dotnet-generator/CHANGELOG.md | 8 ++++++++ packages/jsii-dotnet-generator/package.json | 6 +++--- packages/jsii-dotnet-jsonmodel/CHANGELOG.md | 8 ++++++++ packages/jsii-dotnet-jsonmodel/package.json | 4 ++-- .../jsii-dotnet-runtime-test/CHANGELOG.md | 8 ++++++++ .../jsii-dotnet-runtime-test/package.json | 8 ++++---- packages/jsii-dotnet-runtime/CHANGELOG.md | 8 ++++++++ packages/jsii-dotnet-runtime/package.json | 8 ++++---- packages/jsii-java-runtime-test/CHANGELOG.md | 8 ++++++++ packages/jsii-java-runtime-test/package.json | 8 ++++---- packages/jsii-java-runtime/CHANGELOG.md | 8 ++++++++ packages/jsii-java-runtime/package.json | 6 +++--- packages/jsii-kernel/CHANGELOG.md | 8 ++++++++ packages/jsii-kernel/package.json | 12 +++++------ packages/jsii-pacmak/CHANGELOG.md | 11 ++++++++++ packages/jsii-pacmak/package.json | 20 +++++++++---------- packages/jsii-python-runtime/CHANGELOG.md | 8 ++++++++ packages/jsii-python-runtime/package.json | 10 +++++----- packages/jsii-reflect/CHANGELOG.md | 11 ++++++++++ packages/jsii-reflect/package.json | 14 ++++++------- packages/jsii-ruby-runtime/CHANGELOG.md | 8 ++++++++ packages/jsii-ruby-runtime/package.json | 10 +++++----- packages/jsii-runtime/CHANGELOG.md | 8 ++++++++ packages/jsii-runtime/package.json | 14 ++++++------- packages/jsii-spec/CHANGELOG.md | 8 ++++++++ packages/jsii-spec/package.json | 4 ++-- packages/jsii/CHANGELOG.md | 11 ++++++++++ packages/jsii/package.json | 6 +++--- packages/oo-ascii-tree/CHANGELOG.md | 8 ++++++++ packages/oo-ascii-tree/package.json | 4 ++-- 48 files changed, 306 insertions(+), 99 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 517932e2d2..daadb1442b 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + + +### Bug Fixes + +* **jsii:** consider interfaces from erased base classes ([#491](https://github.com/awslabs/jsii/issues/491)) ([b03511b](https://github.com/awslabs/jsii/commit/b03511b)), closes [#487](https://github.com/awslabs/jsii/issues/487) + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/lerna.json b/lerna.json index ff21045634..b359426aa9 100644 --- a/lerna.json +++ b/lerna.json @@ -8,5 +8,5 @@ "rejectCycles": true } }, - "version": "0.10.3" + "version": "0.10.4" } diff --git a/packages/codemaker/CHANGELOG.md b/packages/codemaker/CHANGELOG.md index 95c5aaa777..8846b77dc3 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package codemaker + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/codemaker/package.json b/packages/codemaker/package.json index f3b41c1c13..8cfc8ece26 100644 --- a/packages/codemaker/package.json +++ b/packages/codemaker/package.json @@ -1,6 +1,6 @@ { "name": "codemaker", - "version": "0.10.3", + "version": "0.10.4", "description": "A tiny utility for generating source code", "main": "lib/index.js", "types": "lib/index.d.ts", diff --git a/packages/jsii-build-tools/CHANGELOG.md b/packages/jsii-build-tools/CHANGELOG.md index 6ce93f3d5d..7882c84db5 100644 --- a/packages/jsii-build-tools/CHANGELOG.md +++ b/packages/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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-build-tools + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-build-tools/package.json b/packages/jsii-build-tools/package.json index c086d8c13b..c5944d4b7b 100644 --- a/packages/jsii-build-tools/package.json +++ b/packages/jsii-build-tools/package.json @@ -1,6 +1,6 @@ { "name": "jsii-build-tools", - "version": "0.10.3", + "version": "0.10.4", "description": "Internal repository-level tools", "private": true, "bin": { diff --git a/packages/jsii-calc-base-of-base/CHANGELOG.md b/packages/jsii-calc-base-of-base/CHANGELOG.md index 2b94addb92..23299473bd 100644 --- a/packages/jsii-calc-base-of-base/CHANGELOG.md +++ b/packages/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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package @scope/jsii-calc-base-of-base + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) **Note:** Version bump only for package @scope/jsii-calc-base-of-base diff --git a/packages/jsii-calc-base-of-base/package.json b/packages/jsii-calc-base-of-base/package.json index 5405a83e13..3591976f9c 100644 --- a/packages/jsii-calc-base-of-base/package.json +++ b/packages/jsii-calc-base-of-base/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-base-of-base", - "version": "0.10.3", + "version": "0.10.4", "description": "An example transitive dependency for jsii-calc.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -32,8 +32,8 @@ "test": "diff-test test/assembly.jsii .jsii" }, "devDependencies": { - "jsii": "^0.10.3", - "jsii-build-tools": "^0.10.3" + "jsii": "^0.10.4", + "jsii-build-tools": "^0.10.4" }, "author": { "name": "Amazon Web Services", diff --git a/packages/jsii-calc-base/CHANGELOG.md b/packages/jsii-calc-base/CHANGELOG.md index 5d53f36185..3584a5bd80 100644 --- a/packages/jsii-calc-base/CHANGELOG.md +++ b/packages/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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package @scope/jsii-calc-base + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) **Note:** Version bump only for package @scope/jsii-calc-base diff --git a/packages/jsii-calc-base/package.json b/packages/jsii-calc-base/package.json index 4638d8edd8..6521bdc143 100644 --- a/packages/jsii-calc-base/package.json +++ b/packages/jsii-calc-base/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-base", - "version": "0.10.3", + "version": "0.10.4", "description": "An example direct dependency for jsii-calc.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -32,14 +32,14 @@ "test": "diff-test test/assembly.jsii .jsii" }, "devDependencies": { - "jsii": "^0.10.3", - "jsii-build-tools": "^0.10.3" + "jsii": "^0.10.4", + "jsii-build-tools": "^0.10.4" }, "dependencies": { - "@scope/jsii-calc-base-of-base": "^0.10.3" + "@scope/jsii-calc-base-of-base": "^0.10.4" }, "peerDependencies": { - "@scope/jsii-calc-base-of-base": "^0.10.3" + "@scope/jsii-calc-base-of-base": "^0.10.4" }, "author": { "name": "Amazon Web Services", diff --git a/packages/jsii-calc-bundled/CHANGELOG.md b/packages/jsii-calc-bundled/CHANGELOG.md index bca36fce93..622544cace 100644 --- a/packages/jsii-calc-bundled/CHANGELOG.md +++ b/packages/jsii-calc-bundled/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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-calc-bundled + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) **Note:** Version bump only for package jsii-calc-bundled diff --git a/packages/jsii-calc-bundled/package.json b/packages/jsii-calc-bundled/package.json index 103a93dd34..e29e42103d 100644 --- a/packages/jsii-calc-bundled/package.json +++ b/packages/jsii-calc-bundled/package.json @@ -1,6 +1,6 @@ { "name": "jsii-calc-bundled", - "version": "0.10.3", + "version": "0.10.4", "main": "index.js", "private": true, "author": { diff --git a/packages/jsii-calc-lib/CHANGELOG.md b/packages/jsii-calc-lib/CHANGELOG.md index b6dbc89a0f..3a1ae95a8e 100644 --- a/packages/jsii-calc-lib/CHANGELOG.md +++ b/packages/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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package @scope/jsii-calc-lib + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) **Note:** Version bump only for package @scope/jsii-calc-lib diff --git a/packages/jsii-calc-lib/package.json b/packages/jsii-calc-lib/package.json index 5a8254bda5..47bcb12d9f 100644 --- a/packages/jsii-calc-lib/package.json +++ b/packages/jsii-calc-lib/package.json @@ -1,6 +1,6 @@ { "name": "@scope/jsii-calc-lib", - "version": "0.10.3", + "version": "0.10.4", "description": "A simple calcuator library built on JSII.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -32,14 +32,14 @@ "test": "diff-test test/assembly.jsii .jsii" }, "devDependencies": { - "jsii": "^0.10.3", - "jsii-build-tools": "^0.10.3" + "jsii": "^0.10.4", + "jsii-build-tools": "^0.10.4" }, "dependencies": { - "@scope/jsii-calc-base": "^0.10.3" + "@scope/jsii-calc-base": "^0.10.4" }, "peerDependencies": { - "@scope/jsii-calc-base": "^0.10.3" + "@scope/jsii-calc-base": "^0.10.4" }, "author": { "name": "Amazon Web Services", diff --git a/packages/jsii-calc/CHANGELOG.md b/packages/jsii-calc/CHANGELOG.md index ff06fd7940..188aa9c505 100644 --- a/packages/jsii-calc/CHANGELOG.md +++ b/packages/jsii-calc/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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + + +### Bug Fixes + +* **jsii:** consider interfaces from erased base classes ([#491](https://github.com/awslabs/jsii/issues/491)) ([b03511b](https://github.com/awslabs/jsii/commit/b03511b)), closes [#487](https://github.com/awslabs/jsii/issues/487) + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) **Note:** Version bump only for package jsii-calc diff --git a/packages/jsii-calc/package.json b/packages/jsii-calc/package.json index 6aba081244..c2eba348c1 100644 --- a/packages/jsii-calc/package.json +++ b/packages/jsii-calc/package.json @@ -1,6 +1,6 @@ { "name": "jsii-calc", - "version": "0.10.3", + "version": "0.10.4", "description": "A simple calcuator built on JSII.", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -37,19 +37,19 @@ "jsii-calc-bundled" ], "dependencies": { - "@scope/jsii-calc-base": "^0.10.3", - "@scope/jsii-calc-base-of-base": "^0.10.3", - "@scope/jsii-calc-lib": "^0.10.3", - "jsii-calc-bundled": "^0.10.3" + "@scope/jsii-calc-base": "^0.10.4", + "@scope/jsii-calc-base-of-base": "^0.10.4", + "@scope/jsii-calc-lib": "^0.10.4", + "jsii-calc-bundled": "^0.10.4" }, "peerDependencies": { - "@scope/jsii-calc-base": "^0.10.3", - "@scope/jsii-calc-base-of-base": "^0.10.3", - "@scope/jsii-calc-lib": "^0.10.3" + "@scope/jsii-calc-base": "^0.10.4", + "@scope/jsii-calc-base-of-base": "^0.10.4", + "@scope/jsii-calc-lib": "^0.10.4" }, "devDependencies": { - "jsii": "^0.10.3", - "jsii-build-tools": "^0.10.3" + "jsii": "^0.10.4", + "jsii-build-tools": "^0.10.4" }, "author": { "name": "Amazon Web Services", diff --git a/packages/jsii-diff/CHANGELOG.md b/packages/jsii-diff/CHANGELOG.md index 4fc20fbd0d..24af7ce5af 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-diff + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-diff/package.json b/packages/jsii-diff/package.json index b22385ccab..cf0ebf5bce 100644 --- a/packages/jsii-diff/package.json +++ b/packages/jsii-diff/package.json @@ -1,6 +1,6 @@ { "name": "jsii-diff", - "version": "0.10.3", + "version": "0.10.4", "description": "Assembly comparison for jsii", "license": "Apache-2.0", "author": { @@ -23,14 +23,14 @@ "@types/nodeunit": "^0.0.30", "@types/tar-fs": "^1.16.1", "@types/yargs": "^13.0.0", - "jsii": "^0.10.3", - "jsii-build-tools": "^0.10.3", + "jsii": "^0.10.4", + "jsii-build-tools": "^0.10.4", "nodeunit": "^0.11.3", "nyc": "^14.0.0" }, "dependencies": { - "jsii-reflect": "^0.10.3", - "jsii-spec": "^0.10.3", + "jsii-reflect": "^0.10.4", + "jsii-spec": "^0.10.4", "log4js": "^4.1.0", "typescript": "^3.4.3", "yargs": "^13.2.2" diff --git a/packages/jsii-dotnet-generator/CHANGELOG.md b/packages/jsii-dotnet-generator/CHANGELOG.md index ace800105d..2412701606 100644 --- a/packages/jsii-dotnet-generator/CHANGELOG.md +++ b/packages/jsii-dotnet-generator/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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-dotnet-generator + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) **Note:** Version bump only for package jsii-dotnet-generator diff --git a/packages/jsii-dotnet-generator/package.json b/packages/jsii-dotnet-generator/package.json index f180f2e5c4..7d0f12a356 100644 --- a/packages/jsii-dotnet-generator/package.json +++ b/packages/jsii-dotnet-generator/package.json @@ -1,6 +1,6 @@ { "name": "jsii-dotnet-generator", - "version": "0.10.3", + "version": "0.10.4", "description": ".NET code generator for jsii assemblies", "main": "index.js", "private": true, @@ -11,10 +11,10 @@ "package": "package-dotnet" }, "dependencies": { - "jsii-dotnet-jsonmodel": "^0.10.3" + "jsii-dotnet-jsonmodel": "^0.10.4" }, "devDependencies": { - "jsii-build-tools": "^0.10.3" + "jsii-build-tools": "^0.10.4" }, "author": { "name": "Amazon Web Services", diff --git a/packages/jsii-dotnet-jsonmodel/CHANGELOG.md b/packages/jsii-dotnet-jsonmodel/CHANGELOG.md index 4b1c905fa8..1ec7e57d80 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-dotnet-jsonmodel + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-dotnet-jsonmodel/package.json b/packages/jsii-dotnet-jsonmodel/package.json index bde73bc218..586204e719 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.10.3", + "version": "0.10.4", "description": ".NET json model for jsii spec and api.", "main": "lib/index.js", "private": true, @@ -12,7 +12,7 @@ "package": "package-dotnet" }, "devDependencies": { - "jsii-build-tools": "^0.10.3", + "jsii-build-tools": "^0.10.4", "typescript": "^3.4.3" }, "author": { diff --git a/packages/jsii-dotnet-runtime-test/CHANGELOG.md b/packages/jsii-dotnet-runtime-test/CHANGELOG.md index a017cfc94d..baa514f3fb 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-dotnet-runtime-test + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-dotnet-runtime-test/package.json b/packages/jsii-dotnet-runtime-test/package.json index b2a9b37c58..2c22d3aecf 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.10.3", + "version": "0.10.4", "description": "Tests for the .NET client for jsii runtime", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -11,9 +11,9 @@ "test": "/bin/bash ./test.sh" }, "devDependencies": { - "jsii-calc": "^0.10.3", - "jsii-dotnet-runtime": "^0.10.3", - "jsii-pacmak": "^0.10.3", + "jsii-calc": "^0.10.4", + "jsii-dotnet-runtime": "^0.10.4", + "jsii-pacmak": "^0.10.4", "typescript": "^3.4.3" }, "author": { diff --git a/packages/jsii-dotnet-runtime/CHANGELOG.md b/packages/jsii-dotnet-runtime/CHANGELOG.md index 004f5982af..b4192d7489 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-dotnet-runtime + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-dotnet-runtime/package.json b/packages/jsii-dotnet-runtime/package.json index a7215c5da9..0513b13070 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.10.3", + "version": "0.10.4", "description": ".NET client for jsii runtime", "main": "lib/index.js", "private": true, @@ -12,12 +12,12 @@ "package": "package-dotnet" }, "devDependencies": { - "jsii-build-tools": "^0.10.3", - "jsii-runtime": "^0.10.3", + "jsii-build-tools": "^0.10.4", + "jsii-runtime": "^0.10.4", "typescript": "^3.4.3" }, "dependencies": { - "jsii-dotnet-jsonmodel": "^0.10.3" + "jsii-dotnet-jsonmodel": "^0.10.4" }, "author": { "name": "Amazon Web Services", diff --git a/packages/jsii-java-runtime-test/CHANGELOG.md b/packages/jsii-java-runtime-test/CHANGELOG.md index 0d9eabbbaf..f31f50c9e3 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-java-runtime-test + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) **Note:** Version bump only for package jsii-java-runtime-test diff --git a/packages/jsii-java-runtime-test/package.json b/packages/jsii-java-runtime-test/package.json index 84dad18a1c..e8df0f1fcd 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.10.3", + "version": "0.10.4", "description": "Tests for the Java client for jsii runtime", "private": true, "main": "lib/index.js", @@ -10,9 +10,9 @@ "test": "cd project && mvn test --settings=user.xml" }, "devDependencies": { - "jsii-calc": "^0.10.3", - "jsii-java-runtime": "^0.10.3", - "jsii-pacmak": "^0.10.3" + "jsii-calc": "^0.10.4", + "jsii-java-runtime": "^0.10.4", + "jsii-pacmak": "^0.10.4" }, "author": { "name": "Amazon Web Services", diff --git a/packages/jsii-java-runtime/CHANGELOG.md b/packages/jsii-java-runtime/CHANGELOG.md index ab547bd727..457d47af92 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-java-runtime + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-java-runtime/package.json b/packages/jsii-java-runtime/package.json index 31d84d4756..d2e92caf70 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.10.3", + "version": "0.10.4", "description": "Java client for jsii runtime", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -12,8 +12,8 @@ "package": "package-java" }, "devDependencies": { - "jsii-build-tools": "^0.10.3", - "jsii-runtime": "^0.10.3", + "jsii-build-tools": "^0.10.4", + "jsii-runtime": "^0.10.4", "typescript": "^3.4.3" }, "author": { diff --git a/packages/jsii-kernel/CHANGELOG.md b/packages/jsii-kernel/CHANGELOG.md index 86fd3f8f32..3e22ca2902 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-kernel + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-kernel/package.json b/packages/jsii-kernel/package.json index c2f2b35236..790158e8aa 100644 --- a/packages/jsii-kernel/package.json +++ b/packages/jsii-kernel/package.json @@ -1,6 +1,6 @@ { "name": "jsii-kernel", - "version": "0.10.3", + "version": "0.10.4", "description": "kernel for jsii execution environment", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -12,20 +12,20 @@ "package": "package-js" }, "devDependencies": { - "@scope/jsii-calc-base": "^0.10.3", - "@scope/jsii-calc-lib": "^0.10.3", + "@scope/jsii-calc-base": "^0.10.4", + "@scope/jsii-calc-lib": "^0.10.4", "@types/fs-extra": "^5.0.5", "@types/nodeunit": "^0.0.30", "@types/tar": "^4.0.0", "fs-extra": "^7.0.1", - "jsii-build-tools": "^0.10.3", - "jsii-calc": "^0.10.3", + "jsii-build-tools": "^0.10.4", + "jsii-calc": "^0.10.4", "nodeunit": "^0.11.3", "tslint": "^5.16.0", "typescript": "^3.4.3" }, "dependencies": { - "jsii-spec": "^0.10.3", + "jsii-spec": "^0.10.4", "source-map": "^0.7.3", "tar": "^4.4.8" }, diff --git a/packages/jsii-pacmak/CHANGELOG.md b/packages/jsii-pacmak/CHANGELOG.md index 85da154966..31e96741e6 100644 --- a/packages/jsii-pacmak/CHANGELOG.md +++ b/packages/jsii-pacmak/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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + + +### Bug Fixes + +* **jsii:** consider interfaces from erased base classes ([#491](https://github.com/awslabs/jsii/issues/491)) ([b03511b](https://github.com/awslabs/jsii/commit/b03511b)), closes [#487](https://github.com/awslabs/jsii/issues/487) + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-pacmak/package.json b/packages/jsii-pacmak/package.json index 76049f3f64..274ed9da7b 100644 --- a/packages/jsii-pacmak/package.json +++ b/packages/jsii-pacmak/package.json @@ -1,6 +1,6 @@ { "name": "jsii-pacmak", - "version": "0.10.3", + "version": "0.10.4", "description": "A code generation framework for jsii backend languages", "bin": { "jsii-pacmak": "bin/jsii-pacmak" @@ -21,17 +21,17 @@ ], "dependencies": { "clone": "^2.1.2", - "codemaker": "^0.10.3", + "codemaker": "^0.10.4", "commonmark": "^0.29.0", "escape-string-regexp": "^2.0.0", "fs-extra": "^7.0.1", - "jsii-spec": "^0.10.3", + "jsii-spec": "^0.10.4", "spdx-license-list": "^6.0.0", "xmlbuilder": "^12.0.0", "yargs": "^13.2.2" }, "devDependencies": { - "@scope/jsii-calc-lib": "^0.10.3", + "@scope/jsii-calc-lib": "^0.10.4", "@types/clone": "^0.1.30", "@types/commonmark": "^0.27.3", "@types/escape-string-regexp": "^1.0.0", @@ -40,12 +40,12 @@ "@types/nodeunit": "^0.0.30", "@types/xmlbuilder": "^11.0.1", "@types/yargs": "^13.0.0", - "jsii-build-tools": "^0.10.3", - "jsii-calc": "^0.10.3", - "jsii-dotnet-generator": "^0.10.3", - "jsii-dotnet-jsonmodel": "^0.10.3", - "jsii-dotnet-runtime": "^0.10.3", - "jsii-java-runtime": "^0.10.3", + "jsii-build-tools": "^0.10.4", + "jsii-calc": "^0.10.4", + "jsii-dotnet-generator": "^0.10.4", + "jsii-dotnet-jsonmodel": "^0.10.4", + "jsii-dotnet-runtime": "^0.10.4", + "jsii-java-runtime": "^0.10.4", "nodeunit": "^0.11.3", "tslint": "^5.16.0", "typescript": "^3.4.3" diff --git a/packages/jsii-python-runtime/CHANGELOG.md b/packages/jsii-python-runtime/CHANGELOG.md index 94fe733570..99024a9221 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-python-runtime + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-python-runtime/package.json b/packages/jsii-python-runtime/package.json index baaea7b19e..82b852d918 100644 --- a/packages/jsii-python-runtime/package.json +++ b/packages/jsii-python-runtime/package.json @@ -1,7 +1,7 @@ { "name": "jsii-python-runtime", "private": true, - "version": "0.10.3", + "version": "0.10.4", "description": "Python client for jsii runtime", "main": "index.js", "scripts": { @@ -12,10 +12,10 @@ "test": ".env/bin/python bin/generate-calc && .env/bin/py.test -v --mypy" }, "dependencies": { - "jsii-build-tools": "^0.10.3", - "jsii-calc": "^0.10.3", - "jsii-pacmak": "^0.10.3", - "jsii-runtime": "^0.10.3" + "jsii-build-tools": "^0.10.4", + "jsii-calc": "^0.10.4", + "jsii-pacmak": "^0.10.4", + "jsii-runtime": "^0.10.4" }, "repository": { "type": "git", diff --git a/packages/jsii-reflect/CHANGELOG.md b/packages/jsii-reflect/CHANGELOG.md index 5d699ae445..ca1f907ccd 100644 --- a/packages/jsii-reflect/CHANGELOG.md +++ b/packages/jsii-reflect/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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + + +### Bug Fixes + +* **jsii:** consider interfaces from erased base classes ([#491](https://github.com/awslabs/jsii/issues/491)) ([b03511b](https://github.com/awslabs/jsii/commit/b03511b)), closes [#487](https://github.com/awslabs/jsii/issues/487) + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-reflect/package.json b/packages/jsii-reflect/package.json index ffe7327978..918525c2bb 100644 --- a/packages/jsii-reflect/package.json +++ b/packages/jsii-reflect/package.json @@ -1,6 +1,6 @@ { "name": "jsii-reflect", - "version": "0.10.3", + "version": "0.10.4", "description": "strongly-typed reflection library and tools for jsii", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -16,19 +16,19 @@ "dependencies": { "colors": "^1.3.3", "fs-extra": "^7.0.1", - "jsii-spec": "^0.10.3", - "oo-ascii-tree": "^0.10.3", + "jsii-spec": "^0.10.4", + "oo-ascii-tree": "^0.10.4", "yargs": "^13.2.2" }, "devDependencies": { - "@scope/jsii-calc-lib": "^0.10.3", + "@scope/jsii-calc-lib": "^0.10.4", "@types/fs-extra": "^5.0.5", "@types/jest": "^24.0.11", "@types/yargs": "^13.0.0", "jest": "^24.7.1", - "jsii": "^0.10.3", - "jsii-build-tools": "^0.10.3", - "jsii-calc": "^0.10.3", + "jsii": "^0.10.4", + "jsii-build-tools": "^0.10.4", + "jsii-calc": "^0.10.4", "ts-jest": "^24.0.2", "typescript": "^3.4.3" }, diff --git a/packages/jsii-ruby-runtime/CHANGELOG.md b/packages/jsii-ruby-runtime/CHANGELOG.md index cda0cc6a03..ff55fc83ed 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-ruby-runtime + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-ruby-runtime/package.json b/packages/jsii-ruby-runtime/package.json index 883eeb0752..6bf8ba0f9f 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.10.3", + "version": "0.10.4", "description": "Ruby client for jsii runtime", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -14,10 +14,10 @@ "package": "package-ruby" }, "devDependencies": { - "jsii-build-tools": "^0.10.3", - "jsii-calc": "^0.10.3", - "jsii-pacmak": "^0.10.3", - "jsii-runtime": "^0.10.3", + "jsii-build-tools": "^0.10.4", + "jsii-calc": "^0.10.4", + "jsii-pacmak": "^0.10.4", + "jsii-runtime": "^0.10.4", "typescript": "^3.4.3" }, "author": { diff --git a/packages/jsii-runtime/CHANGELOG.md b/packages/jsii-runtime/CHANGELOG.md index 1c6df7d6e6..b308c76a3c 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-runtime + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-runtime/package.json b/packages/jsii-runtime/package.json index 7d28307e7e..f4e8d83de5 100644 --- a/packages/jsii-runtime/package.json +++ b/packages/jsii-runtime/package.json @@ -1,6 +1,6 @@ { "name": "jsii-runtime", - "version": "0.10.3", + "version": "0.10.4", "description": "jsii runtime kernel process", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -14,10 +14,10 @@ "package": "package-js" }, "devDependencies": { - "@scope/jsii-calc-base": "^0.10.3", - "@scope/jsii-calc-lib": "^0.10.3", - "jsii-build-tools": "^0.10.3", - "jsii-calc": "^0.10.3", + "@scope/jsii-calc-base": "^0.10.4", + "@scope/jsii-calc-lib": "^0.10.4", + "jsii-build-tools": "^0.10.4", + "jsii-calc": "^0.10.4", "nodeunit": "^0.11.3", "source-map-loader": "^0.2.4", "typescript": "^3.4.3", @@ -26,8 +26,8 @@ "webpack-cli": "^3.3.0" }, "dependencies": { - "jsii-kernel": "^0.10.3", - "jsii-spec": "^0.10.3" + "jsii-kernel": "^0.10.4", + "jsii-spec": "^0.10.4" }, "author": { "name": "Amazon Web Services", diff --git a/packages/jsii-spec/CHANGELOG.md b/packages/jsii-spec/CHANGELOG.md index cafe28fb29..8705c7343f 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package jsii-spec + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii-spec/package.json b/packages/jsii-spec/package.json index 152ce3b3a6..d8445aaf83 100644 --- a/packages/jsii-spec/package.json +++ b/packages/jsii-spec/package.json @@ -1,6 +1,6 @@ { "name": "jsii-spec", - "version": "0.10.3", + "version": "0.10.4", "description": "Specification for jsii assemblies", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -12,7 +12,7 @@ }, "devDependencies": { "@types/nodeunit": "^0.0.30", - "jsii-build-tools": "^0.10.3", + "jsii-build-tools": "^0.10.4", "nodeunit": "^0.11.3", "typescript": "^3.4.3", "typescript-json-schema": "^0.37.0" diff --git a/packages/jsii/CHANGELOG.md b/packages/jsii/CHANGELOG.md index 1ea2ed94cc..dff2bffd97 100644 --- a/packages/jsii/CHANGELOG.md +++ b/packages/jsii/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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + + +### Bug Fixes + +* **jsii:** consider interfaces from erased base classes ([#491](https://github.com/awslabs/jsii/issues/491)) ([b03511b](https://github.com/awslabs/jsii/commit/b03511b)), closes [#487](https://github.com/awslabs/jsii/issues/487) + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/jsii/package.json b/packages/jsii/package.json index 471edf1b6a..6ac3fb5d6a 100644 --- a/packages/jsii/package.json +++ b/packages/jsii/package.json @@ -1,6 +1,6 @@ { "name": "jsii", - "version": "0.10.3", + "version": "0.10.4", "description": "TypeScript compiler for jsii", "license": "Apache-2.0", "main": "lib/index.js", @@ -29,7 +29,7 @@ "@types/semver": "^6.0.0", "@types/yargs": "^13.0.0", "clone": "^2.1.2", - "jsii-build-tools": "^0.10.3", + "jsii-build-tools": "^0.10.4", "nodeunit": "^0.11.3", "nyc": "^14.0.0" }, @@ -38,7 +38,7 @@ "colors": "^1.3.3", "deep-equal": "^1.0.1", "fs-extra": "^7.0.1", - "jsii-spec": "^0.10.3", + "jsii-spec": "^0.10.4", "log4js": "^4.1.0", "semver": "^6.0.0", "sort-json": "^2.0.0", diff --git a/packages/oo-ascii-tree/CHANGELOG.md b/packages/oo-ascii-tree/CHANGELOG.md index 212bd0f8e8..e86b9c4d58 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.10.4](https://github.com/awslabs/jsii/compare/v0.10.3...v0.10.4) (2019-05-05) + +**Note:** Version bump only for package oo-ascii-tree + + + + + ## [0.10.3](https://github.com/awslabs/jsii/compare/v0.10.2...v0.10.3) (2019-04-24) diff --git a/packages/oo-ascii-tree/package.json b/packages/oo-ascii-tree/package.json index 967275b502..09c5c56b19 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.10.3", + "version": "0.10.4", "description": "object-oriented ascii tree renderer", "main": "lib/index.js", "types": "lib/index.d.ts", @@ -13,7 +13,7 @@ "devDependencies": { "@types/jest": "^24.0.11", "jest": "^24.7.1", - "jsii-build-tools": "^0.10.3", + "jsii-build-tools": "^0.10.4", "ts-jest": "^24.0.2", "typescript": "^3.4.3" }, From 95fb886e8eb3f6d501e19f1453bc26c0c2833294 Mon Sep 17 00:00:00 2001 From: Elad Ben-Israel Date: Sun, 5 May 2019 21:35:08 +0300 Subject: [PATCH 2/2] update expectations --- .../jsii-calc-base-of-base/test/assembly.jsii | 6 +-- packages/jsii-calc-base/test/assembly.jsii | 10 ++--- packages/jsii-calc-lib/test/assembly.jsii | 12 +++--- packages/jsii-calc/test/assembly.jsii | 20 +++++----- .../amazon/jsii/JsiiObjectMapper.java | 9 +++++ .../amazon/jsii/JsiiSerializable.java | 1 + .../.jsii | 10 ++--- ...s.CalculatorPackageId.BasePackageId.csproj | 8 ++-- .../AssemblyInfo.cs | 2 +- ....3.tgz => scope-jsii-calc-base-0.10.4.tgz} | 0 .../test/expected.jsii-calc-base/java/pom.xml | 6 +-- .../jsii/tests/calculator/base/$Module.java | 2 +- ...sii.tgz => jsii-calc-base@0.10.4.jsii.tgz} | 0 ...sii.tgz => jsii-calc-base@0.10.4.jsii.tgz} | 0 .../expected.jsii-calc-base/python/setup.py | 8 ++-- .../src/scope/jsii_calc_base/__init__.py | 2 +- ...sii.tgz => jsii-calc-base@0.10.4.jsii.tgz} | 0 .../sphinx/_scope_jsii-calc-base.rst | 36 +++++++++--------- .../.jsii | 12 +++--- ...ts.CalculatorPackageId.LibPackageId.csproj | 8 ++-- .../AssemblyInfo.cs | 2 +- ...0.3.tgz => scope-jsii-calc-lib-0.10.4.tgz} | 0 .../test/expected.jsii-calc-lib/java/pom.xml | 6 +-- .../jsii/tests/calculator/lib/$Module.java | 2 +- ...jsii.tgz => jsii-calc-lib@0.10.4.jsii.tgz} | 0 ...jsii.tgz => jsii-calc-lib@0.10.4.jsii.tgz} | 0 .../expected.jsii-calc-lib/python/setup.py | 8 ++-- .../src/scope/jsii_calc_lib/__init__.py | 2 +- ...jsii.tgz => jsii-calc-lib@0.10.4.jsii.tgz} | 0 .../sphinx/_scope_jsii-calc-lib.rst | 36 +++++++++--------- .../.jsii | 20 +++++----- ...azon.JSII.Tests.CalculatorPackageId.csproj | 12 +++--- .../AssemblyInfo.cs | 2 +- ...i-calc-0.10.3.tgz => jsii-calc-0.10.4.tgz} | 0 .../test/expected.jsii-calc/java/pom.xml | 10 ++--- .../amazon/jsii/tests/calculator/$Module.java | 2 +- ...0.3.jsii.tgz => jsii-calc@0.10.4.jsii.tgz} | 0 ...0.3.jsii.tgz => jsii-calc@0.10.4.jsii.tgz} | 0 .../test/expected.jsii-calc/python/setup.py | 12 +++--- .../python/src/jsii_calc/__init__.py | 2 +- ...0.3.jsii.tgz => jsii-calc@0.10.4.jsii.tgz} | 0 .../expected.jsii-calc/sphinx/jsii-calc.rst | 36 +++++++++--------- foreach.sh => scripts/foreach.sh | 35 ++++++++++++++--- scripts/path-prefix | 38 +++++++++++++++++++ 44 files changed, 224 insertions(+), 153 deletions(-) rename packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/{scope-jsii-calc-base-0.10.3.tgz => scope-jsii-calc-base-0.10.4.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/java/src/main/resources/software/amazon/jsii/tests/calculator/base/{jsii-calc-base@0.10.3.jsii.tgz => jsii-calc-base@0.10.4.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/js/{jsii-calc-base@0.10.3.jsii.tgz => jsii-calc-base@0.10.4.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/{jsii-calc-base@0.10.3.jsii.tgz => jsii-calc-base@0.10.4.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/{scope-jsii-calc-lib-0.10.3.tgz => scope-jsii-calc-lib-0.10.4.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/java/src/main/resources/software/amazon/jsii/tests/calculator/lib/{jsii-calc-lib@0.10.3.jsii.tgz => jsii-calc-lib@0.10.4.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/js/{jsii-calc-lib@0.10.3.jsii.tgz => jsii-calc-lib@0.10.4.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/{jsii-calc-lib@0.10.3.jsii.tgz => jsii-calc-lib@0.10.4.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/{jsii-calc-0.10.3.tgz => jsii-calc-0.10.4.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/{jsii-calc@0.10.3.jsii.tgz => jsii-calc@0.10.4.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/js/{jsii-calc@0.10.3.jsii.tgz => jsii-calc@0.10.4.jsii.tgz} (100%) rename packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/{jsii-calc@0.10.3.jsii.tgz => jsii-calc@0.10.4.jsii.tgz} (100%) rename foreach.sh => scripts/foreach.sh (71%) create mode 100755 scripts/path-prefix diff --git a/packages/jsii-calc-base-of-base/test/assembly.jsii b/packages/jsii-calc-base-of-base/test/assembly.jsii index 6be56b8581..8fdeed0ff7 100644 --- a/packages/jsii-calc-base-of-base/test/assembly.jsii +++ b/packages/jsii-calc-base-of-base/test/assembly.jsii @@ -9,7 +9,7 @@ }, "description": "An example transitive dependency for jsii-calc.", "homepage": "https://github.com/awslabs/jsii.git", - "jsiiVersion": "0.10.3", + "jsiiVersion": "0.10.4", "license": "Apache-2.0", "name": "@scope/jsii-calc-base-of-base", "repository": { @@ -110,6 +110,6 @@ ] } }, - "version": "0.10.3", - "fingerprint": "F5wOd1h10iC45ADXYWANSnurwT0jEfNAC0EtSKdLJr8=" + "version": "0.10.4", + "fingerprint": "0xtWN4EgnTTEUzxMbkfCcZLlOB5hL/slIStQLjDKAvA=" } diff --git a/packages/jsii-calc-base/test/assembly.jsii b/packages/jsii-calc-base/test/assembly.jsii index 74b2af7652..b6d3c64ea1 100644 --- a/packages/jsii-calc-base/test/assembly.jsii +++ b/packages/jsii-calc-base/test/assembly.jsii @@ -30,7 +30,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "dependencyClosure": { @@ -56,12 +56,12 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "description": "An example direct dependency for jsii-calc.", "homepage": "https://github.com/awslabs/jsii.git", - "jsiiVersion": "0.10.3", + "jsiiVersion": "0.10.4", "license": "Apache-2.0", "name": "@scope/jsii-calc-base", "repository": { @@ -175,6 +175,6 @@ "name": "IBaseInterface" } }, - "version": "0.10.3", - "fingerprint": "OOcp7GoYKVDBEB5yCSeh3U53T7sfWyWbN1s92ml+FfI=" + "version": "0.10.4", + "fingerprint": "O+Bs72ZaPJdZdYi88ByAm1cvhky94G48nvHSPTTQaAE=" } diff --git a/packages/jsii-calc-lib/test/assembly.jsii b/packages/jsii-calc-lib/test/assembly.jsii index 980f0b8cf0..930e4fd571 100644 --- a/packages/jsii-calc-lib/test/assembly.jsii +++ b/packages/jsii-calc-lib/test/assembly.jsii @@ -30,7 +30,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "dependencyClosure": { @@ -56,7 +56,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" }, "@scope/jsii-calc-base-of-base": { "targets": { @@ -80,12 +80,12 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "description": "A simple calcuator library built on JSII.", "homepage": "https://github.com/awslabs/jsii.git", - "jsiiVersion": "0.10.3", + "jsiiVersion": "0.10.4", "license": "Apache-2.0", "name": "@scope/jsii-calc-lib", "repository": { @@ -495,6 +495,6 @@ ] } }, - "version": "0.10.3", - "fingerprint": "zlxnHAKcmm3vMoKDruYzYXbGjrtw9n2Wj6QpVG2FcRc=" + "version": "0.10.4", + "fingerprint": "SeY+SnojNgDCzNphFXlO97I2FjYhqigKm0AEWELxV0c=" } diff --git a/packages/jsii-calc/test/assembly.jsii b/packages/jsii-calc/test/assembly.jsii index eb15b37118..d50ec491d1 100644 --- a/packages/jsii-calc/test/assembly.jsii +++ b/packages/jsii-calc/test/assembly.jsii @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "bundled": { - "jsii-calc-bundled": "^0.10.3" + "jsii-calc-bundled": "^0.10.4" }, "contributors": [ { @@ -56,7 +56,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" }, "@scope/jsii-calc-base-of-base": { "targets": { @@ -80,7 +80,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" }, "@scope/jsii-calc-lib": { "targets": { @@ -104,7 +104,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "dependencyClosure": { @@ -130,7 +130,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" }, "@scope/jsii-calc-base-of-base": { "targets": { @@ -154,7 +154,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" }, "@scope/jsii-calc-lib": { "targets": { @@ -178,12 +178,12 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "description": "A simple calcuator built on JSII.", "homepage": "https://github.com/awslabs/jsii.git", - "jsiiVersion": "0.10.3", + "jsiiVersion": "0.10.4", "license": "Apache-2.0", "name": "jsii-calc", "readme": { @@ -6767,6 +6767,6 @@ "namespace": "composition.CompositeOperation" } }, - "version": "0.10.3", - "fingerprint": "CSE0eCLDxK7s+qnmR58ZJo0mcEROi4f8Sxlx2pHaBDs=" + "version": "0.10.4", + "fingerprint": "JCVRuScD6uk2V+RQ+YfHSg6DG1z9qNmSY+Aug5NeTLY=" } diff --git a/packages/jsii-java-runtime/project/src/main/java/software/amazon/jsii/JsiiObjectMapper.java b/packages/jsii-java-runtime/project/src/main/java/software/amazon/jsii/JsiiObjectMapper.java index f562de697d..c3e59799cd 100644 --- a/packages/jsii-java-runtime/project/src/main/java/software/amazon/jsii/JsiiObjectMapper.java +++ b/packages/jsii-java-runtime/project/src/main/java/software/amazon/jsii/JsiiObjectMapper.java @@ -42,6 +42,11 @@ public final class JsiiObjectMapper { /** * Similar to calling JsiiObjectMapper.INSTANCE.treeToValue, but handles a null JsonNode argument * well, and throws JsiiException instead of JsonProcessingException. + * + * @param tree the JSON object to parse + * @param valueType the expected type value type + * @param expected type + * @return the deserialized value */ public static T treeToValue(final JsonNode tree, final Class valueType) { if (tree == null) { @@ -57,6 +62,10 @@ public static T treeToValue(final JsonNode tree, final Class valueType) { /** * Similar to calling JsiiObjectMapper.INSTANCE.valueToTree, but handles a null argument well by * returning null. + * + * @param value the value to serialize + * @param expected JSON type + * @return the JSON object */ public static T valueToTree(final Object value) { if (value == null) { diff --git a/packages/jsii-java-runtime/project/src/main/java/software/amazon/jsii/JsiiSerializable.java b/packages/jsii-java-runtime/project/src/main/java/software/amazon/jsii/JsiiSerializable.java index ae50329774..854b15ddca 100644 --- a/packages/jsii-java-runtime/project/src/main/java/software/amazon/jsii/JsiiSerializable.java +++ b/packages/jsii-java-runtime/project/src/main/java/software/amazon/jsii/JsiiSerializable.java @@ -13,6 +13,7 @@ public interface JsiiSerializable { /** * Serializes this object to JSON. The default behavior is to return an object reference. * However, builders implement this method by emitting an actual JSON object of the key/values. + * @return the jsii/JSON representation of this object */ default TreeNode $jsii$toJson() { JsiiObjectRef objRef = JsiiEngine.getInstance().nativeToObjRef(this); 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 74b2af7652..b6d3c64ea1 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 @@ -30,7 +30,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "dependencyClosure": { @@ -56,12 +56,12 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "description": "An example direct dependency for jsii-calc.", "homepage": "https://github.com/awslabs/jsii.git", - "jsiiVersion": "0.10.3", + "jsiiVersion": "0.10.4", "license": "Apache-2.0", "name": "@scope/jsii-calc-base", "repository": { @@ -175,6 +175,6 @@ "name": "IBaseInterface" } }, - "version": "0.10.3", - "fingerprint": "OOcp7GoYKVDBEB5yCSeh3U53T7sfWyWbN1s92ml+FfI=" + "version": "0.10.4", + "fingerprint": "O+Bs72ZaPJdZdYi88ByAm1cvhky94G48nvHSPTTQaAE=" } 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 ac42c07a2c..7196634b6d 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 @@ true true true - 0.10.3 + 0.10.4 Amazon.JSII.Tests.CalculatorPackageId.BasePackageId An example direct dependency for jsii-calc. https://github.com/awslabs/jsii.git @@ -13,10 +13,10 @@ en-US - + - - + + \ No newline at end of file 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 afdb63756f..ae34737550 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.10.3", "scope-jsii-calc-base-0.10.3.tgz")] \ No newline at end of file +[assembly: JsiiAssembly("@scope/jsii-calc-base", "0.10.4", "scope-jsii-calc-base-0.10.4.tgz")] \ No newline at end of file diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.10.3.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.10.4.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.10.3.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/dotnet/Amazon.JSII.Tests.CalculatorPackageId.BasePackageId/scope-jsii-calc-base-0.10.4.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 51c9e101be..e7eb700326 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 @@ calculator-base software.amazon.jsii.tests - 0.10.3 + 0.10.4 jar UTF-8 @@ -36,12 +36,12 @@ calculator-base-of-base software.amazon.jsii.tests - 0.10.3 + 0.10.4 software.amazon.jsii jsii-runtime - 0.10.3 + 0.10.4 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 967b31bff2..efdfaf3498 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.10.3", $Module.class, "jsii-calc-base@0.10.3.jsii.tgz"); + super("@scope/jsii-calc-base", "0.10.4", $Module.class, "jsii-calc-base@0.10.4.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.10.3.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.10.4.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.10.3.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.10.4.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.10.3.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.10.4.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.10.3.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/js/jsii-calc-base@0.10.4.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 c725f8a521..ac62267975 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.10.3", + "version": "0.10.4", "description": "An example direct dependency for jsii-calc.", "url": "https://github.com/awslabs/jsii.git", "long_description_content_type": "text/markdown", @@ -21,7 +21,7 @@ ], "package_data": { "scope.jsii_calc_base._jsii": [ - "jsii-calc-base@0.10.3.jsii.tgz" + "jsii-calc-base@0.10.4.jsii.tgz" ], "scope.jsii_calc_base": [ "py.typed" @@ -29,9 +29,9 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.10.3", + "jsii~=0.10.4", "publication>=0.0.3", - "scope.jsii-calc-base-of-base~=0.10.3" + "scope.jsii-calc-base-of-base~=0.10.4" ] } """) 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 e9e84d2c83..71ca7aacb1 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 @@ from jsii.python import classproperty import scope.jsii_calc_base_of_base -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base", "0.10.3", __name__, "jsii-calc-base@0.10.3.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-base", "0.10.4", __name__, "jsii-calc-base@0.10.4.jsii.tgz") class Base(metaclass=jsii.JSIIAbstractClass, jsii_type="@scope/jsii-calc-base.Base"): """A base class.""" @staticmethod diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.10.3.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.10.4.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.10.3.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-base/python/src/scope/jsii_calc_base/_jsii/jsii-calc-base@0.10.4.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-base/sphinx/_scope_jsii-calc-base.rst b/packages/jsii-pacmak/test/expected.jsii-calc-base/sphinx/_scope_jsii-calc-base.rst index 45f957bb97..88abd8b4e7 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-base/sphinx/_scope_jsii-calc-base.rst +++ b/packages/jsii-pacmak/test/expected.jsii-calc-base/sphinx/_scope_jsii-calc-base.rst @@ -8,42 +8,42 @@ Reference .. group-tab:: C# - View in `Nuget `_ + View in `Nuget `_ **csproj**: .. code-block:: xml - + **dotnet**: .. code-block:: console - dotnet add package Amazon.JSII.Tests.CalculatorPackageId.BasePackageId --version 0.10.3 + dotnet add package Amazon.JSII.Tests.CalculatorPackageId.BasePackageId --version 0.10.4 **packages.config**: .. code-block:: xml - + .. group-tab:: Java - View in `Maven Central `_ + View in `Maven Central `_ **Apache Buildr**: .. code-block:: none - 'software.amazon.jsii.tests:calculator-base:jar:0.10.3' + 'software.amazon.jsii.tests:calculator-base:jar:0.10.4' **Apache Ivy**: .. code-block:: xml - + **Apache Maven**: @@ -52,72 +52,72 @@ Reference software.amazon.jsii.tests calculator-base - 0.10.3 + 0.10.4 **Gradle / Grails**: .. code-block:: none - compile 'software.amazon.jsii.tests:calculator-base:0.10.3' + compile 'software.amazon.jsii.tests:calculator-base:0.10.4' **Groovy Grape**: .. code-block:: none @Grapes( - @Grab(group='software.amazon.jsii.tests', module='calculator-base', version='0.10.3') + @Grab(group='software.amazon.jsii.tests', module='calculator-base', version='0.10.4') ) .. group-tab:: JavaScript - View in `NPM `_ + View in `NPM `_ **npm**: .. code-block:: console - $ npm i @scope/jsii-calc-base@0.10.3 + $ npm i @scope/jsii-calc-base@0.10.4 **package.json**: .. code-block:: js { - "@scope/jsii-calc-base": "^0.10.3" + "@scope/jsii-calc-base": "^0.10.4" } **yarn**: .. code-block:: console - $ yarn add @scope/jsii-calc-base@0.10.3 + $ yarn add @scope/jsii-calc-base@0.10.4 .. group-tab:: TypeScript - View in `NPM `_ + View in `NPM `_ **npm**: .. code-block:: console - $ npm i @scope/jsii-calc-base@0.10.3 + $ npm i @scope/jsii-calc-base@0.10.4 **package.json**: .. code-block:: js { - "@scope/jsii-calc-base": "^0.10.3" + "@scope/jsii-calc-base": "^0.10.4" } **yarn**: .. code-block:: console - $ yarn add @scope/jsii-calc-base@0.10.3 + $ yarn add @scope/jsii-calc-base@0.10.4 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 980f0b8cf0..930e4fd571 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 @@ -30,7 +30,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "dependencyClosure": { @@ -56,7 +56,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" }, "@scope/jsii-calc-base-of-base": { "targets": { @@ -80,12 +80,12 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "description": "A simple calcuator library built on JSII.", "homepage": "https://github.com/awslabs/jsii.git", - "jsiiVersion": "0.10.3", + "jsiiVersion": "0.10.4", "license": "Apache-2.0", "name": "@scope/jsii-calc-lib", "repository": { @@ -495,6 +495,6 @@ ] } }, - "version": "0.10.3", - "fingerprint": "zlxnHAKcmm3vMoKDruYzYXbGjrtw9n2Wj6QpVG2FcRc=" + "version": "0.10.4", + "fingerprint": "SeY+SnojNgDCzNphFXlO97I2FjYhqigKm0AEWELxV0c=" } 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 71afdbb486..f28a0d1219 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 @@ true true true - 0.10.3 + 0.10.4 Amazon.JSII.Tests.CalculatorPackageId.LibPackageId A simple calcuator library built on JSII. https://github.com/awslabs/jsii.git @@ -13,10 +13,10 @@ en-US - + - - + + \ No newline at end of file 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 e30fdc2285..f8c5b5e04c 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.10.3", "scope-jsii-calc-lib-0.10.3.tgz")] \ No newline at end of file +[assembly: JsiiAssembly("@scope/jsii-calc-lib", "0.10.4", "scope-jsii-calc-lib-0.10.4.tgz")] \ No newline at end of file diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.10.3.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.10.4.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.10.3.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/dotnet/Amazon.JSII.Tests.CalculatorPackageId.LibPackageId/scope-jsii-calc-lib-0.10.4.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 9da265ec68..9f1b24e7e9 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 @@ calculator-lib software.amazon.jsii.tests - 0.10.3 + 0.10.4 jar UTF-8 @@ -36,12 +36,12 @@ calculator-base software.amazon.jsii.tests - 0.10.3 + 0.10.4 software.amazon.jsii jsii-runtime - 0.10.3 + 0.10.4 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 c0a5d60885..364c07fdd0 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.10.3", $Module.class, "jsii-calc-lib@0.10.3.jsii.tgz"); + super("@scope/jsii-calc-lib", "0.10.4", $Module.class, "jsii-calc-lib@0.10.4.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.10.3.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.10.4.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.10.3.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.10.4.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.10.3.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.10.4.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.10.3.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/js/jsii-calc-lib@0.10.4.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 51fc158965..fa68ada195 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.10.3", + "version": "0.10.4", "description": "A simple calcuator library built on JSII.", "url": "https://github.com/awslabs/jsii.git", "long_description_content_type": "text/markdown", @@ -21,7 +21,7 @@ ], "package_data": { "scope.jsii_calc_lib._jsii": [ - "jsii-calc-lib@0.10.3.jsii.tgz" + "jsii-calc-lib@0.10.4.jsii.tgz" ], "scope.jsii_calc_lib": [ "py.typed" @@ -29,9 +29,9 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.10.3", + "jsii~=0.10.4", "publication>=0.0.3", - "scope.jsii-calc-base~=0.10.3" + "scope.jsii-calc-base~=0.10.4" ] } """) 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 9ffc740563..76f6aa5cc3 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 @@ from jsii.python import classproperty import scope.jsii_calc_base -__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "0.10.3", __name__, "jsii-calc-lib@0.10.3.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("@scope/jsii-calc-lib", "0.10.4", __name__, "jsii-calc-lib@0.10.4.jsii.tgz") @jsii.enum(jsii_type="@scope/jsii-calc-lib.EnumFromScopedModule") class EnumFromScopedModule(enum.Enum): """Check that enums from @scoped packages can be references. See awslabs/jsii#138.""" diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.10.3.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.10.4.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.10.3.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc-lib/python/src/scope/jsii_calc_lib/_jsii/jsii-calc-lib@0.10.4.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc-lib/sphinx/_scope_jsii-calc-lib.rst b/packages/jsii-pacmak/test/expected.jsii-calc-lib/sphinx/_scope_jsii-calc-lib.rst index 1977fb3242..344a00b29c 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc-lib/sphinx/_scope_jsii-calc-lib.rst +++ b/packages/jsii-pacmak/test/expected.jsii-calc-lib/sphinx/_scope_jsii-calc-lib.rst @@ -8,42 +8,42 @@ Reference .. group-tab:: C# - View in `Nuget `_ + View in `Nuget `_ **csproj**: .. code-block:: xml - + **dotnet**: .. code-block:: console - dotnet add package Amazon.JSII.Tests.CalculatorPackageId.LibPackageId --version 0.10.3 + dotnet add package Amazon.JSII.Tests.CalculatorPackageId.LibPackageId --version 0.10.4 **packages.config**: .. code-block:: xml - + .. group-tab:: Java - View in `Maven Central `_ + View in `Maven Central `_ **Apache Buildr**: .. code-block:: none - 'software.amazon.jsii.tests:calculator-lib:jar:0.10.3' + 'software.amazon.jsii.tests:calculator-lib:jar:0.10.4' **Apache Ivy**: .. code-block:: xml - + **Apache Maven**: @@ -52,72 +52,72 @@ Reference software.amazon.jsii.tests calculator-lib - 0.10.3 + 0.10.4 **Gradle / Grails**: .. code-block:: none - compile 'software.amazon.jsii.tests:calculator-lib:0.10.3' + compile 'software.amazon.jsii.tests:calculator-lib:0.10.4' **Groovy Grape**: .. code-block:: none @Grapes( - @Grab(group='software.amazon.jsii.tests', module='calculator-lib', version='0.10.3') + @Grab(group='software.amazon.jsii.tests', module='calculator-lib', version='0.10.4') ) .. group-tab:: JavaScript - View in `NPM `_ + View in `NPM `_ **npm**: .. code-block:: console - $ npm i @scope/jsii-calc-lib@0.10.3 + $ npm i @scope/jsii-calc-lib@0.10.4 **package.json**: .. code-block:: js { - "@scope/jsii-calc-lib": "^0.10.3" + "@scope/jsii-calc-lib": "^0.10.4" } **yarn**: .. code-block:: console - $ yarn add @scope/jsii-calc-lib@0.10.3 + $ yarn add @scope/jsii-calc-lib@0.10.4 .. group-tab:: TypeScript - View in `NPM `_ + View in `NPM `_ **npm**: .. code-block:: console - $ npm i @scope/jsii-calc-lib@0.10.3 + $ npm i @scope/jsii-calc-lib@0.10.4 **package.json**: .. code-block:: js { - "@scope/jsii-calc-lib": "^0.10.3" + "@scope/jsii-calc-lib": "^0.10.4" } **yarn**: .. code-block:: console - $ yarn add @scope/jsii-calc-lib@0.10.3 + $ yarn add @scope/jsii-calc-lib@0.10.4 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 eb15b37118..d50ec491d1 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 @@ -8,7 +8,7 @@ "url": "https://aws.amazon.com" }, "bundled": { - "jsii-calc-bundled": "^0.10.3" + "jsii-calc-bundled": "^0.10.4" }, "contributors": [ { @@ -56,7 +56,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" }, "@scope/jsii-calc-base-of-base": { "targets": { @@ -80,7 +80,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" }, "@scope/jsii-calc-lib": { "targets": { @@ -104,7 +104,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "dependencyClosure": { @@ -130,7 +130,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" }, "@scope/jsii-calc-base-of-base": { "targets": { @@ -154,7 +154,7 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" }, "@scope/jsii-calc-lib": { "targets": { @@ -178,12 +178,12 @@ }, "sphinx": {} }, - "version": "0.10.3" + "version": "0.10.4" } }, "description": "A simple calcuator built on JSII.", "homepage": "https://github.com/awslabs/jsii.git", - "jsiiVersion": "0.10.3", + "jsiiVersion": "0.10.4", "license": "Apache-2.0", "name": "jsii-calc", "readme": { @@ -6767,6 +6767,6 @@ "namespace": "composition.CompositeOperation" } }, - "version": "0.10.3", - "fingerprint": "CSE0eCLDxK7s+qnmR58ZJo0mcEROi4f8Sxlx2pHaBDs=" + "version": "0.10.4", + "fingerprint": "JCVRuScD6uk2V+RQ+YfHSg6DG1z9qNmSY+Aug5NeTLY=" } 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 004131665e..e02aeab9f1 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 @@ -4,7 +4,7 @@ true true true - 0.10.3 + 0.10.4 Amazon.JSII.Tests.CalculatorPackageId A simple calcuator built on JSII. https://github.com/awslabs/jsii.git @@ -13,12 +13,12 @@ en-US - + - - - - + + + + \ No newline at end of file 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 dca2abdbf1..e2fb28076b 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.10.3", "jsii-calc-0.10.3.tgz")] \ No newline at end of file +[assembly: JsiiAssembly("jsii-calc", "0.10.4", "jsii-calc-0.10.4.tgz")] \ No newline at end of file diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.10.3.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.10.4.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.10.3.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/dotnet/Amazon.JSII.Tests.CalculatorPackageId/jsii-calc-0.10.4.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 5b623775da..0d47b29879 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 @@ calculator software.amazon.jsii.tests - 0.10.3 + 0.10.4 jar UTF-8 @@ -57,22 +57,22 @@ calculator-base software.amazon.jsii.tests - 0.10.3 + 0.10.4 calculator-base-of-base software.amazon.jsii.tests - 0.10.3 + 0.10.4 calculator-lib software.amazon.jsii.tests - 0.10.3 + 0.10.4 software.amazon.jsii jsii-runtime - 0.10.3 + 0.10.4 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 dfc6a330b9..1113f88566 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.10.3", $Module.class, "jsii-calc@0.10.3.jsii.tgz"); + super("jsii-calc", "0.10.4", $Module.class, "jsii-calc@0.10.4.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.10.3.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.10.4.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.10.3.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/java/src/main/resources/software/amazon/jsii/tests/calculator/jsii-calc@0.10.4.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.10.3.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.10.4.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.10.3.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/js/jsii-calc@0.10.4.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 ee42d6992c..1068323be0 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.10.3", + "version": "0.10.4", "description": "A simple calcuator built on JSII.", "url": "https://github.com/awslabs/jsii.git", "long_description_content_type": "text/markdown", @@ -21,7 +21,7 @@ ], "package_data": { "jsii_calc._jsii": [ - "jsii-calc@0.10.3.jsii.tgz" + "jsii-calc@0.10.4.jsii.tgz" ], "jsii_calc": [ "py.typed" @@ -29,11 +29,11 @@ }, "python_requires": ">=3.6", "install_requires": [ - "jsii~=0.10.3", + "jsii~=0.10.4", "publication>=0.0.3", - "scope.jsii-calc-base~=0.10.3", - "scope.jsii-calc-base-of-base~=0.10.3", - "scope.jsii-calc-lib~=0.10.3" + "scope.jsii-calc-base~=0.10.4", + "scope.jsii-calc-base-of-base~=0.10.4", + "scope.jsii-calc-lib~=0.10.4" ] } """) 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 3d822d8e48..2a74aeeab0 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 @@ -12,7 +12,7 @@ import scope.jsii_calc_base import scope.jsii_calc_base_of_base import scope.jsii_calc_lib -__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.10.3", __name__, "jsii-calc@0.10.3.jsii.tgz") +__jsii_assembly__ = jsii.JSIIAssembly.load("jsii-calc", "0.10.4", __name__, "jsii-calc@0.10.4.jsii.tgz") class AbstractClassBase(metaclass=jsii.JSIIAbstractClass, jsii_type="jsii-calc.AbstractClassBase"): @staticmethod def __jsii_proxy_class__(): diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.10.3.jsii.tgz b/packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.10.4.jsii.tgz similarity index 100% rename from packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.10.3.jsii.tgz rename to packages/jsii-pacmak/test/expected.jsii-calc/python/src/jsii_calc/_jsii/jsii-calc@0.10.4.jsii.tgz diff --git a/packages/jsii-pacmak/test/expected.jsii-calc/sphinx/jsii-calc.rst b/packages/jsii-pacmak/test/expected.jsii-calc/sphinx/jsii-calc.rst index 70ee30a7b4..7c92982aa4 100644 --- a/packages/jsii-pacmak/test/expected.jsii-calc/sphinx/jsii-calc.rst +++ b/packages/jsii-pacmak/test/expected.jsii-calc/sphinx/jsii-calc.rst @@ -10,42 +10,42 @@ Reference .. group-tab:: C# - View in `Nuget `_ + View in `Nuget `_ **csproj**: .. code-block:: xml - + **dotnet**: .. code-block:: console - dotnet add package Amazon.JSII.Tests.CalculatorPackageId --version 0.10.3 + dotnet add package Amazon.JSII.Tests.CalculatorPackageId --version 0.10.4 **packages.config**: .. code-block:: xml - + .. group-tab:: Java - View in `Maven Central `_ + View in `Maven Central `_ **Apache Buildr**: .. code-block:: none - 'software.amazon.jsii.tests:calculator:jar:0.10.3' + 'software.amazon.jsii.tests:calculator:jar:0.10.4' **Apache Ivy**: .. code-block:: xml - + **Apache Maven**: @@ -54,72 +54,72 @@ Reference software.amazon.jsii.tests calculator - 0.10.3 + 0.10.4 **Gradle / Grails**: .. code-block:: none - compile 'software.amazon.jsii.tests:calculator:0.10.3' + compile 'software.amazon.jsii.tests:calculator:0.10.4' **Groovy Grape**: .. code-block:: none @Grapes( - @Grab(group='software.amazon.jsii.tests', module='calculator', version='0.10.3') + @Grab(group='software.amazon.jsii.tests', module='calculator', version='0.10.4') ) .. group-tab:: JavaScript - View in `NPM `_ + View in `NPM `_ **npm**: .. code-block:: console - $ npm i jsii-calc@0.10.3 + $ npm i jsii-calc@0.10.4 **package.json**: .. code-block:: js { - "jsii-calc": "^0.10.3" + "jsii-calc": "^0.10.4" } **yarn**: .. code-block:: console - $ yarn add jsii-calc@0.10.3 + $ yarn add jsii-calc@0.10.4 .. group-tab:: TypeScript - View in `NPM `_ + View in `NPM `_ **npm**: .. code-block:: console - $ npm i jsii-calc@0.10.3 + $ npm i jsii-calc@0.10.4 **package.json**: .. code-block:: js { - "jsii-calc": "^0.10.3" + "jsii-calc": "^0.10.4" } **yarn**: .. code-block:: console - $ yarn add jsii-calc@0.10.3 + $ yarn add jsii-calc@0.10.4 diff --git a/foreach.sh b/scripts/foreach.sh similarity index 71% rename from foreach.sh rename to scripts/foreach.sh index 37eb660fff..d11e134f12 100755 --- a/foreach.sh +++ b/scripts/foreach.sh @@ -19,9 +19,11 @@ # # -------------------------------------------------------------------------------------------------- set -euo pipefail +scriptdir=$(cd $(dirname $0) && pwd) statefile="${HOME}/.foreach.state" commandfile="${HOME}/.foreach.command" command_arg="${@:-}" +base=$PWD function heading { printf "\e[38;5;81m$@\e[0m\n" @@ -35,11 +37,18 @@ function success { printf "\e[32;5;81m$@\e[0m\n" } +if [[ "${1:-}" == "--reset" ]]; then + rm -f ~/.foreach.* + success "state cleared. you are free to start a new command." + exit 0 +fi + + if [ -f "${statefile}" ] && [ -f "${commandfile}" ]; then command="$(cat ${commandfile})" if [ ! -z "${command_arg}" ] && [ "${command}" != "${command_arg}" ]; then error "error: there is still an active session for: \"${command}\". to reset:" - error " rm -f ~/.foreach.*" + error " $0 --reset" exit 1 fi fi @@ -48,7 +57,7 @@ if [ ! -f "${statefile}" ] && [ ! -f "${commandfile}" ]; then if [ ! -z "${command_arg}" ]; then command="${command_arg}" success "starting new session" - npx lerna ls --all --toposort -p > ${statefile} + node_modules/.bin/lerna ls --all --toposort -p > ${statefile} echo "${command}" > ${commandfile} else error "no active session, use \"$(basename $0) COMMAND\" to start a new session" @@ -59,7 +68,7 @@ fi next="$(head -n1 ${statefile})" if [ -z "${next}" ]; then success "done (queue is empty). to reset:" - success " rm -f ~/.foreach.*" + success " $0 --reset" exit 0 fi @@ -70,9 +79,23 @@ heading "${next}: ${command} (${remaining} remaining)" ( cd ${next} - ${command} || { - error "error: last command failed. fix problem and resume by executing:" - error " $0" + + # special-case "npm run" - skip any modules that simply don't have + # that script (similar to how "lerna run" behaves) + if [[ "${command}" == "npm run"* ]]; then + script="$(echo ${command} | cut -d" " -f3)" + exists=$(node -pe "(require('./package.json').scripts || {}).${script} || ''") + if [ -z "${exists}" ]; then + echo "skipping (no "${script}" script in package.json)" + exit 0 + fi + fi + + sh -c "${command}" &> /tmp/foreach.stdio || { + cd ${base} + cat /tmp/foreach.stdio | ${scriptdir}/path-prefix ${next} + error "error: last command failed. fix problem and resume by executing: $0" + error "directory: ${next}" exit 1 } ) diff --git a/scripts/path-prefix b/scripts/path-prefix new file mode 100755 index 0000000000..42749114f8 --- /dev/null +++ b/scripts/path-prefix @@ -0,0 +1,38 @@ +#!/usr/bin/env node +// converts relative file paths at the beginning of each input line to absolute file paths +const path = require('path'); +const fs = require('fs'); +const rl = require('readline'); + +const REMOVE_COLORS = /[\u001b\u009b][[()#;?]*(?:[0-9]{1,4}(?:;[0-9]{0,4})*)?[0-9A-ORZcf-nqry=><]/g; + +const dir = process.argv[2]; +if (!dir) { + throw new Error(`usage: path-prefix DIR`); +} + +const reldir = path.relative(process.cwd(), dir); + +const ifc = rl.createInterface(process.stdin); +ifc.on('line', line => { + line = line.toString(); + const [ relative, ...rest ] = line.split(':'); + const rel = relative.replace(REMOVE_COLORS, ''); + const absolute = path.join(dir, rel); + if (relative && fs.existsSync(absolute)) { + process.stdout.write(path.join(reldir, rel) + ':' + rest.join(':') + '\n'); + } else { + process.stdout.write(line + '\n'); + } +}); + +process.stdin.resume(); + +function exists(p) { + try { + fs.readFileSync(p); + return true; + } catch (e) { + return false; + } +} \ No newline at end of file