Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
fe18c28
chore(deps-dev): Bump pip from 25.1.1 to 25.2 in /packages/jsii-pacma…
dependabot[bot] Jul 31, 2025
00c0883
chore(deps-dev): Bump mypy from 1.17.0 to 1.17.1 in /packages/jsii-pa…
dependabot[bot] Jul 31, 2025
fbf579a
Merge branch 'main' into merge-back/1.113.0
mergify[bot] Jul 31, 2025
22ea500
chore(merge-back): 1.113.0 (#4877)
mergify[bot] Jul 31, 2025
c9575cd
chore: instructions on how to update Go (#4878)
otaviomacedo Aug 4, 2025
9e18c47
chore: npm-check-updates && yarn upgrade (#4872)
aws-cdk-automation Aug 4, 2025
5286889
chore(deps): Bump mypy from 1.15.0 to 1.16.1 in /packages/@jsii/pytho…
dependabot[bot] Aug 4, 2025
858a3a7
chore(deps-dev): Update mkdocs-material requirement from ~=9.6.15 to …
dependabot[bot] Aug 4, 2025
9991020
chore(deps): Bump mypy from 1.15.0 to 1.17.1 in /packages/@jsii/pytho…
dependabot[bot] Aug 4, 2025
7249e35
chore(deps): Update pip requirement from ~=25.1 to ~=25.2 in /package…
dependabot[bot] Aug 5, 2025
10d5158
chore(deps-dev): Update build requirement from ~=1.2.2.post1 to ~=1.3…
dependabot[bot] Aug 6, 2025
5457837
chore(deps): Bump actions/download-artifact from 4 to 5 (#4884)
dependabot[bot] Aug 6, 2025
fe06d78
chore: npm-check-updates && yarn upgrade (#4886)
aws-cdk-automation Aug 6, 2025
040c593
chore(deps): Bump the go-deps group across 2 directories with 1 updat…
dependabot[bot] Aug 8, 2025
fd4385a
feat: jsii and jsii-rosetta v5.9 (#4885)
mrgrain Aug 8, 2025
0356608
chore(deps): Bump actions/checkout from 4 to 5 (#4888)
dependabot[bot] Aug 12, 2025
d6572d3
chore(deps): Bump amannn/action-semantic-pull-request from 5 to 6 (#4…
dependabot[bot] Aug 14, 2025
30dd200
chore: npm-check-updates && yarn upgrade (#4889)
aws-cdk-automation Aug 20, 2025
baa3ef8
chore(deps): Bump actions/setup-java from 4 to 5 (#4891)
dependabot[bot] Aug 21, 2025
920a09a
chore(deps): Bump the go-deps group across 2 directories with 1 updat…
dependabot[bot] Aug 25, 2025
48b6c1b
chore(deps): Bump the go-deps group across 2 directories with 1 updat…
dependabot[bot] Aug 27, 2025
464fe6c
chore(deps-dev): Update mkdocs-material requirement from ~=9.6.16 to …
dependabot[bot] Aug 28, 2025
e92b9eb
chore(deps): Update cattrs requirement from <25.2,>=1.8 to >=1.8,<25.…
dependabot[bot] Sep 1, 2025
d75658e
feat: prepare support for intersection types (#4898)
rix0rrr Sep 3, 2025
c0b7d2b
chore: fix build problems (#4899)
rix0rrr Sep 3, 2025
c4070d7
chore(deps): Bump actions/setup-dotnet from 4 to 5 (#4900)
dependabot[bot] Sep 4, 2025
1ce0261
chore: fix build (#4901)
rix0rrr Sep 4, 2025
332c044
chore: skip commit on CodeBuild
rix0rrr Sep 4, 2025
ff051a0
chore: also need to skip changelog generation w/o git repo
rix0rrr Sep 4, 2025
a5f1032
chore(release): 1.114.0
Sep 4, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v4
uses: actions/checkout@v5
- name: Set up Python
uses: actions/setup-python@v5
with:
Expand Down Expand Up @@ -54,12 +54,12 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v4
uses: actions/checkout@v5
with:
ref: gh-pages
token: ${{ secrets.PROJEN_GITHUB_TOKEN }}
- name: Download Artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: doc-site
path: ${{ runner.temp }}/site
Expand Down
47 changes: 23 additions & 24 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,18 +23,18 @@ jobs:
steps:
# Check out the code
- name: Check out
uses: actions/checkout@v4
uses: actions/checkout@v5
# Set up all of our standard runtimes
- name: Set up .NET 6
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '6.0.x'
- name: Set up Go 1.23
uses: actions/setup-go@v5
with:
go-version: '1.23'
- name: Set up Java 8
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: '8'
Expand Down Expand Up @@ -105,18 +105,18 @@ jobs:
steps:
# Check out the code
- name: Check out
uses: actions/checkout@v4
uses: actions/checkout@v5
# Set up all of our standard runtimes
- name: Set up .NET 6
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '6.0.x'
- name: Set up Go 1.23
uses: actions/setup-go@v5
with:
go-version: '1.23'
- name: Set up Java 8
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: '8'
Expand Down Expand Up @@ -189,7 +189,7 @@ jobs:
dotnet: ['6.0.x']
go: ['1.23']
java: ['8']
node: ['18'] # EOL 2025-04-30
node: ['20'] # EOS 2026-10-30
os: [ubuntu-latest]
python: ['3.9']
# Add specific combinations to be tested against (to restrict cardinality)
Expand All @@ -200,22 +200,22 @@ jobs:
dotnet: '6.0.x'
go: '1.23'
java: '8'
node: '18'
node: '20'
python: '3.9'
# Test using macOS
- title: 'macOS'
os: macos-latest
dotnet: '6.0.x'
go: '1.23'
java: '8'
node: '18'
node: '20'
python: '3.9'
# Test alternate Nodes
- title: 'Node 18'
java: '8'
dotnet: '6.0.x'
go: '1.23'
node: '18' # EOL 2025-04-30
node: '18' # EOS 2025-11-30
os: ubuntu-latest
python: '3.9'
- title: 'Node 20'
Expand Down Expand Up @@ -244,23 +244,23 @@ jobs:
java: '8'
dotnet: '7.0.x'
go: '1.23'
node: '18'
node: '20'
os: ubuntu-latest
python: '3.9'
# Test alternate Gos
- title: 'Go 1.24'
java: '8'
dotnet: '6.0.x'
go: '1.24'
node: '18'
node: '20'
os: ubuntu-latest
python: '3.9'
# Test alternate Javas
- title: 'Java 11'
java: '11'
dotnet: '6.0.x'
go: '1.23'
node: '18'
node: '20'
os: ubuntu-latest
python: '3.9'
# Test alternate Pythons
Expand All @@ -269,27 +269,27 @@ jobs:
dotnet: '6.0.x'
go: '1.23'
java: '8'
node: '18'
node: '20'
os: ubuntu-latest
- title: 'Python 3.10'
python: '3.10'
dotnet: '6.0.x'
go: '1.23'
java: '8'
node: '18'
node: '20'
os: ubuntu-latest
- title: 'Python 3.11'
python: '3.11'
dotnet: '6.0.x'
go: '1.23'
java: '8'
node: '18'
node: '20'
os: ubuntu-latest
runs-on: ${{ matrix.os }}
steps:
# Check out the code
- name: Download Artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: built-tree
- name: Extract Artifact
Expand All @@ -301,15 +301,15 @@ jobs:
rm built-tree.tgz
# Set up all of our standard runtimes (this is matrix-based)
- name: Set up .NET ${{ matrix.dotnet }}
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Set up Go ${{ matrix.go }}
uses: actions/setup-go@v5
with:
go-version: ${{ matrix.go }}
- name: Set up Java ${{ matrix.java }}
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'zulu'
java-version: ${{ matrix.java }}
Expand Down Expand Up @@ -378,28 +378,27 @@ jobs:
matrix:
rosetta:
- latest
- 5.5.x
- 5.6.x
- 5.7.x
- 5.8.x
- 5.9.x
steps:
# Check out the code
- name: Download Artifact
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: release-package
path: ${{ runner.temp }}/release-package
# Set up all of our standard runtimes
- name: Set up .NET 7
uses: actions/setup-dotnet@v4
uses: actions/setup-dotnet@v5
with:
dotnet-version: '7.0.x'
- name: Set up Go 1.23
uses: actions/setup-go@v5
with:
go-version: '1.23'
- name: Set up Java 20
uses: actions/setup-java@v4
uses: actions/setup-java@v5
with:
distribution: 'corretto'
java-version: '20'
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pull-request-lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:
permissions:
pull-requests: write
steps:
- uses: amannn/action-semantic-pull-request@v5
- uses: amannn/action-semantic-pull-request@v6
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check Out
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Set up Node
uses: actions/setup-node@v4
Expand Down Expand Up @@ -119,10 +119,10 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check Out
uses: actions/checkout@v4
uses: actions/checkout@v5

- name: Download patch
uses: actions/download-artifact@v4
uses: actions/download-artifact@v5
with:
name: upgrade.patch
path: ${{ runner.temp }}
Expand Down
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

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.

## [1.114.0](https://github.com/aws/jsii/compare/v1.113.0...v1.114.0) (2025-09-04)


### Features

* jsii and jsii-rosetta v5.9 ([#4885](https://github.com/aws/jsii/issues/4885)) ([fd4385a](https://github.com/aws/jsii/commit/fd4385aa6d15fba2112c673b83511466687603d4))
* prepare support for intersection types ([#4898](https://github.com/aws/jsii/issues/4898)) ([d75658e](https://github.com/aws/jsii/commit/d75658e146a17c26e9cc6294cef00322af683672))

## [1.113.0](https://github.com/aws/jsii/compare/v1.112.0...v1.113.0) (2025-07-31)


Expand Down
4 changes: 4 additions & 0 deletions buildspec.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ phases:
commands:
- yarn build && yarn test
- yarn dist-clean

# Do a candidate version bump, guaranteed to be distinct from published versions
- npx standard-version --release-as patch --skip.commit --skip.changelog

- /bin/bash ./scripts/align-version.sh
- yarn build
post_build:
Expand Down
26 changes: 26 additions & 0 deletions docs/updating-go-version.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
# Updating the Go version in jsii

Each major Go release is supported until there are two newer major releases. When a Go release reaches it end of life,
we should remove support for it in jsii. To do this, you have to:

## 1. Update jsii/superchain

- Update the `GO_VERSION` in the [Dockerfile](https://github.com/aws/jsii-superchain/blob/main/superchain/Dockerfile#L87)

## 2. Update `cdk init` template

- Needs to be updated to the new version, so that new apps declare their minimum requirements correctly.
- See example [PR](https://github.com/aws/aws-cdk-cli/pull/768)s

## 3. Update @jsii/go-runtime and jsii repo

- Update the baseline version of Go in `.github/workflows/main.yml`.
- Update `packages/@jsii/go-runtime/jsii-runtime-go/go.mod`
- Update the value of the `GO_VERSION` constant in `packages/jsii-pacmak/lib/targets/go/package.ts`. Don't forget to
also update the `jsii-pacmak` jest snapshots.
- Update `packages/@jsii/go-runtime-test/project/go.mod`.

## 4. Update jsii-pacmak in aws-cdk-lib (Automatic)

Eventually the above updates will be released and the jsii-pacmak version in `aws-cdk-lib` will be updated automatically.
This should now pass the canaries and everything is completed.
2 changes: 1 addition & 1 deletion gh-pages/requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
mkdocs~=1.6.1
mkdocs-awesome-pages-plugin~=2.10.1
mkdocs-material~=9.6.15
mkdocs-material~=9.6.18
mkdocs-git-revision-date-plugin~=0.3.2
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,6 @@
"rejectCycles": true
}
},
"version": "1.113.0",
"version": "1.114.0",
"$schema": "node_modules/lerna/schemas/lerna-schema.json"
}
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@
"@jest/types": "^29.6.3",
"@types/jest": "^30.0.0",
"@types/node": "^18",
"@typescript-eslint/eslint-plugin": "^8.38.0",
"@typescript-eslint/parser": "^8.38.0",
"@typescript-eslint/eslint-plugin": "^8.40.0",
"@typescript-eslint/parser": "^8.40.0",
"all-contributors-cli": "^6.26.1",
"eslint": "^9.31.0",
"eslint": "^9.33.0",
"eslint-config-prettier": "^10.1.8",
"eslint-import-resolver-node": "^0.3.9",
"eslint-import-resolver-typescript": "^4.4.4",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-prettier": "^5.5.3",
"eslint-plugin-prettier": "^5.5.4",
"jest": "^30.0.5",
"jest-circus": "^30.0.5",
"jest-config": "^30.0.5",
Expand All @@ -37,7 +37,7 @@
"prettier": "^3.6.2",
"standard-version": "^9.5.0",
"ts-node": "^10.9.2",
"typescript": "5.8.x"
"typescript": "5.9.x"
},
"repository": {
"type": "git",
Expand Down
8 changes: 4 additions & 4 deletions packages/@jsii/go-runtime-test/project/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ require (
github.com/aws/jsii/jsii-calc/go/jcb v0.0.0
github.com/aws/jsii/jsii-calc/go/jsiicalc/v3 v3.20.120
github.com/aws/jsii/jsii-calc/go/scopejsiicalclib v0.0.0-devpreview
github.com/stretchr/testify v1.10.0
github.com/stretchr/testify v1.11.1
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/tools v0.35.0
golang.org/x/tools v0.36.0
)

require (
Expand All @@ -23,9 +23,9 @@ require (
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
golang.org/x/mod v0.26.0 // indirect
golang.org/x/mod v0.27.0 // indirect
golang.org/x/sync v0.16.0 // indirect
golang.org/x/sys v0.34.0 // indirect
golang.org/x/sys v0.35.0 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
)

Expand Down
Loading
Loading