Skip to content

Commit 4fd370b

Browse files
RomainMullerRomainMuller
authored
chore: drop support for go < 1.18 (#3774)
Those have been end-of-life for a while now, and go 1.20 is expected to release in February 2023.
1 parent d98aa1b commit 4fd370b

File tree

11 files changed

+275
-492
lines changed

11 files changed

+275
-492
lines changed

‎.github/workflows/main.yml‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -224,18 +224,6 @@ jobs:
224224
os: ubuntu-latest
225225
python: '3.7'
226226
# Test alternate Gos
227-
- java: '8'
228-
dotnet: '3.1.x'
229-
go: '1.16' # EOL since March 15, 2022 (in grace period until end of september 2022)
230-
node: '14'
231-
os: ubuntu-latest
232-
python: '3.7'
233-
- java: '8'
234-
dotnet: '3.1.x'
235-
go: '1.17' # EOL since August 02, 2022 (in grace period until end of september 2022)
236-
node: '14'
237-
os: ubuntu-latest
238-
python: '3.7'
239227
- java: '8'
240228
dotnet: '3.1.x'
241229
go: '1.19'

‎.mergify/config.yml‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,9 @@ queue_rules:
1414
# One test for each supported dotnet version
1515
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
1616
- status-success~=^Test \(.* dotnet 6\.0\.x .*$
17+
# One test for each supported go version
18+
- status-success~=^Test \(.* go 1.18 .*$
19+
- status-success~=^Test \(.* go 1.19 .*$
1720
# One test for Java 8 and 11
1821
- status-success~=^Test \(.* java 8 .*$
1922
- status-success~=^Test \(.* java 11 .*$
@@ -63,6 +66,9 @@ pull_request_rules:
6366
# One test for each supported dotnet version
6467
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
6568
- status-success~=^Test \(.* dotnet 6\.0\.x .*$
69+
# One test for each supported go version
70+
- status-success~=^Test \(.* go 1.18 .*$
71+
- status-success~=^Test \(.* go 1.19 .*$
6672
# One test for Java 8 and 11
6773
- status-success~=^Test \(.* java 8 .*$
6874
- status-success~=^Test \(.* java 11 .*$
@@ -112,6 +118,9 @@ pull_request_rules:
112118
# One test for each supported dotnet version
113119
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
114120
- status-success~=^Test \(.* dotnet 6\.0\.x .*$
121+
# One test for each supported go version
122+
- status-success~=^Test \(.* go 1.18 .*$
123+
- status-success~=^Test \(.* go 1.19 .*$
115124
# One test for Java 8 and 11
116125
- status-success~=^Test \(.* java 8 .*$
117126
- status-success~=^Test \(.* java 11 .*$
@@ -161,6 +170,9 @@ pull_request_rules:
161170
# One test for each supported dotnet version
162171
- status-success~=^Test \(.* dotnet 3\.1\.x .*$
163172
- status-success~=^Test \(.* dotnet 6\.0\.x .*$
173+
# One test for each supported go version
174+
- status-success~=^Test \(.* go 1.18 .*$
175+
- status-success~=^Test \(.* go 1.19 .*$
164176
# One test for Java 8 and 11
165177
- status-success~=^Test \(.* java 8 .*$
166178
- status-success~=^Test \(.* java 11 .*$

‎CONTRIBUTING.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,13 +50,15 @@ in your development environment.
5050
+ [`setuptools >= 38.6.0`](https://pypi.org/project/setuptools/)
5151
+ [`wheel`](https://pypi.org/project/wheel/)
5252
+ *Recommended:* [`twine`](https://pypi.org/project/twine/)
53+
- [Go] `1.18` or newer
5354

5455
[Node `14.6.0`]: https://nodejs.org/download/release/v14.6.0/
5556
[Yarn `1.19.1`]: https://yarnpkg.com/en/docs/install
5657
[Oracle's OpenJDK8]: http://openjdk.java.net/install/
5758
[Amazon Corretto 8]: https://aws.amazon.com/corretto/
5859
[.NET Core `3.1`]: https://www.microsoft.com/net/download
5960
[Python `3.7.3`]: https://www.python.org/downloads/release/python-373/
61+
[Go]: https://go.dev/dl/
6062

6163
## Getting Started
6264
### Bootstrapping

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

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/aws/jsii/go-runtime-test
22

3-
go 1.16
3+
go 1.18
44

55
require (
66
github.com/aws/jsii-runtime-go v0.0.0
@@ -12,6 +12,19 @@ require (
1212
golang.org/x/tools v0.1.12
1313
)
1414

15+
require (
16+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
17+
github.com/aws/jsii/jsii-calc/go/scopejsiicalcbaseofbase/v2 v2.1.1 // indirect
18+
github.com/davecgh/go-spew v1.1.1 // indirect
19+
github.com/mattn/go-isatty v0.0.16 // indirect
20+
github.com/pmezard/go-difflib v1.0.0 // indirect
21+
github.com/yuin/goldmark v1.4.13 // indirect
22+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
23+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
24+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
25+
gopkg.in/yaml.v3 v3.0.1 // indirect
26+
)
27+
1528
replace (
1629
github.com/aws/jsii-runtime-go v0.0.0 => ../../go-runtime/jsii-runtime-go
1730
github.com/aws/jsii/jsii-calc/go/jcb v0.0.0 => ../jsii-calc/go/jcb

‎packages/@jsii/go-runtime/jsii-runtime-go/go.mod‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/aws/jsii-runtime-go
22

3-
go 1.16
3+
go 1.18
44

55
require (
66
github.com/Masterminds/semver/v3 v3.1.1
@@ -10,4 +10,14 @@ require (
1010
golang.org/x/tools v0.1.12
1111
)
1212

13+
require (
14+
github.com/davecgh/go-spew v1.1.1 // indirect
15+
github.com/pmezard/go-difflib v1.0.0 // indirect
16+
github.com/yuin/goldmark v1.4.13 // indirect
17+
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 // indirect
18+
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
19+
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
20+
gopkg.in/yaml.v3 v3.0.1 // indirect
21+
)
22+
1323
retract v1.27.0

‎packages/@jsii/go-runtime/jsii-runtime-go/go.sum‎

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,38 +16,24 @@ github.com/yuin/goldmark v1.4.13 h1:fVcFKWvrslecOb/tg+Cc05dkeYx540o0FuFt3nUVDoE=
1616
github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
1717
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
1818
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
19-
golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
2019
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 h1:VLliZ0d+/avPrXXH+OakdXhpJuEoBZuwh1m2j7U6Iug=
2120
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616/go.mod h1:3xt1FjdF8hUf6vQPIChWIBhFzV8gjjsPE/fR3IyQdNY=
2221
golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
2322
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4 h1:6zppjxzCulZykYSLyVDYbneBfbaBIQPYMevg0bEwv2s=
2423
golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
2524
golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
2625
golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
27-
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg=
2826
golang.org/x/net v0.0.0-20220722155237-a158d28d115b h1:PxfKdU9lEEDYjdIzOtC4qFWgkU2rGHdKlKowJSMN9h0=
2927
golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
3028
golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
31-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
3229
golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
3330
golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
34-
golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
35-
golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
36-
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
37-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
3831
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
3932
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
40-
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
41-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
4233
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
43-
golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
44-
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
45-
golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
46-
golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
4734
golang.org/x/tools v0.0.0-20200130002326-2f3ba24bd6e7/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
4835
golang.org/x/tools v0.1.12 h1:VveCTK38A2rkS8ZqFY25HIDFscX5X9OoEhJd3quQmXU=
4936
golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
50-
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5137
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
5238
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
5339
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=

‎packages/jsii-pacmak/lib/targets/go.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,9 @@ export class Golang extends Target {
4242

4343
try {
4444
// run `go build` with local.go.mod, go 1.16+ requires that we download
45-
// modules explicit so go.sum is updated. We'd normally want to use
46-
// `go mod download`, but because of a bug in go 1.16, we have to use
47-
// `go mod tidy` instead.
48-
//
49-
// See: https://github.com/golang/go/issues/44129
45+
// modules explicit so go.sum is updated. We'd want to use
46+
// `go mod download`, but it does not add missing entries in the `go.sum`
47+
// file while `go mod tidy` does.
5048
await go('mod', ['tidy', '-modfile', localGoMod.path], {
5149
cwd: pkgDir,
5250
});

‎packages/jsii-pacmak/lib/targets/go/package.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ import {
3636
import { VersionFile } from './version-file';
3737

3838
export const GOMOD_FILENAME = 'go.mod';
39-
export const GO_VERSION = '1.16';
39+
export const GO_VERSION = '1.18';
4040

4141
/*
4242
* Package represents a single `.go` source file within a package. This can be the root package file or a submodule
@@ -288,8 +288,6 @@ export abstract class Package {
288288
code.openFile(filePath);
289289
// Conditional compilation tag...
290290
code.line(`//go:build ${forNoOp ? '' : '!'}no_runtime_type_checking`);
291-
// For go1.16 compatibility
292-
code.line(`// +build ${forNoOp ? '' : '!'}no_runtime_type_checking`);
293291
code.line();
294292
this.emitHeader(code);
295293

‎packages/jsii-pacmak/test/generated-code/__snapshots__/examples.test.js.snap‎

Lines changed: 2 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/jsii-pacmak/test/generated-code/__snapshots__/prerelease-identifiers.test.js.snap‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)