From 914bbebc13a66dedebb598097deeb75bfc31a4af Mon Sep 17 00:00:00 2001 From: Usta Shrestha Date: Wed, 2 Nov 2022 01:00:01 -0400 Subject: [PATCH] go.mod readability improvement Bug: N/A Test: Verified by loading the project in IntelliJ Change-Id: I9fa16fbea108436a52fc3bb4b39d9a2c1a73bee5 --- go.mod | 31 ++++++++++++++----------------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/go.mod b/go.mod index 5f0b91aa9..7239f6d13 100644 --- a/go.mod +++ b/go.mod @@ -1,24 +1,21 @@ module android/soong -require google.golang.org/protobuf v0.0.0 +require ( + google.golang.org/protobuf v0.0.0 + github.com/google/blueprint v0.0.0 + prebuilts/bazel/common/proto/analysis_v2 v0.0.0 + prebuilts/bazel/common/proto/build v0.0.0 // indirect +) -require github.com/google/blueprint v0.0.0 - -replace google.golang.org/protobuf v0.0.0 => ../../external/golang-protobuf - -replace github.com/google/blueprint v0.0.0 => ../blueprint +replace ( + google.golang.org/protobuf v0.0.0 => ../../external/golang-protobuf + github.com/google/blueprint v0.0.0 => ../blueprint + github.com/google/go-cmp v0.5.5 => ../../external/go-cmp + prebuilts/bazel/common/proto/analysis_v2 => ../../prebuilts/bazel/common/proto/analysis_v2 + prebuilts/bazel/common/proto/build => ../../prebuilts/bazel/common/proto/build +) // 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 - -require prebuilts/bazel/common/proto/analysis_v2 v0.0.0 - -replace prebuilts/bazel/common/proto/analysis_v2 => ../../prebuilts/bazel/common/proto/analysis_v2 - -require prebuilts/bazel/common/proto/build v0.0.0 // indirect - -replace prebuilts/bazel/common/proto/build => ../../prebuilts/bazel/common/proto/build - -go 1.18 +go 2.0