Merge pull request #75 from portapps/update-gobindata

crazy-max · web-flow · commit 1fdf7a7e1a81 · 2024-11-10T19:16:34.000+01:00
update github.com/kevinburke/go-bindata to v4.0.2
diff --git a/assets/assets.go b/assets/assets.go
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/portapps/skype-portable
 go 1.23
 
 require (
-	github.com/kevinburke/go-bindata v3.24.0+incompatible
+	github.com/kevinburke/go-bindata/v4 v4.0.2
 	github.com/portapps/portapps/v3 v3.14.1
 )
 
diff --git a/go.sum b/go.sum
@@ -13,8 +13,8 @@ github.com/ilya1st/rotatewriter v0.0.0-20171126183947-3df0c1a3ed6d h1:OGuVAVny/9
 github.com/ilya1st/rotatewriter v0.0.0-20171126183947-3df0c1a3ed6d/go.mod h1:S1q6q+21PRGd0WRX+fHjQ+TOe3CgpSv7zgCWnZcbxCs=
 github.com/josephspurrier/goversioninfo v1.4.1 h1:5LvrkP+n0tg91J9yTkoVnt/QgNnrI1t4uSsWjIonrqY=
 github.com/josephspurrier/goversioninfo v1.4.1/go.mod h1:JWzv5rKQr+MmW+LvM412ToT/IkYDZjaclF2pKDss8IY=
-github.com/kevinburke/go-bindata v3.24.0+incompatible h1:qajFA3D0pH94OTLU4zcCCKCDgR+Zr2cZK/RPJHDdFoY=
-github.com/kevinburke/go-bindata v3.24.0+incompatible/go.mod h1:/pEEZ72flUW2p0yi30bslSp9YqD9pysLxunQDdb2CPM=
+github.com/kevinburke/go-bindata/v4 v4.0.2 h1:6qQI0nNTL27wM1En8zQHGBEPp3ETzgFU6hVdSjlkrfE=
+github.com/kevinburke/go-bindata/v4 v4.0.2/go.mod h1:M/CkBqw2qCZ1Ztv5JyKgocGYWyUkYlDqkqXS1ktLe5c=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
diff --git a/main.go b/main.go
@@ -1,4 +1,4 @@
-//go:generate go install -v github.com/kevinburke/go-bindata/go-bindata
+//go:generate go install -v github.com/kevinburke/go-bindata/v4/go-bindata
 //go:generate go-bindata -prefix res/ -pkg assets -o assets/assets.go res/Skype.lnk
 //go:generate go install -v github.com/josephspurrier/goversioninfo/cmd/goversioninfo
 //go:generate goversioninfo -icon=res/papp.ico -manifest=res/papp.manifest
diff --git a/tools.go b/tools.go
diff --git a/tools/tools.go b/tools/tools.go
@@ -6,5 +6,6 @@
 package tools
 
 import (
+	_ "github.com/kevinburke/go-bindata/v4"
 	_ "github.com/portapps/portapps/v3/tools"
 )

Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ module github.com/portapps/skype-portable`
`3`	`3`	`go 1.23`
`4`	`4`
`5`	`5`	`require (`
`6`		`- github.com/kevinburke/go-bindata v3.24.0+incompatible`
	`6`	`+ github.com/kevinburke/go-bindata/v4 v4.0.2`
`7`	`7`	`github.com/portapps/portapps/v3 v3.14.1`
`8`	`8`	`)`
`9`	`9`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-//go:generate go install -v github.com/kevinburke/go-bindata/go-bindata`
	`1`	`+//go:generate go install -v github.com/kevinburke/go-bindata/v4/go-bindata`
`2`	`2`	`//go:generate go-bindata -prefix res/ -pkg assets -o assets/assets.go res/Skype.lnk`
`3`	`3`	`//go:generate go install -v github.com/josephspurrier/goversioninfo/cmd/goversioninfo`
`4`	`4`	`//go:generate goversioninfo -icon=res/papp.ico -manifest=res/papp.manifest`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,6 @@`
`6`	`6`	`package tools`
`7`	`7`
`8`	`8`	`import (`
	`9`	`+ _ "github.com/kevinburke/go-bindata/v4"`
`9`	`10`	`_ "github.com/portapps/portapps/v3/tools"`
`10`	`11`	`)`