chore(release): 1.77.0 (#3989)

.all-contributorsrc

@@ -1549,6 +1549,15 @@
       "contributions": [
         "bug"
       ]
+    },
+    {
+      "login": "greglucas",
+      "name": "Greg Lucas",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12417828?v=4",
+      "profile": "https://github.com/greglucas",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "repoType": "github",

.github/workflows/main.yml

@@ -283,6 +283,13 @@ jobs:
             java: '8'
             node: '14'
             os: ubuntu-latest
+          - title: 'Python 3.11'
+            python: '3.11'
+            dotnet: '6.0.x'
+            go: '1.18'
+            java: '8'
+            node: '14'
+            os: ubuntu-latest
 
     runs-on: ${{ matrix.os }}
 

.mergify/config.yml

@@ -22,6 +22,7 @@ queue_rules:
       - status-success=Test (Python 3.8)
       - status-success=Test (Python 3.9)
       - status-success=Test (Python 3.10)
+      - status-success=Test (Python 3.11)
 
 pull_request_rules:
   - name: label core
@@ -71,6 +72,7 @@ pull_request_rules:
       - status-success=Test (Python 3.8)
       - status-success=Test (Python 3.9)
       - status-success=Test (Python 3.10)
+      - status-success=Test (Python 3.11)
 
   - name: Synchronize that PR to upstream and merge it (squash)
     actions:
@@ -120,6 +122,7 @@ pull_request_rules:
       - status-success=Test (Python 3.8)
       - status-success=Test (Python 3.9)
       - status-success=Test (Python 3.10)
+      - status-success=Test (Python 3.11)
 
   - name: Synchronize that PR to upstream and merge it (no-squash)
     actions:
@@ -169,6 +172,7 @@ pull_request_rules:
       - status-success=Test (Python 3.8)
       - status-success=Test (Python 3.9)
       - status-success=Test (Python 3.10)
+      - status-success=Test (Python 3.11)
 
   - name: Clean branch up
     actions:

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 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.77.0](https://github.com/aws/jsii/compare/v1.76.0...v1.77.0) (2023-03-06)
+
+
+### Bug Fixes
+
+* **dotnet:** target netcoreapp3.1 with RollForward ([#3987](https://github.com/aws/jsii/issues/3987)) ([461446b](https://github.com/aws/jsii/commit/461446b1b65f60a789aff7d9804aec7b5d867cf7))
+* **rosetta:** go may incorrectly emit _ instead of . ([#3985](https://github.com/aws/jsii/issues/3985)) ([52163f8](https://github.com/aws/jsii/commit/52163f88e22ad48ed4fcbfb2ff002c9f8bf6dc52))
+* **rosetta:** prints colors to log file ([#3953](https://github.com/aws/jsii/issues/3953)) ([0fc9229](https://github.com/aws/jsii/commit/0fc9229383e23cd535d8fa0a5867e6e51618f00a))
+
 ## [1.76.0](https://github.com/aws/jsii/compare/v1.75.0...v1.76.0) (2023-02-24)
 
 

gh-pages/content/user-guides/lib-author/configuration/targets/python.md

@@ -20,6 +20,7 @@ The `python` target requires two configuration entries:
     - `Programming Language :: Python :: 3.8`
     - `Programming Language :: Python :: 3.9`
     - `Programming Language :: Python :: 3.10`
+    - `Programming Language :: Python :: 3.11`
 
 Example:
 

gh-pages/requirements-dev.txt

@@ -1,4 +1,4 @@
 mkdocs~=1.4.2
 mkdocs-awesome-pages-plugin~=2.8.0
-mkdocs-material~=9.0.12
+mkdocs-material~=9.0.15
 mkdocs-git-revision-date-plugin~=0.3.2

lerna.json

@@ -10,5 +10,5 @@
       "rejectCycles": true
     }
   },
-  "version": "1.76.0"
+  "version": "1.77.0"
 }

package.json

@@ -17,11 +17,11 @@
   "devDependencies": {
     "@jest/types": "^28.1.3",
     "@types/jest": "^29.4.0",
-    "@types/node": "^14.18.36",
-    "@typescript-eslint/eslint-plugin": "^5.52.0",
-    "@typescript-eslint/parser": "^5.52.0",
+    "@types/node": "^14.18.37",
+    "@typescript-eslint/eslint-plugin": "^5.54.0",
+    "@typescript-eslint/parser": "^5.54.0",
     "all-contributors-cli": "^6.24.0",
-    "eslint": "^8.34.0",
+    "eslint": "^8.35.0",
     "eslint-config-prettier": "^8.6.0",
     "eslint-import-resolver-node": "^0.3.7",
     "eslint-import-resolver-typescript": "^3.5.3",

packages/@jsii/Directory.Build.targets

@@ -6,11 +6,11 @@
     <PackageReference Update="Microsoft.Extensions.Logging" Version="5.0.0" />
     <PackageReference Update="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
 
-    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.4.0" />
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.5.0" />
     <PackageReference Update="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageReference Update="Microsoft.CodeQuality.Analyzers" Version="3.3.2" />
 
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.4.1" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.5.0" />
     <PackageReference Update="NSubstitute" Version="5.0.0" />
     <PackageReference Update="xunit" Version="2.4.2" />
     <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />

packages/@jsii/benchmarks/package.json

@@ -13,8 +13,8 @@
     "yargs": "^16.2.0"
   },
   "devDependencies": {
-    "@types/glob": "^8.0.1",
-    "glob": "^8.1.0"
+    "@types/glob": "^8.1.0",
+    "glob": "^9.2.1"
   },
   "scripts": {
     "build": "yarn --silent tsc --build && npm run lint",

packages/@jsii/benchmarks/scripts/snapshot-package.ts

@@ -42,7 +42,7 @@ function snapshotAwsCdk(tag: string, file: string) {
   fs.copySync(path.resolve(repoDir, 'packages', 'aws-cdk-lib'), intermediate);
 
   // Remove build artifacts so we can rebuild
-  const artifacts = glob.sync(
+  const artifacts = glob.globSync(
     path.join(intermediate, '**/*@(.js|.js.map|.d.ts|.tsbuildinfo)'),
   );
   const exceptions = new Set([

packages/@jsii/dotnet-runtime-test/test/Amazon.JSII.Runtime.IntegrationTests/ComplianceTests.cs

@@ -937,7 +937,7 @@ public void OptionalAndVariadicArgumentsTest()
         [Fact(DisplayName = Prefix + nameof(JsiiAgentIsCorrect))]
         public void JsiiAgentIsCorrect()
         {
-            Assert.Equal("DotNet/" + Environment.Version + "/.NETCoreApp,Version=v6.0/1.0.0.0", JsiiAgent.Value);
+            Assert.Equal("DotNet/" + Environment.Version + "/.NETCoreApp,Version=v3.1/1.0.0.0", JsiiAgent.Value);
         }
 
         [Fact(DisplayName = Prefix + nameof(ReceiveInstanceOfPrivateClass))]

packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Amazon.JSII.Runtime.csproj

@@ -2,7 +2,8 @@
   <Import Project="../NuGet.Metadata.props" />
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <RollForward>Major</RollForward>
     <PackageId>Amazon.JSII.Runtime</PackageId>
     <Title>.NET Runtime for JSII</Title>
     <PackageIcon>icon.png</PackageIcon>

packages/@jsii/dotnet-runtime/src/Amazon.JSII.Runtime/Services/TypeCache.cs

@@ -202,7 +202,7 @@ void CacheTypes(Assembly assembly)
                     }
                 }
 
-                return e.Types;
+                return e.Types ?? Array.Empty<Type?>();
             }
         }
     }

packages/@jsii/go-runtime-test/project/go.mod

@@ -7,7 +7,7 @@ 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.8.1
+	github.com/stretchr/testify v1.8.2
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616
 	golang.org/x/tools v0.6.0
 )
@@ -18,6 +18,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/mattn/go-isatty v0.0.17 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/objx v0.5.0 // indirect
 	github.com/yuin/goldmark v1.4.13 // indirect
 	golang.org/x/mod v0.8.0 // indirect
 	golang.org/x/sys v0.5.0 // indirect

packages/@jsii/go-runtime-test/project/go.sum

@@ -9,11 +9,14 @@ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZb
 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=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
+github.com/stretchr/objx v0.5.0 h1:1zr/of2m5FGMsad5YfcqgdqdWrIhu+EBEJRhR1U7z/c=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1 h1:w7B6lhMri9wdJUVmEZPGGhZzrYTPvgJArz7wNPgYKsk=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
+github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
+github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

packages/@jsii/integ-test/package.json

@@ -27,6 +27,6 @@
   },
   "devDependencies": {
     "@types/fs-extra": "^9.0.13",
-    "@types/tar": "^6.1.3"
+    "@types/tar": "^6.1.4"
   }
 }

packages/@jsii/kernel/package.json

@@ -41,7 +41,7 @@
     "@scope/jsii-calc-lib": "^0.0.0",
     "@types/fs-extra": "^9.0.13",
     "@types/lockfile": "^1.0.2",
-    "@types/tar": "^6.1.3",
+    "@types/tar": "^6.1.4",
     "jest-expect-message": "^1.1.3",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120"

packages/@jsii/python-runtime/package.json

@@ -42,6 +42,6 @@
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
     "jsii-pacmak": "^0.0.0",
-    "pyright": "^1.1.294"
+    "pyright": "^1.1.296"
   }
 }

