Use go mod replace

go-gitea · Jan 6, 2022 · dda08cb · dda08cb
1 parent c7af31b
commit dda08cb
Show file tree

Hide file tree

Showing 14 changed files with 8 additions and 10 deletions.
diff --git a/build.go b/build.go
@@ -12,7 +12,7 @@ package main
 
 import (
 	// for embed
-	_ "github.com/lunny/vfsgen"
+	_ "github.com/shurcooL/vfsgen"
 
 	// for cover merge
 	_ "golang.org/x/tools/cover"

diff --git a/build/generate-bindata.go b/build/generate-bindata.go
@@ -17,7 +17,7 @@ import (
 	"path/filepath"
 	"strconv"
 
-	"github.com/lunny/vfsgen"
+	"github.com/shurcooL/vfsgen"
 )
 
 func needsUpdate(dir string, filename string) (bool, []byte) {

diff --git a/go.mod b/go.mod
@@ -72,7 +72,6 @@ require (
 	github.com/klauspost/pgzip v1.2.5 // indirect
 	github.com/lib/pq v1.10.2
 	github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
-	github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0
 	github.com/markbates/goth v1.68.0
 	github.com/mattn/go-isatty v0.0.13
 	github.com/mattn/go-runewidth v0.0.13 // indirect
@@ -99,7 +98,7 @@ require (
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
 	github.com/sergi/go-diff v1.2.0
 	github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 // indirect
-	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 // indirect
+	github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
 	github.com/ssor/bom v0.0.0-20170718123548-6386211fdfcf // indirect
 	github.com/stretchr/testify v1.7.0
 	github.com/syndtr/goleveldb v1.0.0
@@ -142,3 +141,5 @@ require (
 replace github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1
 
 replace github.com/golang-jwt/jwt v3.2.1+incompatible => github.com/golang-jwt/jwt v3.2.2+incompatible
+
+replace github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0
diff --git a/go.sum b/go.sum
@@ -1046,8 +1046,6 @@ github.com/shopspring/decimal v1.2.0/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749 h1:bUGsEnyNbVPw06Bs80sCeARAlK8lhwqGyi6UT8ymuGk=
 github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749/go.mod h1:ZY1cvUeJuFPAdZ/B6v7RHavJWZn2YPVFQ1OSXhCGOkg=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
-github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 h1:pXY9qYc/MP5zdvqWEUH6SjNiu7VhSjuVFTFiTcphaLU=
-github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546/go.mod h1:TrYk7fJVaAttu97ZZKrO9UbRa8izdowaMIZcxYMbVaw=
 github.com/siddontang/go v0.0.0-20180604090527-bdc77568d726/go.mod h1:3yhqj7WBBfRhbBlzyOC3gUxftwsU0u8gqevxwIHQpMw=
 github.com/siddontang/go-snappy v0.0.0-20140704025258-d8f7bb82a96d/go.mod h1:vq0tzqLRu6TS7Id0wMo2N5QzJoKedVeovOpHjnykSzY=
 github.com/siddontang/ledisdb v0.0.0-20190202134119-8ceb77e66a92/go.mod h1:mF1DpOSOUiJRMR+FDqaqu3EBqrybQtrDDszLUZ6oxPg=

diff --git a/vendor/github.com/lunny/vfsgen/.travis.yml → ...or/github.com/shurcooL/vfsgen/.travis.yml b/vendor/github.com/lunny/vfsgen/.travis.yml → ...or/github.com/shurcooL/vfsgen/.travis.yml
diff --git a/...r/github.com/lunny/vfsgen/CONTRIBUTING.md → ...ithub.com/shurcooL/vfsgen/CONTRIBUTING.md b/...r/github.com/lunny/vfsgen/CONTRIBUTING.md → ...ithub.com/shurcooL/vfsgen/CONTRIBUTING.md
diff --git a/vendor/github.com/lunny/vfsgen/LICENSE → vendor/github.com/shurcooL/vfsgen/LICENSE b/vendor/github.com/lunny/vfsgen/LICENSE → vendor/github.com/shurcooL/vfsgen/LICENSE
diff --git a/vendor/github.com/lunny/vfsgen/README.md → vendor/github.com/shurcooL/vfsgen/README.md b/vendor/github.com/lunny/vfsgen/README.md → vendor/github.com/shurcooL/vfsgen/README.md
diff --git a/.../github.com/lunny/vfsgen/commentwriter.go → ...thub.com/shurcooL/vfsgen/commentwriter.go b/.../github.com/lunny/vfsgen/commentwriter.go → ...thub.com/shurcooL/vfsgen/commentwriter.go
diff --git a/vendor/github.com/lunny/vfsgen/doc.go → vendor/github.com/shurcooL/vfsgen/doc.go b/vendor/github.com/lunny/vfsgen/doc.go → vendor/github.com/shurcooL/vfsgen/doc.go
diff --git a/vendor/github.com/lunny/vfsgen/generator.go → ...r/github.com/shurcooL/vfsgen/generator.go b/vendor/github.com/lunny/vfsgen/generator.go → ...r/github.com/shurcooL/vfsgen/generator.go
diff --git a/vendor/github.com/lunny/vfsgen/options.go → vendor/github.com/shurcooL/vfsgen/options.go b/vendor/github.com/lunny/vfsgen/options.go → vendor/github.com/shurcooL/vfsgen/options.go
diff --git a/...r/github.com/lunny/vfsgen/stringwriter.go → ...ithub.com/shurcooL/vfsgen/stringwriter.go b/...r/github.com/lunny/vfsgen/stringwriter.go → ...ithub.com/shurcooL/vfsgen/stringwriter.go
diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -566,9 +566,6 @@ github.com/libdns/libdns
 # github.com/lunny/dingtalk_webhook v0.0.0-20171025031554-e3534c89ef96
 ## explicit
 github.com/lunny/dingtalk_webhook
-# github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0
-## explicit
-github.com/lunny/vfsgen
 # github.com/magiconair/properties v1.8.5
 github.com/magiconair/properties
 # github.com/mailru/easyjson v0.7.7
@@ -730,8 +727,9 @@ github.com/sergi/go-diff/diffmatchpatch
 # github.com/shurcooL/httpfs v0.0.0-20190707220628-8d4bc4ba7749
 ## explicit
 github.com/shurcooL/httpfs/vfsutil
-# github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546
+# github.com/shurcooL/vfsgen v0.0.0-20200824052919-0d455de96546 => github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0
 ## explicit
+github.com/shurcooL/vfsgen
 # github.com/sirupsen/logrus v1.8.1
 github.com/sirupsen/logrus
 # github.com/spf13/afero v1.6.0
@@ -1063,3 +1061,4 @@ xorm.io/xorm/schemas
 xorm.io/xorm/tags
 # github.com/hashicorp/go-version => github.com/6543/go-version v1.3.1
 # github.com/golang-jwt/jwt v3.2.1+incompatible => github.com/golang-jwt/jwt v3.2.2+incompatible
+# github.com/shurcooL/vfsgen => github.com/lunny/vfsgen v0.0.0-20220105142115-2c99e1ffdfa0