Skip to content

Commit

Permalink
chore(release): 1.75.0 (#3965)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] committed Feb 14, 2023
2 parents 6d08790 + f86b257 commit 63bb957
Show file tree
Hide file tree
Showing 69 changed files with 22,741 additions and 22,123 deletions.
9 changes: 6 additions & 3 deletions .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,15 +68,18 @@ jobs:
- name: Run "ncu -u"
# We special-case typescript because it's not semantically versionned, and major.minor is the API contract
# We special-case @types/fs-extra because 9.0.13 is the last version that supports typescript@3.9
# We special-case @types/yargs because 17.0.13 is the last version that doesn't break
# We special-case eslint-plugin-import because 26 is the last version that works for us.
run: |-
# Upgrade devDependencies at repository root
ncu --upgrade --target=minor --filter=@types/inquirer,@types/node,@jest/types,jest-config,jest-circus
ncu --upgrade --target=patch --filter=typescript
ncu --upgrade --target=latest --reject=@types/inquirer,@types/node,typescript,@jest/types,jest-config,jest-circus
ncu --upgrade --target=latest --reject=@types/inquirer,@types/node,typescript,@jest/types,jest-config,jest-circus,eslint-plugin-import
# Upgrade all production dependencies (and other always major-pinned dependencies)
lerna exec --parallel ncu -- --upgrade --target=minor \
--filter='${{ steps.production-dependencies.outputs.list }}' \
--filter='@types/fs-extra,${{ steps.production-dependencies.outputs.list }}' \
--reject='typescript,${{ steps.monorepo-packages.outputs.list }}'
# Upgrade all minor-pinned dependencies
Expand All @@ -85,7 +88,7 @@ jobs:
# Upgrade all other dependencies (devDependencies) to the latest
lerna exec --parallel ncu -- --upgrade --target=latest \
--reject='@types/inquirer,@types/node,typescript,${{ steps.production-dependencies.outputs.list }},${{ steps.monorepo-packages.outputs.list }}'
--reject='@types/inquirer,@types/node,typescript,@types/fs-extra,@types/yargs,${{ steps.production-dependencies.outputs.list }},${{ steps.monorepo-packages.outputs.list }}'
# This will ensure the current lockfile is up-to-date with the dependency specifications (necessary for "yarn update" to run)
- name: Run "yarn install"
Expand Down
13 changes: 13 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,19 @@

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.75.0](https://github.com/aws/jsii/compare/v1.74.0...v1.75.0) (2023-02-14)


### Features

* **check-node:** export NodeRelease class ([#3959](https://github.com/aws/jsii/issues/3959)) ([7e18e57](https://github.com/aws/jsii/commit/7e18e57595317780f591d60e623c2e14794dbe7f))


### Bug Fixes

* **go:** shorten file names for sub-packages ([#3927](https://github.com/aws/jsii/issues/3927)) ([7697571](https://github.com/aws/jsii/commit/7697571542df82b5d228faf85d0e637edb254519))
* **rosetta:** submodule-qualified names produce invalid Go, Java ([#3928](https://github.com/aws/jsii/issues/3928)) ([1ff230d](https://github.com/aws/jsii/commit/1ff230d9f7bc969e888e418375e7858df2a14424)), closes [#3551](https://github.com/aws/jsii/issues/3551)

## [1.74.0](https://github.com/aws/jsii/compare/v1.73.0...v1.74.0) (2023-01-28)


Expand Down
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.4.2
mkdocs-awesome-pages-plugin~=2.8.0
mkdocs-material~=9.0.6
mkdocs-material~=9.0.11
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 @@ -10,5 +10,5 @@
"rejectCycles": true
}
},
"version": "1.74.0"
"version": "1.75.0"
}
23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
},
"devDependencies": {
"@jest/types": "^28.1.3",
"@types/jest": "^29.2.5",
"@types/jest": "^29.4.0",
"@types/node": "^14.18.36",
"@typescript-eslint/eslint-plugin": "^5.48.0",
"@typescript-eslint/parser": "^5.48.0",
"@typescript-eslint/eslint-plugin": "^5.51.0",
"@typescript-eslint/parser": "^5.51.0",
"all-contributors-cli": "^6.24.0",
"eslint": "^8.31.0",
"eslint": "^8.33.0",
"eslint-config-prettier": "^8.6.0",
"eslint-import-resolver-node": "^0.3.6",
"eslint-import-resolver-typescript": "^3.5.2",
"eslint-plugin-import": "^2.26.0",
"eslint-import-resolver-node": "^0.3.7",
"eslint-import-resolver-typescript": "^3.5.3",
"eslint-plugin-import": "2.26.0",
"eslint-plugin-prettier": "^4.2.1",
"jest": "^29.3.1",
"jest": "^29.4.2",
"jest-circus": "^28.1.3",
"jest-config": "^28.1.3",
"jest-expect-message": "^1.1.3",
"lerna": "^6.3.0",
"prettier": "^2.8.1",
"lerna": "^6.4.1",
"prettier": "^2.8.4",
"standard-version": "^9.5.0",
"ts-node": "^10.9.1",
"typescript": "~4.7.4"
Expand All @@ -53,5 +53,8 @@
"**/@fixtures/jsii-calc-bundled/**",
"**/typescript"
]
},
"resolutions": {
"@types/yargs": "17.0.19"
}
}
2 changes: 1 addition & 1 deletion packages/@jsii/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Update="NSubstitute" Version="4.4.0" />
<PackageReference Update="xunit" Version="2.4.2" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
<PackageReference Update="XunitXml.TestLogger" Version="3.0.70" />
<PackageReference Update="XunitXml.TestLogger" Version="3.0.78" />

<PackageReference Update="Newtonsoft.Json" Version="13.0.2" />
</ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions packages/@jsii/benchmarks/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
"yargs": "^16.2.0"
},
"devDependencies": {
"@types/glob": "^8.0.0",
"glob": "^8.0.3"
"@types/glob": "^8.0.1",
"glob": "^8.1.0"
},
"scripts": {
"build": "yarn --silent tsc --build && npm run lint",
Expand Down
4 changes: 2 additions & 2 deletions packages/@jsii/check-node/src/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ export class NodeRelease {
supportedRange: '^12.7.0',
}),