packages/@jsii/python-runtime/pyproject.toml

@@ -3,7 +3,7 @@ requires = ["setuptools~=62.2", "wheel~=0.37"]
 build-backend = 'setuptools.build_meta'
 
 [tool.black]
-target-version = ['py37', 'py38', 'py39', 'py310']
+target-version = ['py37', 'py38', 'py39', 'py310', 'py311']
 include = '\.pyi?$'
 exclude = '\.(git|mypy_cache|env)'
 

packages/@jsii/python-runtime/requirements.txt

@@ -1,5 +1,5 @@
 black~=23.1
-mypy==1.0.0
+mypy==1.0.1
 pip~=23.0
 pytest~=7.2
 pytest-mypy~=0.10

packages/@jsii/python-runtime/setup.py

@@ -32,6 +32,7 @@
     install_requires=[
         "attrs>=21.2,<23.0",
         "cattrs>=1.8,<22.3",
+        "importlib_resources>=5.2.0",
         "publication>=0.0.3",  # This is used by all generated code.
         "typeguard~=2.13.3",  # This is used by all generated code.
         "python-dateutil",
@@ -48,6 +49,7 @@
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Topic :: Software Development :: Libraries",
         "Topic :: Utilities",
         "Typing :: Typed",

packages/@jsii/python-runtime/src/jsii/__meta__.py

@@ -3,7 +3,9 @@
 from ._compat import importlib_resources
 
 # Load our version number and other metadata.
-_meta = json.loads(importlib_resources.read_text("jsii", "_metadata.json"))
+_meta = json.loads(
+    importlib_resources.files("jsii").joinpath("_metadata.json").read_text()
+)
 
 __version__ = _meta["version"]
 __jsii_runtime_version__ = _meta["jsii-runtime"]["version"]

packages/@jsii/python-runtime/src/jsii/_compat.py

@@ -2,10 +2,7 @@
 import sys
 
 
-if sys.version_info >= (3, 7):
-    import importlib.resources as importlib_resources
-else:
-    import importlib_resources
+import importlib_resources
 
 
 __all__ = ["importlib_resources"]

packages/@jsii/python-runtime/src/jsii/_kernel/providers/process.py

@@ -237,7 +237,11 @@ def _jsii_runtime(self) -> str:
         for resname, filename in resources.items():
             pathlib.Path(os.path.dirname(filename)).mkdir(exist_ok=True)
             with open(filename, "wb") as fp:
-                fp.write(importlib_resources.read_binary(jsii._embedded.jsii, resname))
+                fp.write(
+                    importlib_resources.files(jsii._embedded.jsii)
+                    .joinpath(resname)
+                    .read_bytes()
+                )
 
         # Return our first path, which should be the path for jsii-runtime.js
         return resources[jsii._embedded.jsii.ENTRYPOINT]

packages/@jsii/python-runtime/src/jsii/_runtime.py

@@ -44,11 +44,13 @@ def load(cls, *args, _kernel=kernel, **kwargs) -> "JSIIAssembly":
         assembly = cls(*args, **kwargs)
 
         # Actually load the assembly into the kernel, we're using the
-        # importlib.resources API here isntead of manually constructing the path, in
+        # importlib.resources API here instead of manually constructing the path, in
         # the hopes that this will make JSII modules able to be used with zipimport
         # instead of only on the FS.
-        with importlib_resources.path(
-            f"{assembly.module}._jsii", assembly.filename
+        with importlib_resources.as_file(
+            importlib_resources.files(f"{assembly.module}._jsii").joinpath(
+                assembly.filename
+            )
         ) as assembly_path:
             _kernel.load(assembly.name, assembly.version, os.fspath(assembly_path))
 

packages/@jsii/python-runtime/tests/test_compliance.py

@@ -602,7 +602,7 @@ def the_property(self, value):
             # but this causes a problem because of:
             #   https://bugs.python.org/issue14965
             # so now we have this more convoluted form.
-            super(self.__class__, self.__class__).the_property.__set__(
+            super(self.__class__, self.__class__).the_property.__set__(  # type: ignore
                 self, f"{value}:by override"
             )
 

packages/jsii-diff/package.json

@@ -37,7 +37,7 @@
     "@jsii/spec": "^0.0.0",
     "fs-extra": "^10.1.0",
     "jsii-reflect": "^0.0.0",
-    "log4js": "^6.7.1",
+    "log4js": "^6.8.0",
     "yargs": "^16.2.0"
   },
   "devDependencies": {

packages/jsii-pacmak/lib/targets/dotnet.ts

@@ -18,7 +18,7 @@ import { toReleaseVersion } from './version-utils';
 
 import { TargetName } from '.';
 
-export const TARGET_FRAMEWORK = 'net6.0';
+export const TARGET_FRAMEWORK = 'netcoreapp3.1';
 
 /**
  * Build .NET packages all together, by generating an aggregate solution file

packages/jsii-pacmak/lib/targets/dotnet/filegenerator.ts

@@ -112,6 +112,8 @@ export class FileGenerator {
     propertyGroup.ele('Nullable', 'enable');
     propertyGroup.ele('SymbolPackageFormat', 'snupkg');
     propertyGroup.ele('TargetFramework', TARGET_FRAMEWORK);
+    // Transparently rolll forward across major SDK releases if needed
+    propertyGroup.ele('RollForward', 'Major');
 
     const itemGroup1 = rootNode.ele('ItemGroup');
     const embeddedResource = itemGroup1.ele('EmbeddedResource');

packages/jsii-pacmak/lib/targets/python.ts

@@ -2124,6 +2124,7 @@ class Package {
         'Programming Language :: Python :: 3.8',
         'Programming Language :: Python :: 3.9',
         'Programming Language :: Python :: 3.10',
+        'Programming Language :: Python :: 3.11',
         'Typing :: Typed',
       ],
       scripts,

packages/jsii-pacmak/package.json

@@ -65,7 +65,7 @@
     "jsii": "^0.0.0",
     "jsii-build-tools": "^0.0.0",
     "jsii-calc": "^3.20.120",
-    "pyright": "^1.1.294"
+    "pyright": "^1.1.296"
   },
   "keywords": [
     "jsii",