Skip to content

Commit 432bf02

Browse files
mergify[bot]mergify[bot]
authored
chore(release): 1.123.0 (#5013)
See [CHANGELOG](https://github.com/aws/jsii/blob/bump/1.123.0/CHANGELOG.md)
2 parents d5d44e9 + 75e2812 commit 432bf02

File tree

15 files changed

+894
-236
lines changed

15 files changed

+894
-236
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,15 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
## [1.123.0](https://github.com/aws/jsii/compare/v1.122.0...v1.123.0) (2025-12-29)
6+
7+
8+
### Bug Fixes
9+
10+
* **java-runtime:** dependency ranges make Maven download too many files ([#5005](https://github.com/aws/jsii/issues/5005)) ([ecdd223](https://github.com/aws/jsii/commit/ecdd22338a701992df1e6418a51231f5bb6688d7))
11+
* **jsii-pacmak:** collection-of-union arguments in static functions break compilation ([#5012](https://github.com/aws/jsii/issues/5012)) ([2970397](https://github.com/aws/jsii/commit/2970397fa1ce7aabb3dda04ee3d5093e916a611e))
12+
* **jsii-pacmak:** underscore arguments conflict in Java ([#5011](https://github.com/aws/jsii/issues/5011)) ([638b546](https://github.com/aws/jsii/commit/638b546d7e396bf3d6823ef7fa25eecd2cd79c21))
13+
514
## [1.122.0](https://github.com/aws/jsii/compare/v1.121.0...v1.122.0) (2025-12-22)
615

716

‎lerna.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,6 @@
1212
"rejectCycles": true
1313
}
1414
},
15-
"version": "1.122.0",
15+
"version": "1.123.0",
1616
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
1717
}

‎packages/@jsii/java-runtime/generate.sh‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#!/bin/bash
22
set -euo pipefail
33
project="./project"
4+
versions_plugin_version=2.20.1
45

56
mkdir -p conf
67

@@ -14,3 +15,11 @@ mkdir -p ${project}/src/main/resources/software/amazon/jsii
1415
rsync -av $(node -p 'require("path").dirname(require.resolve("@jsii/runtime/package.json"))')/webpack/ ${project}/src/main/resources/software/amazon/jsii
1516

1617
/usr/bin/env node ./BundledRuntime.t.js > ${project}/src/main/java/software/amazon/jsii/BundledRuntime.java
18+
19+
# Use the Maven 'versions' plugin to resolve our wide ranges to point versions.
20+
# We want the "latest matching" version anyway (*), and if we don't the resolution
21+
# now (which downloads the .poms of all possible versions) it will happen during
22+
# every single build.
23+
#
24+
# (*) Consumers can still override versions in their own poms.
25+
(cd $project && mvn org.codehaus.mojo:versions-maven-plugin:${versions_plugin_version}:resolve-ranges)

‎packages/jsii-calc/lib/compliance.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3067,9 +3067,19 @@ export class TwoMethodsWithSimilarCapitalization {
30673067
}
30683068

30693069
export class ClassWithCollectionOfUnions {
3070+
public static staticMethodWithMapOfUnionsParam(
3071+
param: Record<string, StructA | StructB>,
3072+
) {
3073+
void param;
3074+
}
3075+
30703076
public constructor(
30713077
public unionProperty: Array<Record<string, StructA | StructB>>,
30723078
) {}
3079+
3080+
public methodWithMapOfUnionsParam(param: Record<string, StructA | StructB>) {
3081+
void param;
3082+
}
30733083
}
30743084

30753085
export interface StructWithCollectionOfUnionts {

‎packages/jsii-calc/lib/module2530/index.ts‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,8 @@ export class MyClass {
1414
public foo(_: string) {
1515
return;
1616
}
17+
18+
public multipleUnderscores(_: string, __: string, ___: string) {
19+
return;
20+
}
1721
}

‎packages/jsii-calc/test/assembly.jsii‎

Lines changed: 121 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,7 +1582,7 @@
15821582
"kind": "class",
15831583
"locationInModule": {
15841584
"filename": "lib/compliance.ts",
1585-
"line": 3146
1585+
"line": 3156
15861586
},
15871587
"methods": [
15881588
{
@@ -1592,7 +1592,7 @@
15921592
},
15931593
"locationInModule": {
15941594
"filename": "lib/compliance.ts",
1595-
"line": 3155
1595+
"line": 3165
15961596
},
15971597
"name": "mutateProperties",
15981598
"parameters": [
@@ -2606,7 +2606,7 @@
26062606
},
26072607
"locationInModule": {
26082608
"filename": "lib/compliance.ts",
2609-
"line": 3070
2609+
"line": 3076
26102610
},
26112611
"parameters": [
26122612
{
@@ -2641,6 +2641,73 @@
26412641
"filename": "lib/compliance.ts",
26422642
"line": 3069
26432643
},
2644+
"methods": [
2645+
{
2646+
"docs": {
2647+
"stability": "stable"
2648+
},
2649+
"locationInModule": {
2650+
"filename": "lib/compliance.ts",
2651+
"line": 3070
2652+
},
2653+
"name": "staticMethodWithMapOfUnionsParam",
2654+
"parameters": [
2655+
{
2656+
"name": "param",
2657+
"type": {
2658+
"collection": {
2659+
"elementtype": {
2660+
"union": {
2661+
"types": [
2662+
{
2663+
"fqn": "jsii-calc.StructA"
2664+
},
2665+
{
2666+
"fqn": "jsii-calc.StructB"
2667+
}
2668+
]
2669+
}
2670+
},
2671+
"kind": "map"
2672+
}
2673+
}
2674+
}
2675+
],
2676+
"static": true
2677+
},
2678+
{
2679+
"docs": {
2680+
"stability": "stable"
2681+
},
2682+
"locationInModule": {
2683+
"filename": "lib/compliance.ts",
2684+
"line": 3080
2685+
},
2686+
"name": "methodWithMapOfUnionsParam",
2687+
"parameters": [
2688+
{
2689+
"name": "param",
2690+
"type": {
2691+
"collection": {
2692+
"elementtype": {
2693+
"union": {
2694+
"types": [
2695+
{
2696+
"fqn": "jsii-calc.StructA"
2697+
},
2698+
{
2699+
"fqn": "jsii-calc.StructB"
2700+
}
2701+
]
2702+
}
2703+
},
2704+
"kind": "map"
2705+
}
2706+
}
2707+
}
2708+
]
2709+
}
2710+
],
26442711
"name": "ClassWithCollectionOfUnions",
26452712
"properties": [
26462713
{
@@ -2649,7 +2716,7 @@
26492716
},
26502717
"locationInModule": {
26512718
"filename": "lib/compliance.ts",
2652-
"line": 3071
2719+
"line": 3077
26532720
},
26542721
"name": "unionProperty",
26552722
"type": {
@@ -3128,7 +3195,7 @@
31283195
},
31293196
"locationInModule": {
31303197
"filename": "lib/compliance.ts",
3131-
"line": 3080
3198+
"line": 3090
31323199
},
31333200
"parameters": [
31343201
{
@@ -3184,7 +3251,7 @@
31843251
"kind": "class",
31853252
"locationInModule": {
31863253
"filename": "lib/compliance.ts",
3187-
"line": 3079
3254+
"line": 3089
31883255
},
31893256
"name": "ClassWithNestedUnion",
31903257
"properties": [
@@ -3194,7 +3261,7 @@
31943261
},
31953262
"locationInModule": {
31963263
"filename": "lib/compliance.ts",
3197-
"line": 3081
3264+
"line": 3091
31983265
},
31993266
"name": "unionProperty",
32003267
"type": {
@@ -11594,7 +11661,7 @@
1159411661
},
1159511662
"locationInModule": {
1159611663
"filename": "lib/compliance.ts",
11597-
"line": 3118
11664+
"line": 3128
1159811665
},
1159911666
"parameters": [
1160011667
{
@@ -11629,7 +11696,7 @@
1162911696
"kind": "class",
1163011697
"locationInModule": {
1163111698
"filename": "lib/compliance.ts",
11632-
"line": 3112
11699+
"line": 3122
1163311700
},
1163411701
"name": "ParamShadowsBuiltins",
1163511702
"symbolId": "lib/compliance:ParamShadowsBuiltins"
@@ -11644,7 +11711,7 @@
1164411711
"kind": "interface",
1164511712
"locationInModule": {
1164611713
"filename": "lib/compliance.ts",
11647-
"line": 3130
11714+
"line": 3140
1164811715
},
1164911716
"name": "ParamShadowsBuiltinsProps",
1165011717
"properties": [
@@ -11656,7 +11723,7 @@
1165611723
"immutable": true,
1165711724
"locationInModule": {
1165811725
"filename": "lib/compliance.ts",
11659-
"line": 3132
11726+
"line": 3142
1166011727
},
1166111728
"name": "booleanProperty",
1166211729
"type": {
@@ -11671,7 +11738,7 @@
1167111738
"immutable": true,
1167211739
"locationInModule": {
1167311740
"filename": "lib/compliance.ts",
11674-
"line": 3131
11741+
"line": 3141
1167511742
},
1167611743
"name": "stringProperty",
1167711744
"type": {
@@ -11686,7 +11753,7 @@
1168611753
"immutable": true,
1168711754
"locationInModule": {
1168811755
"filename": "lib/compliance.ts",
11689-
"line": 3133
11756+
"line": 3143
1169011757
},
1169111758
"name": "structProperty",
1169211759
"type": {
@@ -11712,7 +11779,7 @@
1171211779
"kind": "class",
1171311780
"locationInModule": {
1171411781
"filename": "lib/compliance.ts",
11715-
"line": 3101
11782+
"line": 3111
1171611783
},
1171711784
"methods": [
1171811785
{
@@ -11721,7 +11788,7 @@
1172111788
},
1172211789
"locationInModule": {
1172311790
"filename": "lib/compliance.ts",
11724-
"line": 3103
11791+
"line": 3113
1172511792
},
1172611793
"name": "useScope",
1172711794
"parameters": [
@@ -11986,7 +12053,7 @@
1198612053
"kind": "class",
1198712054
"locationInModule": {
1198812055
"filename": "lib/compliance.ts",
11989-
"line": 3136
12056+
"line": 3146
1199012057
},
1199112058
"methods": [
1199212059
{
@@ -11996,7 +12063,7 @@
1199612063
},
1199712064
"locationInModule": {
1199812065
"filename": "lib/compliance.ts",
11999-
"line": 3137
12066+
"line": 3147
1200012067
},
1200112068
"name": "promiseIt",
1200212069
"static": true
@@ -12008,7 +12075,7 @@
1200812075
},
1200912076
"locationInModule": {
1201012077
"filename": "lib/compliance.ts",
12011-
"line": 3141
12078+
"line": 3151
1201212079
},
1201312080
"name": "instancePromiseIt"
1201412081
}
@@ -14346,7 +14413,7 @@
1434614413
"kind": "interface",
1434714414
"locationInModule": {
1434814415
"filename": "lib/compliance.ts",
14349-
"line": 3075
14416+
"line": 3085
1435014417
},
1435114418
"name": "StructWithCollectionOfUnionts",
1435214419
"properties": [
@@ -14358,7 +14425,7 @@
1435814425
"immutable": true,
1435914426
"locationInModule": {
1436014427
"filename": "lib/compliance.ts",
14361-
"line": 3076
14428+
"line": 3086
1436214429
},
1436314430
"name": "unionProperty",
1436414431
"type": {
@@ -15973,7 +16040,7 @@
1597316040
},
1597416041
"locationInModule": {
1597516042
"filename": "lib/compliance.ts",
15976-
"line": 3090
16043+
"line": 3100
1597716044
},
1597816045
"parameters": [
1597916046
{
@@ -15998,7 +16065,7 @@
1599816065
"kind": "class",
1599916066
"locationInModule": {
1600016067
"filename": "lib/compliance.ts",
16001-
"line": 3087
16068+
"line": 3097
1600216069
},
1600316070
"name": "VariadicTypeUnion",
1600416071
"properties": [
@@ -16008,7 +16075,7 @@
1600816075
},
1600916076
"locationInModule": {
1601016077
"filename": "lib/compliance.ts",
16011-
"line": 3088
16078+
"line": 3098
1601216079
},
1601316080
"name": "union",
1601416081
"type": {
@@ -17893,6 +17960,36 @@
1789317960
}
1789417961
}
1789517962
]
17963+
},
17964+
{
17965+
"docs": {
17966+
"stability": "stable"
17967+
},
17968+
"locationInModule": {
17969+
"filename": "lib/module2530/index.ts",
17970+
"line": 18
17971+
},
17972+
"name": "multipleUnderscores",
17973+
"parameters": [
17974+
{
17975+
"name": "_",
17976+
"type": {
17977+
"primitive": "string"
17978+
}
17979+
},
17980+
{
17981+
"name": "__",
17982+
"type": {
17983+
"primitive": "string"
17984+
}
17985+
},
17986+
{
17987+
"name": "___",
17988+
"type": {
17989+
"primitive": "string"
17990+
}
17991+
}
17992+
]
1789617993
}
1789717994
],
1789817995
"name": "MyClass",
@@ -19893,5 +19990,5 @@
1989319990
"intersection-types"
1989419991
],
1989519992
"version": "3.20.120",
19896-
"fingerprint": "TNPI4Pzx1sCoo70P/RA0Nnp1IhHvJVLOQ+IOoracN3k="
19993+
"fingerprint": "lIHvj1O/NYsjHa9x/fPvrEdD8ChVE2BSlsfyzXUQaP4="
1989719994
}

0 commit comments

Comments
 (0)