Skip to content

Commit ee1e2bc

Browse files
author
Daniel Mikusa
authored
Merge pull request #60 from paketo-buildpacks/go17
Bump to using Go 1.17 and fix module declarations to have major version suffix
2 parents 883f8ea + c36e687 commit ee1e2bc

File tree

7 files changed

+28
-9
lines changed

7 files changed

+28
-9
lines changed

clojure/build_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ import (
2929
"github.com/paketo-buildpacks/libbs"
3030
"github.com/sclevine/spec"
3131

32-
"github.com/paketo-buildpacks/clojure-tools/clojure"
32+
"github.com/paketo-buildpacks/clojure-tools/v2/clojure"
3333
)
3434

3535
func testBuild(t *testing.T, context spec.G, it spec.S) {

clojure/detect_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import (
2626
. "github.com/onsi/gomega"
2727
"github.com/sclevine/spec"
2828

29-
"github.com/paketo-buildpacks/clojure-tools/clojure"
29+
"github.com/paketo-buildpacks/clojure-tools/v2/clojure"
3030
)
3131

3232
func testDetect(t *testing.T, context spec.G, it spec.S) {

clojure/distribution_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
"github.com/paketo-buildpacks/libpak"
2828
"github.com/sclevine/spec"
2929

30-
"github.com/paketo-buildpacks/clojure-tools/clojure"
30+
"github.com/paketo-buildpacks/clojure-tools/v2/clojure"
3131
)
3232

3333
func testDistribution(t *testing.T, context spec.G, it spec.S) {

cmd/main/main.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/paketo-buildpacks/libpak"
2424
"github.com/paketo-buildpacks/libpak/bard"
2525

26-
"github.com/paketo-buildpacks/clojure-tools/clojure"
26+
"github.com/paketo-buildpacks/clojure-tools/v2/clojure"
2727
)
2828

2929
func main() {

go.mod

+23-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
module github.com/paketo-buildpacks/clojure-tools
1+
module github.com/paketo-buildpacks/clojure-tools/v2
22

3-
go 1.15
3+
go 1.17
44

55
require (
66
github.com/buildpacks/libcnb v1.25.5
@@ -9,3 +9,24 @@ require (
99
github.com/paketo-buildpacks/libpak v1.58.0
1010
github.com/sclevine/spec v1.4.0
1111
)
12+
13+
require (
14+
github.com/BurntSushi/toml v1.0.0 // indirect
15+
github.com/Masterminds/semver/v3 v3.1.1 // indirect
16+
github.com/creack/pty v1.1.17 // indirect
17+
github.com/heroku/color v0.0.6 // indirect
18+
github.com/imdario/mergo v0.3.12 // indirect
19+
github.com/magiconair/properties v1.8.5 // indirect
20+
github.com/mattn/go-colorable v0.1.2 // indirect
21+
github.com/mattn/go-isatty v0.0.8 // indirect
22+
github.com/mattn/go-shellwords v1.0.12 // indirect
23+
github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect
24+
github.com/paketo-buildpacks/libjvm v1.35.0 // indirect
25+
github.com/pavel-v-chernykh/keystore-go/v4 v4.3.0 // indirect
26+
github.com/pelletier/go-toml v1.9.4 // indirect
27+
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8 // indirect
28+
golang.org/x/net v0.0.0-20210726213435-c6fcb2dbf985 // indirect
29+
golang.org/x/sys v0.0.0-20220207234003-57398862261d // indirect
30+
golang.org/x/text v0.3.6 // indirect
31+
gopkg.in/yaml.v2 v2.4.0 // indirect
32+
)

go.sum

-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ github.com/golang/protobuf v1.5.2/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu
2828
github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
2929
github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
3030
github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
31-
github.com/google/go-cmp v0.5.5 h1:Khx7svrCpmxxtHBq5j2mp/xVjsi8hQMfNLvJFAlrGgU=
3231
github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
3332
github.com/google/pprof v0.0.0-20210407192527-94a9f03dee38/go.mod h1:kpwsk12EmLew5upagYY7GY0pfYCcupk39gWOCRROcvE=
3433
github.com/heroku/color v0.0.6 h1:UTFFMrmMLFcL3OweqP1lAdp8i1y/9oHqkeHjQ/b/Ny0=
@@ -135,7 +134,6 @@ golang.org/x/tools v0.1.6-0.20210726203631-07bc1bf47fb2/go.mod h1:o0xws9oXOQQZyj
135134
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
136135
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
137136
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
138-
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
139137
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
140138
google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
141139
google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=

scripts/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
set -euo pipefail
44

5-
GOOS="linux" go build -ldflags='-s -w' -tags osusergo -o bin/main github.com/paketo-buildpacks/clojure-tools/cmd/main
5+
GOOS="linux" go build -ldflags='-s -w' -tags osusergo -o bin/main github.com/paketo-buildpacks/clojure-tools/v2/cmd/main
66

77
if [ "${STRIP:-false}" != "false" ]; then
88
strip bin/main

0 commit comments

Comments
 (0)