// Currently active releases
// Currently active releases (as of last edit to this file...)
new NodeRelease(14, {
endOfLife: new Date('2023-04-30'),
supportedRange: '^14.6.0',
Expand All @@ -46,9 +46,9 @@ export class NodeRelease {
supportedRange: '^17.3.0',
}),
new NodeRelease(18, { endOfLife: new Date('2025-04-30') }),
new NodeRelease(19, { endOfLife: new Date('2023-06-01') }),

// Future (planned releases)
new NodeRelease(19, { endOfLife: new Date('2023-06-01') }),
new NodeRelease(20, { endOfLife: new Date('2026-04-30'), untested: true }),
];

Expand Down
2 changes: 2 additions & 0 deletions packages/@jsii/check-node/src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ import { version } from 'process';

import { NodeRelease } from './constants';

export { NodeRelease } from './constants';

/**
* Checks the current process' node runtime version against the release support
* matrix, and issues a warning to STDERR if the current version is not fully
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/go-runtime-test/project/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ require (
github.com/Masterminds/semver/v3 v3.2.0 // indirect
github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2 v2.1.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/mattn/go-isatty v0.0.16 // indirect
github.com/mattn/go-isatty v0.0.17 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/yuin/goldmark v1.4.13 // indirect
golang.org/x/mod v0.7.0 // indirect
Expand Down
12 changes: 2 additions & 10 deletions packages/@jsii/go-runtime-test/project/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYr
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand All @@ -30,18 +30,10 @@ golang.org/x/sync v0.1.0 h1:wsuoTGHzEhffawBOhz5CYhcrV4IdKZbEyZjBMuTp12o=
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.2.0 h1:ljd4t30dBnAvMZaQCevtY0xLLD0A+bRZXbgLMLU1F/A=
golang.org/x/sys v0.2.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.3.0 h1:w8ZOecv6NaNa/zC8944JTU3vz4u6Lagfk4RPQxv92NQ=
golang.org/x/sys v0.3.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.4.0 h1:Zr2JFtRQNX3BCZ8YtxRE9hNJYC8J6I1MVbMg6owUp18=
golang.org/x/sys v0.4.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
golang.org/x/tools v0.3.0 h1:SrNbZl6ECOS1qFzgTdQfWXZM9XBkiA6tkFrH9YSTPHM=
golang.org/x/tools v0.3.0/go.mod h1:/rWhSS2+zyEVwoJf8YAX6L2f0ntZ7Kn/mGgAWcipA5k=
golang.org/x/tools v0.4.0 h1:7mTAgkunk3fr4GAloyyCasadO6h9zSsQZbwvcaIciV4=
golang.org/x/tools v0.4.0/go.mod h1:UE5sM2OK9E/d67R0ANs2xJizIymRP5gJU295PvKXxjQ=
golang.org/x/tools v0.5.0 h1:+bSpV5HIeWkuvgaMfI3UmKRThoTA5ODJTUd8T17NO+4=
golang.org/x/tools v0.5.0/go.mod h1:N+Kgy78s5I24c24dU8OfWNEotWjutIs8SnJvn5IDq+k=
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/go-runtime/jsii-runtime-go/go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.18

require (
github.com/Masterminds/semver/v3 v3.2.0
github.com/mattn/go-isatty v0.0.16
github.com/mattn/go-isatty v0.0.17
github.com/stretchr/testify v1.8.1
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
golang.org/x/tools v0.5.0
Expand Down
4 changes: 2 additions & 2 deletions packages/@jsii/go-runtime/jsii-runtime-go/go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ github.com/Masterminds/semver/v3 v3.2.0/go.mod h1:qvl/7zhW3nngYb5+80sSMF+FG2BjYr
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/mattn/go-isatty v0.0.16 h1:bq3VjFmv/sOjHtdEhmkEV4x1AJtvUvOJ2PFAZ5+peKQ=
github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/mattn/go-isatty v0.0.17 h1:BTarxUcIeDqL27Mc+vyvdWYSL28zpIhv3RoTdsLMPng=
github.com/mattn/go-isatty v0.0.17/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/java-runtime/pom.xml.t.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ process.stdout.write(`<?xml version="1.0" encoding="UTF-8"?>
<javax-annotations.version>[1.3.2,1.4.0)</javax-annotations.version>
<jetbrains-annotations.version>[13.0.0,24.0-a0)</jetbrains-annotations.version>
<junit.version>[5.8.0,5.10-a0)</junit.version>
<mockito.version>[3.12.4,4.0-a0)</mockito.version>
<mockito.version>[4.11.0,5.0-a0)</mockito.version>
</properties>
<dependencies>
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/python-runtime/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,6 @@
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"jsii-pacmak": "^0.0.0",
"pyright": "^1.1.287"
"pyright": "^1.1.293"
}
}
4 changes: 2 additions & 2 deletions packages/@jsii/python-runtime/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
black~=22.12
mypy==0.812
pip~=22.3
pip~=23.0
pytest~=7.2
pytest-mypy~=0.10
setuptools~=62.2
setuptools~=65.5.1
wheel~=0.38

-e .
2 changes: 1 addition & 1 deletion packages/jsii-config/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"devDependencies": {
"@types/inquirer": "^8.2.3",
"@types/yargs": "^17.0.19",
"@types/yargs": "17.0.19",
"jest-expect-message": "^1.1.3"
},
"dependencies": {
Expand Down
25 changes: 4 additions & 21 deletions packages/jsii-pacmak/lib/targets/go/package.ts
Original file line number Diff line number Diff line change
Expand Up @@ -203,7 +203,7 @@ export abstract class Package {
if (this.types.length > 0) {
const { code } = context;

const initFile = join(this.directory, `${this.packageName}.go`);
const initFile = join(this.directory, `main.go`);
code.openFile(initFile);
code.line(`package ${this.packageName}`);
code.line();
Expand Down Expand Up @@ -238,10 +238,7 @@ export abstract class Package {

private emitTypes(context: EmitContext) {
for (const type of this.types) {
const filePath = join(
this.directory,
`${this.packageName}_${type.name}.go`,
);
const filePath = join(this.directory, `${type.name}.go`);
context.code.openFile(filePath);

this.emitHeader(context.code);
Expand All @@ -266,23 +263,9 @@ export abstract class Package {
return;
}

emit.call(
this,
join(
this.directory,
`${this.packageName}_${type.name}__runtime_type_checks.go`,
),
false,
);
emit.call(this, join(this.directory, `${type.name}__checks.go`), false);

emit.call(
this,
join(
this.directory,
`${this.packageName}_${type.name}__no_runtime_type_checking.go`,
),
true,
);
emit.call(this, join(this.directory, `${type.name}__no_checks.go`), true);

function emit(this: Package, filePath: string, forNoOp: boolean) {
code.openFile(filePath);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# be installed in the virtual environment used for building the distribution
# package (wheel, sdist), but not declared as build-system dependencies.

setuptools~=62.1.0 # build-system
setuptools~=65.5.1 # build-system
wheel~=0.38.4 # build-system

twine~=4.0.2
2 changes: 1 addition & 1 deletion packages/jsii-pacmak/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
"jsii": "^0.0.0",
"jsii-build-tools": "^0.0.0",
"jsii-calc": "^3.20.120",
"pyright": "^1.1.287"
"pyright": "^1.1.293"
},
"keywords": [
"jsii",
Expand Down
Loading

0 comments on commit 63bb957

Please sign in to comment.