From bb463616b700c19ce351a1384126f6213d096dde Mon Sep 17 00:00:00 2001 From: shrouxm Date: Mon, 1 Mar 2021 14:55:11 -0800 Subject: [PATCH] depend on codeintelutils from sourcegraph/sourcegraph --- cmd/src/lsif_upload.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- internal/api/api.go | 2 +- internal/codeintel/upload.go | 2 +- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cmd/src/lsif_upload.go b/cmd/src/lsif_upload.go index 59cc72665c..4d0b2dc9fe 100644 --- a/cmd/src/lsif_upload.go +++ b/cmd/src/lsif_upload.go @@ -15,7 +15,7 @@ import ( "github.com/efritz/pentimento" "github.com/pkg/browser" "github.com/pkg/errors" - "github.com/sourcegraph/codeintelutils" + "github.com/sourcegraph/sourcegraph/enterprise/lib/codeintel/utils" "github.com/sourcegraph/src-cli/internal/codeintel" ) diff --git a/go.mod b/go.mod index 48678ee787..a918654d77 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/dustin/go-humanize v1.0.0 github.com/efritz/pentimento v0.0.0-20190429011147-ade47d831101 github.com/gobwas/glob v0.2.3 - github.com/google/go-cmp v0.5.2 + github.com/google/go-cmp v0.5.4 github.com/hashicorp/errwrap v1.1.0 // indirect github.com/hashicorp/go-multierror v1.1.0 github.com/jig/teereadcloser v0.0.0-20181016160506-953720c48e05 @@ -21,9 +21,9 @@ require ( github.com/pkg/browser v0.0.0-20180916011732-0a3d74bf9ce4 github.com/pkg/errors v0.9.1 github.com/sourcegraph/campaignutils v0.0.0-20210209103213-27e58c3ce8d3 - github.com/sourcegraph/codeintelutils v0.0.0-20210118231003-6698e102a8a1 github.com/sourcegraph/go-diff v0.6.1 github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf + github.com/sourcegraph/sourcegraph/enterprise/lib v0.0.0-20210301223818-d8082f761977 github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect golang.org/x/net v0.0.0-20200625001655-4c5254603344 diff --git a/go.sum b/go.sum index 236b4d6364..c72375bf53 100644 --- a/go.sum +++ b/go.sum @@ -10,10 +10,10 @@ github.com/efritz/pentimento v0.0.0-20190429011147-ade47d831101 h1:RylpU+KNJJNEJ github.com/efritz/pentimento v0.0.0-20190429011147-ade47d831101/go.mod h1:5ALWO82UZwfAtNRUtwzsWimcrcuYzyieTyyXOXrP6EQ= github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y= github.com/gobwas/glob v0.2.3/go.mod h1:d3Ez4x06l9bZtSvzIay5+Yzi0fmZzPgnTbPcKjJAkT8= -github.com/google/go-cmp v0.4.1 h1:/exdXoGamhu5ONeUJH0deniYLWYvQwW66yvlfiiKTu0= -github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.2 h1:X2ev0eStA3AbceY54o37/0PQ/UWqKEiiO2dKL5OPaFM= github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= +github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= +github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/hashicorp/errwrap v1.0.0 h1:hLrqtEDnRye3+sgx6z4qVLNuviH3MR5aQ0ykNJa/UYA= github.com/hashicorp/errwrap v1.0.0/go.mod h1:YH+1FKiLXxHSkmPseP+kNlulaMuP3n2brvKWEqk/Jc4= @@ -52,12 +52,12 @@ github.com/shurcooL/go v0.0.0-20180423040247-9e1955d9fb6e/go.mod h1:TDJrrUr11Vxr github.com/shurcooL/go-goon v0.0.0-20170922171312-37c2f522c041/go.mod h1:N5mDOmsrJOB+vfqUK+7DmDyjhSLIIBnXo9lvZJj3MWQ= github.com/sourcegraph/campaignutils v0.0.0-20210209103213-27e58c3ce8d3 h1:yXTWFqaMCMgjG3zVRGXjvuaUDfw2XnI6JD5Rh4V04e4= github.com/sourcegraph/campaignutils v0.0.0-20210209103213-27e58c3ce8d3/go.mod h1:xm6i78Mk2t4DBLQDqEFc/3x6IPf7yYZCgbNaTQGhJHA= -github.com/sourcegraph/codeintelutils v0.0.0-20210118231003-6698e102a8a1 h1:IPWruUo+BwPJqCHBVgjKxK6zTxMkOhwCSYpQ/jZHG/w= -github.com/sourcegraph/codeintelutils v0.0.0-20210118231003-6698e102a8a1/go.mod h1:HplI8gRslTrTUUsSYwu28hSOderix7m5dHNca7xBzeo= github.com/sourcegraph/go-diff v0.6.1 h1:hmA1LzxW0n1c3Q4YbrFgg4P99GSnebYa3x8gr0HZqLQ= github.com/sourcegraph/go-diff v0.6.1/go.mod h1:iBszgVvyxdc8SFZ7gm69go2KDdt3ag071iBaWPF6cjs= github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf h1:oAdWFqhStsWiiMP/vkkHiMXqFXzl1XfUNOdxKJbd6bI= github.com/sourcegraph/jsonx v0.0.0-20200629203448-1a936bd500cf/go.mod h1:ppFaPm6kpcHnZGqQTFhUIAQRIEhdQDWP1PCv4/ON354= +github.com/sourcegraph/sourcegraph/enterprise/lib v0.0.0-20210301223818-d8082f761977 h1:CL4GYvU/Cr0YIEFREUMIL62jnRpCNSR5rCOesxcuGig= +github.com/sourcegraph/sourcegraph/enterprise/lib v0.0.0-20210301223818-d8082f761977/go.mod h1:RaCJRy9qS6T4WSNOh9YKk3a+LC8xV2FmsVEywNAzBqk= github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152 h1:z/MpntplPaW6QW95pzcAR/72Z5TWDyDnSo0EOcyij9o= github.com/sourcegraph/yaml v1.0.1-0.20200714132230-56936252f152/go.mod h1:GIjDIg/heH5DOkXY3YJ/wNhfHsQHoXGjl8G8amsYQ1I= github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf h1:pvbZ0lM0XWPBqUKqFU8cmavspvIl9nulOYwdy6IFRRo= diff --git a/internal/api/api.go b/internal/api/api.go index 4bdcd585d4..bc5fcc041b 100644 --- a/internal/api/api.go +++ b/internal/api/api.go @@ -16,7 +16,7 @@ import ( ioaux "github.com/jig/teereadcloser" "github.com/kballard/go-shellquote" "github.com/mattn/go-isatty" - "github.com/sourcegraph/codeintelutils" + "github.com/sourcegraph/sourcegraph/enterprise/lib/codeintel/utils" ) // Client instances provide methods to create API requests. diff --git a/internal/codeintel/upload.go b/internal/codeintel/upload.go index 5b27ec71f9..06323a2306 100644 --- a/internal/codeintel/upload.go +++ b/internal/codeintel/upload.go @@ -4,7 +4,7 @@ import ( "encoding/base64" "fmt" - "github.com/sourcegraph/codeintelutils" + "github.com/sourcegraph/sourcegraph/enterprise/lib/codeintel/utils" ) type UploadIndexOpts = codeintelutils.UploadIndexOpts