From de95337c4546e6517950ae0662d24805c35baf78 Mon Sep 17 00:00:00 2001 From: Momo Kornher Date: Thu, 28 Nov 2024 13:56:38 +0000 Subject: [PATCH] feat: support jsii-rosetta 5.6 and 5.7 (#1656) --- .github/workflows/build.yml | 4 ++- .projen/deps.json | 4 +-- .projenrc.ts | 2 ++ package.json | 4 +-- projenrc/rosetta.ts | 2 ++ yarn.lock | 49 +++++++++++++------------------------ 6 files changed, 28 insertions(+), 37 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index d2572375..9b52e9b4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -108,7 +108,7 @@ jobs: strategy: matrix: include: - - rosetta: 5.5.0 + - rosetta: 5.7.0 os: windows-latest rosetta: - 1.85.0 @@ -118,6 +118,8 @@ jobs: - 5.3.0 - 5.4.0 - 5.5.0 + - 5.6.0 + - 5.7.0 os: - ubuntu-latest rosetta-compat: diff --git a/.projen/deps.json b/.projen/deps.json index dca06e84..3af5f8e8 100644 --- a/.projen/deps.json +++ b/.projen/deps.json @@ -70,7 +70,7 @@ }, { "name": "jsii-rosetta", - "version": "^1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0", + "version": "^1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0 || ~5.6.0 || ~5.7.0", "type": "build" }, { @@ -91,7 +91,7 @@ }, { "name": "jsii-rosetta", - "version": "^1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0", + "version": "^1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0 || ~5.6.0 || ~5.7.0", "type": "peer" }, { diff --git a/.projenrc.ts b/.projenrc.ts index 847a9a36..cb98a778 100644 --- a/.projenrc.ts +++ b/.projenrc.ts @@ -79,6 +79,8 @@ new RosettaPeerDependency(project, { [RosettaVersionLines.V5_3]: '~5.3.0', [RosettaVersionLines.V5_4]: '~5.4.0', [RosettaVersionLines.V5_5]: '~5.5.0', + [RosettaVersionLines.V5_6]: '~5.6.0', + [RosettaVersionLines.V5_7]: '~5.7.0', }, }); diff --git a/package.json b/package.json index ba28e5bd..45cc34ec 100644 --- a/package.json +++ b/package.json @@ -52,14 +52,14 @@ "eslint-plugin-import": "^2.31.0", "jest": "^29", "jest-junit": "^15", - "jsii-rosetta": "^1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0", + "jsii-rosetta": "^1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0 || ~5.6.0 || ~5.7.0", "projen": "^0.90.2", "ts-jest": "^29", "ts-node": "^10.9.2", "typescript": "~5.7.2" }, "peerDependencies": { - "jsii-rosetta": "^1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0" + "jsii-rosetta": "^1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0 || ~5.6.0 || ~5.7.0" }, "dependencies": { "@jsii/spec": "^1.105.0", diff --git a/projenrc/rosetta.ts b/projenrc/rosetta.ts index 66e21a25..26e164cd 100644 --- a/projenrc/rosetta.ts +++ b/projenrc/rosetta.ts @@ -11,6 +11,8 @@ export enum RosettaVersionLines { V5_3, V5_4, V5_5, + V5_6, + V5_7, } export interface RosettaPeerDependencyOptions { diff --git a/yarn.lock b/yarn.lock index eb7e5938..bd2a50f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1863,15 +1863,6 @@ dotgitignore@^2.1.0: find-up "^3.0.0" minimatch "^3.0.4" -downlevel-dts@^0.11.0: - version "0.11.0" - resolved "https://registry.yarnpkg.com/downlevel-dts/-/downlevel-dts-0.11.0.tgz#514a2d723009c5845730c1db6c994484c596ed9c" - integrity sha512-vo835pntK7kzYStk7xUHDifiYJvXxVhUapt85uk2AI94gUUAQX9HNRtrcMHNSc3YHJUEHGbYIGsM99uIbgAtxw== - dependencies: - semver "^7.3.2" - shelljs "^0.8.3" - typescript next - ejs@^3.1.10: version "3.1.10" resolved "https://registry.yarnpkg.com/ejs/-/ejs-3.1.10.tgz#69ab8358b14e896f80cc39e62087b88500c3ac3b" @@ -3455,10 +3446,10 @@ jsii-reflect@^1.105.0: oo-ascii-tree "^1.105.0" yargs "^16.2.0" -"jsii-rosetta@^1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0": - version "5.5.15" - resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-5.5.15.tgz#75c9930676f4be5e25ee3f7ec8de2977ea3fe5af" - integrity sha512-t6attnVrlty/2tnRJO/Qvky4WILAOIH6A3vdOHLGQUjLxCTxEtlsVbdPMgmxDdtia8JCM1lH4asJhB8I82wc3Q== +"jsii-rosetta@^1.85.0 || ~5.0.14 || ~5.1.2 || ~5.2.0 || ~5.3.0 || ~5.4.0 || ~5.5.0 || ~5.6.0 || ~5.7.0": + version "5.6.1" + resolved "https://registry.yarnpkg.com/jsii-rosetta/-/jsii-rosetta-5.6.1.tgz#b55fc555329bfdd021ba2c227a09a1b70d727e4c" + integrity sha512-tCeAUUXI4a9Op/B20f0yyZpXKq6kHSoBECteI9calGRoDFUfdIWr26XnERyNUm4gQXOZDsJGHKmAlAtbXdGY3g== dependencies: "@jsii/check-node" "1.105.0" "@jsii/spec" "^1.105.0" @@ -3466,31 +3457,30 @@ jsii-reflect@^1.105.0: chalk "^4" commonmark "^0.31.2" fast-glob "^3.3.2" - jsii "~5.5.0" + jsii "~5.6.0" semver "^7.6.3" semver-intersect "^1.5.0" stream-json "^1.9.1" - typescript "~5.5" + typescript "~5.6" workerpool "^6.5.1" yargs "^17.7.2" -jsii@~5.5.0: - version "5.5.11" - resolved "https://registry.yarnpkg.com/jsii/-/jsii-5.5.11.tgz#690862e6ae627460a5fa33c3b8eac65057beb255" - integrity sha512-UPTyun9MMZ/mQgZqSbnY5Bl3fBhEuiZN2mpRbuA4EEUA07Jli1eqeEtMZxXq4fftuVrqvLDpSoqH/bPQ3zD+mg== +jsii@~5.6.0: + version "5.6.1" + resolved "https://registry.yarnpkg.com/jsii/-/jsii-5.6.1.tgz#72bb1501d306cc14a33fc5b2323e2bd7ad964d2b" + integrity sha512-pEVWmhlzQvoO3SH05QP6l9740gMNUOoohXR2gldd0uJEshGpdIwNyrrGYTdGSYC+t/I2sSQF5ag6jRQVPhW/bQ== dependencies: "@jsii/check-node" "1.105.0" "@jsii/spec" "^1.105.0" case "^1.6.3" chalk "^4" - downlevel-dts "^0.11.0" fast-deep-equal "^3.1.3" log4js "^6.9.1" semver "^7.6.3" semver-intersect "^1.5.0" sort-json "^2.0.1" spdx-license-list "^6.9.0" - typescript "~5.5" + typescript "~5.6" yargs "^17.7.2" json-buffer@3.0.1: @@ -4412,7 +4402,7 @@ semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -semver@^7.0.0, semver@^7.3.2, semver@^7.3.4, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3: +semver@^7.0.0, semver@^7.3.4, semver@^7.5.3, semver@^7.5.4, semver@^7.6.0, semver@^7.6.3: version "7.6.3" resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.3.tgz#980f7b5550bc175fb4dc09403085627f9eb33143" integrity sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A== @@ -4451,7 +4441,7 @@ shebang-regex@^3.0.0: resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== -shelljs@^0.8.3, shelljs@^0.8.5: +shelljs@^0.8.5: version "0.8.5" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.5.tgz#de055408d8361bed66c669d2f000538ced8ee20c" integrity sha512-TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow== @@ -4918,15 +4908,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA== -typescript@next: - version "5.8.0-dev.20241127" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.8.0-dev.20241127.tgz#e0f2381855ac9cc6ccdd1444b84a6330c5b8e924" - integrity sha512-TGb4/mmMCY5GOBuEry4xaOcDonyPwnxPc2zaR/8jgA6twK+iGEPsB6EeT+lSSrpOP906WPlFAn3XVQfQm4d7TQ== - -typescript@~5.5: - version "5.5.4" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.5.4.tgz#d9852d6c82bad2d2eda4fd74a5762a8f5909e9ba" - integrity sha512-Mtq29sKDAEYP7aljRgtPOpTvOfbwRWlS6dPRzwjdE+C0R4brX/GUyhHSecbHMFLNBLcJIPt9nl9yG5TZ1weH+Q== +typescript@~5.6: + version "5.6.3" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.6.3.tgz#5f3449e31c9d94febb17de03cc081dd56d81db5b" + integrity sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw== typescript@~5.7.2: version "5.7.2"