tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update go.mod and go.work for go 1.22

Browse source 
Go 1.22 is more strict about GOPROXY=off, so we need to update the
go.work file to point at local copies of dependencies.

Bug: 330574836
Test: Presubmits
Change-Id: I37dbc821f138fe8977636316ebe3e7986ccdfa0e
This commit is contained in:
Cole Faust 2024-05-23 16:28:15 -07:00
parent 25889d80af
commit 9a6e468646
3 changed files with 23 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
tools/compliance/go.mod
View file

@ -1,29 +1,11 @@
go 1.22
module android/soong/tools/compliance
require google.golang.org/protobuf v0.0.0
replace google.golang.org/protobuf v0.0.0 => ../../../../external/golang-protobuf
require (
android/soong v0.0.0
github.com/google/blueprint v0.0.0
android/soong v0.0.0
google.golang.org/protobuf v0.0.0
github.com/spdx/tools-golang v0.0.0
github.com/google/go-cmp v0.0.0
)
replace github.com/spdx/tools-golang v0.0.0 => ../../../../external/spdx-tools
require golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f // indirect
replace android/soong v0.0.0 => ../../../soong
replace github.com/google/blueprint => ../../../blueprint
// Indirect deps from golang-protobuf
exclude github.com/golang/protobuf v1.5.0
replace github.com/google/go-cmp v0.5.5 => ../../../../external/go-cmp
// Indirect dep from go-cmp
exclude golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543
go 1.21

2
tools/compliance/go.sum
View file

@ -1,2 +0,0 @@
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f h1:uF6paiQQebLeSXkrTqHqz0MXhXXS1KgF41eUdBNvxK0=
golang.org/x/xerrors v0.0.0-20220609144429-65e65417b02f/go.mod h1:K8+ghG5WaK9qNqU5K3HdILfMLy1f3aNYFI/wnl100a8=

18
tools/compliance/go.work Normal file
View file

@ -0,0 +1,18 @@
go 1.22
use (
.
../../../../build/blueprint
../../../../build/soong
../../../../external/go-cmp
../../../../external/golang-protobuf
../../../../external/spdx-tools
)
replace (
github.com/google/blueprint v0.0.0 => ../../../../build/blueprint
android/soong v0.0.0 => ../../../../build/soong
github.com/google/go-cmp v0.0.0 => ../../../../external/go-cmp
google.golang.org/protobuf v0.0.0 => ../../../../external/golang-protobuf
github.com/spdx/tools-golang v0.0.0 => ../../../../external/spdx-tools
)