StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Update go.mod and go.work for go 1.22" into main am: 6d67f4b600

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/3101492

Change-Id: Idf5207b7b8e8723149dee82483114912b0c99eb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-05-24 19:16:01 +00:00
committed by Automerger Merge Worker
parent 30d7c0b8af 6d67f4b600
commit 699c8802f2
3 changed files with 23 additions and 25 deletions
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
)