Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6d67f4b6 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update go.mod and go.work for go 1.22" into main

parents 4caa319d 9a6e4686

tools/compliance/go.mod

+5 −23
Original line number Diff line number Diff line 
module android/soong/tools/compliance



require google.golang.org/protobuf v0.0.0

go 1.22



replace google.golang.org/protobuf v0.0.0 => ../../../../external/golang-protobuf

module android/soong/tools/compliance



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

tools/compliance/go.sum

deleted100644 → 0
+0 −2
Original line number Diff line number Diff line 
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=

tools/compliance/go.work

0 → 100644
+18 −0
Original line number Diff line number Diff line 
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

)