Skip to content

Commit 0e9eb4e

Browse files
committed
switch to Go Modules
1 parent fe5a472 commit 0e9eb4e

File tree

7 files changed

+53
-215
lines changed

7 files changed

+53
-215
lines changed

.travis.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,8 @@
11
language: go
22

3-
cache:
4-
directories:
5-
- "vendor"
6-
73
go:
8-
- "1.10"
9-
- "1.11"
4+
- "1.11.4"
105

116
script:
12-
- make dep
137
- make build
148
- make lint

Gopkg.lock

Lines changed: 0 additions & 162 deletions
This file was deleted.

Gopkg.toml

Lines changed: 0 additions & 27 deletions
This file was deleted.

Makefile

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,19 @@
11
PKG := github.com/michael1011/lightningtip
22

3-
GOBUILD := go build -v
4-
GOINSTALL := go install -v
3+
GOBUILD := GO111MODULE=on go build -v
4+
GOINSTALL := GO111MODULE=on go install -v
55

66
GO_BIN := ${GOPATH}/bin
7-
DEP_BIN := $(GO_BIN)/dep
87
LINT_BIN := $(GO_BIN)/gometalinter.v2
98

10-
HAVE_DEP := $(shell command -v $(DEP_BIN) 2> /dev/null)
119
HAVE_LINTER := $(shell command -v $(LINT_BIN) 2> /dev/null)
1210

13-
default: dep build
11+
default: build
1412

1513
$(LINT_BIN):
1614
@$(call print, "Fetching gometalinter.v2")
1715
go get -u gopkg.in/alecthomas/gometalinter.v2
1816

19-
$(DEP_BIN):
20-
@$(call print, "Fetching dep")
21-
go get -u github.com/golang/dep/cmd/dep
22-
2317
GREEN := "\\033[0;32m"
2418
NC := "\\033[0m"
2519

@@ -39,12 +33,6 @@ LINT = $(LINT_BIN) \
3933
grep -v 'ALL_CAPS\|OP_' 2>&1 | \
4034
tee /dev/stderr
4135

42-
# Dependencies
43-
44-
dep: $(DEP_BIN)
45-
@$(call print, "Compiling dependencies")
46-
dep ensure -v
47-
4836
# Building
4937

5038
build:
@@ -65,5 +53,6 @@ fmt:
6553

