Skip to content

Commit

Permalink
Merge branch 'main' into mrgrain/fix/unrelated-corrupted-assembly
Browse files Browse the repository at this point in the history
  • Loading branch information
mrgrain authored Sep 29, 2023
2 parents 07e7949 + 37566e5 commit cca1d52
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 17 deletions.
1 change: 1 addition & 0 deletions .github/workflows/build.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .projen/deps.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .projenrc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ project.tasks.addEnvironment('JSII_SUPPRESS_UPGRADE_PROMPT', 'true');

new RosettaPeerDependency(project, {
supportedVersions: {
[RosettaVersionLines.V1_X]: false,
[RosettaVersionLines.V1_X]: '~v1.85.0',
[RosettaVersionLines.V5_0]: '~5.0.14',
[RosettaVersionLines.V5_1]: '~5.1.2',
},
Expand Down
4 changes: 2 additions & 2 deletions package.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 20 additions & 12 deletions yarn.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit cca1d52

Please sign in to comment.