Skip to content

Commit

Permalink
chore(release): 1.44.0 (#3164)
Browse files Browse the repository at this point in the history
  • Loading branch information
mergify[bot] authored Nov 15, 2021
2 parents b69a797 + 2083eb0 commit 5cf3021
Show file tree
Hide file tree
Showing 67 changed files with 1,597 additions and 860 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/docker-images.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
DEFAULT_NODE_MAJOR_VERSION: 12
steps:
- name: Check out
uses: actions/checkout@v2.3.4
uses: actions/checkout@v2.4.0

# Determine if we should run the validation or not
- name: Should this run?
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/gh-pages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
with:
python-version: '3.8'
- name: Check out
uses: actions/checkout@v2.3.4
uses: actions/checkout@v2.4.0
- name: Locate Caches
id: cache-locations
run: |-
Expand Down Expand Up @@ -58,7 +58,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out
uses: actions/checkout@v2.3.4
uses: actions/checkout@v2.4.0
with:
ref: gh-pages
token: ${{ secrets.AUTO_APPROVE_GITHUB_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
steps:
# Check out the code
- name: Check out
uses: actions/checkout@v2.3.4
uses: actions/checkout@v2.4.0
# Set up all of our standard runtimes
- name: Set up .NET 5
uses: actions/setup-dotnet@v1
Expand Down Expand Up @@ -119,7 +119,7 @@ jobs:
steps:
# Check out the code
- name: Check out
uses: actions/checkout@v2.3.4
uses: actions/checkout@v2.4.0
# Set up all of our standard runtimes
- name: Set up .NET 5
uses: actions/setup-dotnet@v1
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/pr-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ jobs:
runs-on: ubuntu-latest
permissions:
pull-requests: write
issues: write
steps:
- run: gh pr edit ${{ github.event.pull_request.number }} --add-label "pr/auto-approve" -R ${{ github.repository }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4 changes: 2 additions & 2 deletions .github/workflows/yarn-upgrade.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
steps:

- name: Check Out
uses: actions/checkout@v2.3.4
uses: actions/checkout@v2.4.0

- name: Set up Node
uses: actions/setup-node@v2.4.1
Expand Down Expand Up @@ -115,7 +115,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check Out
uses: actions/checkout@v2
uses: actions/checkout@v2.4.0

- name: Download patch
uses: actions/download-artifact@v2
Expand Down
20 changes: 20 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,26 @@

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.44.0](https://github.com/aws/jsii/compare/v1.43.0...v1.44.0) (2021-11-15)


### Features

* **rosetta:** expose the 'extract' API ([#3161](https://github.com/aws/jsii/issues/3161)) ([c3b30c0](https://github.com/aws/jsii/commit/c3b30c093515e8bce4922eed1a88536e8c2080e8))


### Bug Fixes

* dependency submodules may not be discovered ([#3151](https://github.com/aws/jsii/issues/3151)) ([5768bb9](https://github.com/aws/jsii/commit/5768bb9951856f4a051c24db7f56d23fd8573815))
* deprecation warnings are generated even when one property is not deprecated ([#3157](https://github.com/aws/jsii/issues/3157)) ([e566f37](https://github.com/aws/jsii/commit/e566f37802438a929d66448c1d67b7a2c2e901a1))
* **jsii:** incorrectly allowed unexported type in constructor params ([#3147](https://github.com/aws/jsii/issues/3147)) ([7cd59fc](https://github.com/aws/jsii/commit/7cd59fc180648b6c4b873364ef301b3228e69885))
* **pacmak:** remove disclaimer on compiling examples ([#3148](https://github.com/aws/jsii/issues/3148)) ([75e4093](https://github.com/aws/jsii/commit/75e4093af9123f50b2ba92c1f70be6e9a2ed46b6))
* **pacmak:** Support more than 255 properties for interfaces in Java ([#3133](https://github.com/aws/jsii/issues/3133)) ([ba4a20d](https://github.com/aws/jsii/commit/ba4a20df41e7298ba6518652a5046deaac490c3b)), closes [#3132](https://github.com/aws/jsii/issues/3132) [#3132](https://github.com/aws/jsii/issues/3132)
* **rosetta:** `didCompile` evaluates to true when compilation not attempted ([#3149](https://github.com/aws/jsii/issues/3149)) ([7ad9e0a](https://github.com/aws/jsii/commit/7ad9e0a9013316e730b89bdf3b9934ec0174c742))
* **rosetta:** cache source file parses ([#3163](https://github.com/aws/jsii/issues/3163)) ([307d3ca](https://github.com/aws/jsii/commit/307d3ca09b6a2d1bae2754b9aaf1be98e77d016f))
* **rosetta:** gets confused by type unions ([#3156](https://github.com/aws/jsii/issues/3156)) ([ca04dad](https://github.com/aws/jsii/commit/ca04dad3f54981d59177309b2d5c7626256ca3a9))
* **rosetta:** snippet throughput incorrect ([#3145](https://github.com/aws/jsii/issues/3145)) ([91418d6](https://github.com/aws/jsii/commit/91418d60d5a0b10a32579a3393139d6f04853cde))

## [1.43.0](https://github.com/aws/jsii/compare/v1.42.0...v1.43.0) (2021-11-08)


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.2.3
mkdocs-awesome-pages-plugin~=2.6.0
mkdocs-material~=7.3.2
mkdocs-material~=7.3.6
mkdocs-git-revision-date-plugin~=0.3.1
5 changes: 3 additions & 2 deletions lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
"npmClient": "yarn",
"useWorkspaces": true,
"packages": [
"packages/*"
"packages/*",
"regression-tests/@*/*"
],
"command": {
"bootstrap": {
"rejectCycles": true
}
},
"version": "1.43.0"
"version": "1.44.0"
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
"packages/*",
"packages/@jsii/*",
"packages/@scope/*",
"regression-tests/@*/*",
"tools/*"
],
"nohoist": [
Expand Down
4 changes: 2 additions & 2 deletions packages/@jsii/Directory.Build.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<ItemGroup>
<!-- Central configuration of dependency versions for all DotNet packages -->

<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="5.0.2" />
<PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
<PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />

Expand All @@ -14,7 +14,7 @@
<PackageReference Update="NSubstitute" Version="4.2.2" />
<PackageReference Update="xunit" Version="2.4.1" />
<PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
<PackageReference Update="XunitXml.TestLogger" Version="3.0.66" />
<PackageReference Update="XunitXml.TestLogger" Version="3.0.70" />

<PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion packages/@jsii/python-runtime/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ mypy==0.812
pip~=21.3
pytest~=6.2
pytest-mypy~=0.8
setuptools~=58.2
setuptools~=58.5
wheel~=0.37

-e .
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ import {
} from 'jsii-rosetta';
import * as xmlbuilder from 'xmlbuilder';

import {
INCOMPLETE_DISCLAIMER_COMPILING,
INCOMPLETE_DISCLAIMER_NONCOMPILING,
} from '..';
import { INCOMPLETE_DISCLAIMER_NONCOMPILING } from '..';
import { renderSummary } from '../_utils';
import { DotNetNameUtils } from './nameutils';

Expand Down Expand Up @@ -188,9 +185,6 @@ export class DotNetDocGenerator {
}

private prefixDisclaimer(translated: Translation) {
if (translated.didCompile && INCOMPLETE_DISCLAIMER_COMPILING) {
return `// ${INCOMPLETE_DISCLAIMER_COMPILING}\n${translated.source}`;
}
if (!translated.didCompile && INCOMPLETE_DISCLAIMER_NONCOMPILING) {
return `// ${INCOMPLETE_DISCLAIMER_NONCOMPILING}\n${translated.source}`;
}
Expand Down
4 changes: 1 addition & 3 deletions packages/jsii-pacmak/lib/targets/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,5 @@ export const ALL_BUILDERS: { [key in TargetName]: BuilderFactory } = {
new IndependentPackageBuilder(TargetName.PYTHON, Python, ms, o),
};

export const INCOMPLETE_DISCLAIMER_COMPILING =
'Example automatically generated. See https://github.com/aws/jsii/issues/826';
export const INCOMPLETE_DISCLAIMER_NONCOMPILING =
'Example automatically generated without compilation. See https://github.com/aws/jsii/issues/826';
'Example automatically generated from non-compiling source. May contain errors.';
24 changes: 6 additions & 18 deletions packages/jsii-pacmak/lib/targets/java.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,7 @@ import { VERSION, VERSION_DESC } from '../version';
import { stabilityPrefixFor, renderSummary } from './_utils';
import { toMavenVersionRange, toReleaseVersion } from './version-utils';

import {
INCOMPLETE_DISCLAIMER_COMPILING,
INCOMPLETE_DISCLAIMER_NONCOMPILING,
TargetName,
} from '.';
import { INCOMPLETE_DISCLAIMER_NONCOMPILING, TargetName } from '.';

// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-require-imports
const spdxLicenseList = require('spdx-license-list');
Expand Down Expand Up @@ -2021,7 +2017,7 @@ class JavaGenerator extends Generator {
);

props.forEach((prop) =>
this.code.line(`private ${prop.fieldJavaType} ${prop.fieldName};`),
this.code.line(`${prop.fieldJavaType} ${prop.fieldName};`),
);
props.forEach((prop) =>
this.emitBuilderSetter(prop, BUILDER_CLASS_NAME, classSpec),
Expand All @@ -2040,9 +2036,7 @@ class JavaGenerator extends Generator {
this.code.line('@Override');
this.code.openBlock(`public ${classSpec.name} build()`);

const propFields = props.map((prop) => prop.fieldName).join(', ');

this.code.line(`return new ${constructorName}(${propFields});`);
this.code.line(`return new ${constructorName}(this);`);
this.code.closeBlock();
// End build()

Expand Down Expand Up @@ -2116,7 +2110,7 @@ class JavaGenerator extends Generator {
this.code.closeBlock();
// End JSII reference constructor

// Start literal constructor
// Start builder constructor
this.code.line();
this.code.line('/**');
this.code.line(
Expand All @@ -2126,11 +2120,8 @@ class JavaGenerator extends Generator {
if (props.some((prop) => prop.fieldJavaType !== prop.paramJavaType)) {
this.code.line('@SuppressWarnings("unchecked")');
}
const constructorArgs = props
.map((prop) => `final ${prop.paramJavaType} ${prop.fieldName}`)
.join(', ');
this.code.openBlock(
`protected ${INTERFACE_PROXY_CLASS_NAME}(${constructorArgs})`,
`protected ${INTERFACE_PROXY_CLASS_NAME}(final ${BUILDER_CLASS_NAME} builder)`,
);
this.code.line(
'super(software.amazon.jsii.JsiiObject.InitializationMode.JSII);',
Expand All @@ -2142,7 +2133,7 @@ class JavaGenerator extends Generator {
: '';
this.code.line(
`this.${prop.fieldName} = ${explicitCast}${_validateIfNonOptional(
prop.fieldName,
`builder.${prop.fieldName}`,
prop,
)};`,
);
Expand Down Expand Up @@ -3013,9 +3004,6 @@ class JavaGenerator extends Generator {
}

private prefixDisclaimer(translated: Translation) {
if (translated.didCompile && INCOMPLETE_DISCLAIMER_COMPILING) {
return `// ${INCOMPLETE_DISCLAIMER_COMPILING}\n${translated.source}`;
}
if (!translated.didCompile && INCOMPLETE_DISCLAIMER_NONCOMPILING) {
return `// ${INCOMPLETE_DISCLAIMER_NONCOMPILING}\n${translated.source}`;
}
Expand Down
9 changes: 1 addition & 8 deletions packages/jsii-pacmak/lib/targets/python.ts
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,7 @@ import {
import { die, toPythonIdentifier } from './python/util';
import { toPythonVersionRange, toReleaseVersion } from './version-utils';

import {
INCOMPLETE_DISCLAIMER_COMPILING,
INCOMPLETE_DISCLAIMER_NONCOMPILING,
TargetName,
} from '.';
import { INCOMPLETE_DISCLAIMER_NONCOMPILING, TargetName } from '.';

// eslint-disable-next-line @typescript-eslint/no-var-requires,@typescript-eslint/no-require-imports
const spdxLicenseList = require('spdx-license-list');
Expand Down Expand Up @@ -2400,9 +2396,6 @@ class PythonGenerator extends Generator {
}

private prefixDisclaimer(translated: Translation) {
if (translated.didCompile && INCOMPLETE_DISCLAIMER_COMPILING) {
return `# ${INCOMPLETE_DISCLAIMER_COMPILING}\n${translated.source}`;
}
if (!translated.didCompile && INCOMPLETE_DISCLAIMER_NONCOMPILING) {
return `# ${INCOMPLETE_DISCLAIMER_NONCOMPILING}\n${translated.source}`;
}
Expand Down
4 changes: 2 additions & 2 deletions packages/jsii-pacmak/lib/targets/python/requirements-dev.txt
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~=58.3.0 # build-system
setuptools~=58.5.3 # build-system
wheel~=0.37.0 # build-system

twine~=3.4.2
twine~=3.5.0
Loading

0 comments on commit 5cf3021

Please sign in to comment.