6654
lint: $(LINT_BIN)
6755
@$(call print, "Linting source")
68-
$(LINT_BIN) --install 1> /dev/null
56+
GO111MODULE=on go mod vendor
57+
GO111MODULE=off $(LINT_BIN) --install 1> /dev/null
6958
test -z "$$($(LINT))"

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
# LightningTip
2+
23
A simple way to accept tips via the Lightning Network on your website. If want to tip me you can find my instance of LightningTip [here](https://michael1011.at/lightning.html).
34

45
[robclark56](https://github.com/robclark56) forked LightningTip and rewrote the backend in **PHP**. His fork is called [LightningTip-PHP](https://github.com/robclark56/lightningtip) and is a great alternative if you are not able to run the executable.
@@ -33,9 +34,9 @@ That's it! The only two things you need to take care about is keeping the LND no
3334

3435
## How to build
3536

36-
First of all make sure [Golang](https://golang.org/) and [Dep](https://github.com/golang/dep) are both correctly installed. Golang version 1.10 or newer is recommended.
37+
First of all make sure [Golang](https://golang.org/) version 1.11 or newer is correctly installed.
3738

38-
```
39+
```bash
3940
go get -d github.com/michael1011/lightningtip
4041
cd $GOPATH/src/github.com/michael1011/lightningtip
4142

@@ -48,7 +49,7 @@ To start run `$GOPATH/bin/lightningtip` or follow the instructions below to setu
4849

4950
Make sure you stop any running LightningTip process before upgrading, then pull from source as follows:
5051

51-
```
52+
```bash
5253
cd $GOPATH/src/github.com/michael1011/lightningtip
5354
git pull
5455

go.mod

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
module github.com/michael1011/lightningtip
2+
3+
require (
4+
github.com/donovanhide/eventsource v0.0.0-20171031113327-3ed64d21fb0b
5+
github.com/golang/protobuf v1.2.0 // indirect
6+
github.com/grpc-ecosystem/grpc-gateway v0.0.0-20170724004829-f2862b476edc // indirect
7+
github.com/jessevdk/go-flags v1.4.0
8+
github.com/lightningnetwork/lnd v0.0.0-20180827212353-73af09a06ae9
9+
github.com/mattn/go-sqlite3 v1.9.0
10+
github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473
11+
github.com/urfave/cli v1.20.0
12+
golang.org/x/net v0.0.0-20180311174755-ae89d30ce0c6 // indirect
13+
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 // indirect
14+
golang.org/x/text v0.3.0 // indirect
15+
google.golang.org/genproto v0.0.0-20180306020942-df60624c1e9b // indirect
16+
google.golang.org/grpc v1.5.2
17+
)

go.sum

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
github.com/donovanhide/eventsource v0.0.0-20171031113327-3ed64d21fb0b h1:eR1P/A4QMYF2/LpHRhYAts9wyYEtF7qNk/tVNiYCWc8=
2+
github.com/donovanhide/eventsource v0.0.0-20171031113327-3ed64d21fb0b/go.mod h1:56wL82FO0bfMU5RvfXoIwSOP2ggqqxT+tAfNEIyxuHw=
3+
github.com/golang/protobuf v1.2.0 h1:P3YflyNX/ehuJFLhxviNdFxQPkGK5cDcApsge1SqnvM=
4+
github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
5+
github.com/grpc-ecosystem/grpc-gateway v0.0.0-20170724004829-f2862b476edc h1:3NXdOHZ1YlN6SGP3FPbn4k73O2MeEp065abehRwGFxI=
6+
github.com/grpc-ecosystem/grpc-gateway v0.0.0-20170724004829-f2862b476edc/go.mod h1:RSKVYQBd5MCa4OVpNdGskqpgL2+G+NZTnrVHpWWfpdw=
7+
github.com/jessevdk/go-flags v1.4.0 h1:4IU2WS7AumrZ/40jfhf4QVDMsQwqA7VEHozFRrGARJA=
8+
github.com/jessevdk/go-flags v1.4.0/go.mod h1:4FA24M0QyGHXBuZZK/XkWh8h0e1EYbRYJSGM75WSRxI=
9+
github.com/lightningnetwork/lnd v0.0.0-20180827212353-73af09a06ae9 h1:6MKdvuQgZ4UOVJ1h9xeASz8oSUySybblkgjQq4Ebu+w=
10+
github.com/lightningnetwork/lnd v0.0.0-20180827212353-73af09a06ae9/go.mod h1:wpCSmoRQxoM/vXLtTETeBp08XnB/9/f+sjPvCJZPyA0=
11+
github.com/mattn/go-sqlite3 v1.9.0 h1:pDRiWfl+++eC2FEFRy6jXmQlvp4Yh3z1MJKg4UeYM/4=
12+
github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
13+
github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473 h1:J1QZwDXgZ4dJD2s19iqR9+U00OWM2kDzbf1O/fmvCWg=
14+
github.com/op/go-logging v0.0.0-20160211212156-b2cb9fa56473/go.mod h1:HzydrMdWErDVzsI23lYNej1Htcns9BCg93Dk0bBINWk=
15+
github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
16+
github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
17+
golang.org/x/net v0.0.0-20180311174755-ae89d30ce0c6 h1:VNwI0l6D6+cM79+3XBbvypTLyFJtQP1GEgUNsEadLdY=
18+
golang.org/x/net v0.0.0-20180311174755-ae89d30ce0c6/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
19+
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4 h1:YUO/7uOKsKeq9UokNS62b8FYywz3ker1l1vDZRCRefw=
20+
golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
21+
golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
22+
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
23+
google.golang.org/genproto v0.0.0-20180306020942-df60624c1e9b h1:XeiFoG4FHSBJUL3qKCkMrkwBFRXB+hyQiTPg82JUssI=
24+
google.golang.org/genproto v0.0.0-20180306020942-df60624c1e9b/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc=
25+
google.golang.org/grpc v1.5.2 h1:b6oAqMSH36Omv3KU5KuN6qB2jaJClahvIWSmfQtfyFw=
26+
google.golang.org/grpc v1.5.2/go.mod h1:yo6s7OP7yaDglbqo1J04qKzAhqBH6lvTonzMVmEdcZw=

0 commit comments

Comments
 (0)