From 483a1e717f5c1d0a68061d596118a93b2d498d53 Mon Sep 17 00:00:00 2001 From: "Joe Richey joerichey@google.com" Date: Thu, 30 Aug 2018 01:26:47 -0700 Subject: [PATCH] Transition from dep to golang's module system --- Gopkg.lock | 119 ----------------------------------------------------- Gopkg.toml | 40 ------------------ go.mod | 12 ++++++ go.sum | 14 +++++++ 4 files changed, 26 insertions(+), 159 deletions(-) delete mode 100644 Gopkg.lock delete mode 100644 Gopkg.toml create mode 100644 go.mod create mode 100644 go.sum diff --git a/Gopkg.lock b/Gopkg.lock deleted file mode 100644 index d6dd34e..0000000 --- a/Gopkg.lock +++ /dev/null @@ -1,119 +0,0 @@ -# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'. - - -[[projects]] - branch = "lukyth/feature/ignore-vendor" - name = "github.com/golang/lint" - packages = [ - ".", - "golint" - ] - revision = "0dcd199f6e2c9e5fb738b78bfa2170de4c78a25f" - source = "github.com/lukyth/lint" - -[[projects]] - name = "github.com/golang/protobuf" - packages = [ - "jsonpb", - "proto", - "protoc-gen-go", - "protoc-gen-go/descriptor", - "protoc-gen-go/generator", - "protoc-gen-go/grpc", - "protoc-gen-go/plugin", - "ptypes/struct" - ] - revision = "925541529c1fa6821df4e44ce2723319eb2be768" - version = "v1.0.0" - -[[projects]] - branch = "master" - name = "github.com/kisielk/gotool" - packages = [ - ".", - "internal/load" - ] - revision = "d6ce6262d87e3a4e153e86023ff56ae771554a41" - -[[projects]] - name = "github.com/pkg/errors" - packages = ["."] - revision = "645ef00459ed84a119197bfb8d8205042c6df63d" - version = "v0.8.0" - -[[projects]] - name = "github.com/urfave/cli" - packages = ["."] - revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1" - version = "v1.20.0" - -[[projects]] - branch = "master" - name = "github.com/wadey/gocovmerge" - packages = ["."] - revision = "b5bfa59ec0adc420475f97f89b58045c721d761c" - -[[projects]] - branch = "master" - name = "golang.org/x/crypto" - packages = [ - "argon2", - "blake2b", - "hkdf", - "ssh/terminal" - ] - revision = "5119cf507ed5294cc409c092980c7497ee5d6fd2" - -[[projects]] - branch = "master" - name = "golang.org/x/sys" - packages = [ - "unix", - "windows" - ] - revision = "37707fdb30a5b38865cfb95e5aab41707daec7fd" - -[[projects]] - branch = "master" - name = "golang.org/x/tools" - packages = [ - "cmd/goimports", - "cover", - "go/ast/astutil", - "go/buildutil", - "go/gcexportdata", - "go/gcimporter15", - "go/loader", - "go/types/typeutil", - "imports" - ] - revision = "95b47aa5df4eda9bfbc0133f77c0e320f0275eba" - -[[projects]] - name = "honnef.co/go/tools" - packages = [ - "callgraph", - "callgraph/static", - "cmd/megacheck", - "deprecated", - "functions", - "internal/sharedcheck", - "lint", - "lint/lintutil", - "simple", - "ssa", - "ssa/ssautil", - "staticcheck", - "staticcheck/vrp", - "unused", - "version" - ] - revision = "d73ab98e7c39fdcf9ba65062e43d34310f198353" - version = "2017.2.2" - -[solve-meta] - analyzer-name = "dep" - analyzer-version = 1 - inputs-digest = "13bc740ba83539fecd6dd4b7d026fd221077369cb6b170e83d288383d0fde474" - solver-name = "gps-cdcl" - solver-version = 1 diff --git a/Gopkg.toml b/Gopkg.toml deleted file mode 100644 index 8336862..0000000 --- a/Gopkg.toml +++ /dev/null @@ -1,40 +0,0 @@ -# Tools required for generating, liniting, and formatting code -required = [ - "github.com/golang/lint/golint", - "github.com/golang/protobuf/protoc-gen-go", - "golang.org/x/tools/cmd/goimports", - "honnef.co/go/tools/cmd/megacheck", - "github.com/wadey/gocovmerge" -] - -[[constraint]] - name = "github.com/golang/lint" - branch = "lukyth/feature/ignore-vendor" - source = "github.com/lukyth/lint" - -# Source dependancies -[[constraint]] - name = "github.com/golang/protobuf" - version = "1.0.0" - -[[constraint]] - name = "github.com/pkg/errors" - version = "0.8.0" - -[[constraint]] - name = "github.com/urfave/cli" - version = "1.20.0" - -# golang.org/x/* packages are not versioned -[[constraint]] - name = "golang.org/x/crypto" - branch = "master" - -[[constraint]] - name = "golang.org/x/sys" - branch = "master" - -[prune] - non-go = true - go-tests = true - unused-packages = true diff --git a/go.mod b/go.mod new file mode 100644 index 0000000..3fd72f6 --- /dev/null +++ b/go.mod @@ -0,0 +1,12 @@ +module github.com/google/fscrypt + +// Source dependancies +require ( + github.com/golang/protobuf v1.0.0 + github.com/pkg/errors v0.8.0 + github.com/urfave/cli v1.20.0 + golang.org/x/crypto v0.0.0-20180208170933-5119cf507ed5 + golang.org/x/net v0.0.0-20180826012351-8a410e7b638d // indirect + golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f // indirect + golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5 +) diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..0f59a32 --- /dev/null +++ b/go.sum @@ -0,0 +1,14 @@ +github.com/golang/protobuf v1.0.0 h1:lsek0oXi8iFE9L+EXARyHIjU5rlWIhhTkjDz3vHhWWQ= +github.com/golang/protobuf v1.0.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/pkg/errors v0.8.0 h1:WdK/asTD0HN+q6hsWO3/vpuAkAr+tw6aNJNDFFf0+qw= +github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= +github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw= +github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA= +golang.org/x/crypto v0.0.0-20180208170933-5119cf507ed5 h1:YiZSmx39JJyBXrPAMqxSUHrJuQq5qRSFl0u6egWjgCY= +golang.org/x/crypto v0.0.0-20180208170933-5119cf507ed5/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d h1:g9qWBGx4puODJTMVyoPrpoxPFgVGd+z1DZwjfRu4d0I= +golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f h1:wMNYb4v58l5UBM7MYRLPG6ZhfOqbKu7X5eyFl8ZhKvA= +golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= +golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5 h1:MF92a0wJ3gzSUVBpjcwdrDr5+klMFRNEEu6Mev4n00I= +golang.org/x/sys v0.0.0-20180202135801-37707fdb30a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -- 2.39.5