From b1986e40fb35673cfdf884b3a0fc49503e4bc9f7 Mon Sep 17 00:00:00 2001 From: theskyinflames-macos Date: Sat, 23 Sep 2023 14:27:31 +0200 Subject: [PATCH] fix module issues with linter lib --- .github/workflows/lint.yml | 4 ++-- cmd/png2word/main.go | 2 +- cmd/word2png/main.go | 2 +- go.mod | 11 +++++------ go.sum | 14 ++++++++------ wallet-seed1.png | Bin 0 -> 1215 bytes 6 files changed, 17 insertions(+), 16 deletions(-) create mode 100644 wallet-seed1.png diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 96814a8..d98d023 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -5,10 +5,10 @@ jobs: name: Lint runs-on: ubuntu-latest steps: - - name: Set up Go 1.17 + - name: Set up Go 1.21 uses: actions/setup-go@v2 with: - go-version: 1.17.x + go-version: 1.21.x - name: Check out code into the Go module directory uses: actions/checkout@v2.3.4 - name: Cache Dependencies diff --git a/cmd/png2word/main.go b/cmd/png2word/main.go index 6bb2a58..7e050fb 100644 --- a/cmd/png2word/main.go +++ b/cmd/png2word/main.go @@ -6,9 +6,9 @@ import ( "regexp" "strconv" + "github.com/alecthomas/kingpin/v2" "github.com/pterm/pterm" "github.com/theskyinflames/word2png/lib" - "gopkg.in/alecthomas/kingpin.v2" ) const defaultFilter = ".*" diff --git a/cmd/word2png/main.go b/cmd/word2png/main.go index c3e0b7c..3b98774 100644 --- a/cmd/word2png/main.go +++ b/cmd/word2png/main.go @@ -5,9 +5,9 @@ import ( "fmt" "os" + "github.com/alecthomas/kingpin/v2" "github.com/pterm/pterm" "github.com/theskyinflames/word2png/lib" - "gopkg.in/alecthomas/kingpin.v2" ) func main() { diff --git a/go.mod b/go.mod index 83d650f..86807b8 100644 --- a/go.mod +++ b/go.mod @@ -1,21 +1,19 @@ -module github.com/theskyinflames/word2png +module theskyinflames/word2png go 1.21 -toolchain go1.21.1 - require ( + github.com/alecthomas/kingpin/v2 v2.3.2 github.com/pterm/pterm v0.12.69 github.com/stretchr/testify v1.8.4 - gopkg.in/alecthomas/kingpin.v2 v2.2.6 + github.com/theskyinflames/word2png v0.0.0-20230310162449-716270965f75 ) require ( atomicgo.dev/cursor v0.2.0 // indirect atomicgo.dev/keyboard v0.2.9 // indirect atomicgo.dev/schedule v0.1.0 // indirect - github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect - github.com/alecthomas/units v0.0.0-20210912230133-d1bdfacee922 // indirect + github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 // indirect github.com/containerd/console v1.0.3 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/gookit/color v1.5.4 // indirect @@ -23,6 +21,7 @@ require ( github.com/mattn/go-runewidth v0.0.15 // indirect github.com/pmezard/go-difflib v1.0.0 // indirect github.com/rivo/uniseg v0.4.4 // indirect + github.com/xhit/go-str2duration/v2 v2.1.0 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect golang.org/x/sys v0.11.0 // indirect golang.org/x/term v0.11.0 // indirect diff --git a/go.sum b/go.sum index 1069068..6b3c9f9 100644 --- a/go.sum +++ b/go.sum @@ -15,10 +15,10 @@ github.com/MarvinJWendt/testza v0.3.0/go.mod h1:eFcL4I0idjtIx8P9C6KkAuLgATNKpX4/ github.com/MarvinJWendt/testza v0.4.2/go.mod h1:mSdhXiKH8sg/gQehJ63bINcCKp7RtYewEjXsvsVUPbE= github.com/MarvinJWendt/testza v0.5.2 h1:53KDo64C1z/h/d/stCYCPY69bt/OSwjq5KpFNwi+zB4= github.com/MarvinJWendt/testza v0.5.2/go.mod h1:xu53QFE5sCdjtMCKk8YMQ2MnymimEctc4n3EjyIYvEY= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 h1:JYp7IbQjafoB+tBA3gMyHYHrpOtNuDiK/uB5uXxq5wM= -github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc= -github.com/alecthomas/units v0.0.0-20210912230133-d1bdfacee922 h1:8ypNbf5sd3Sm3cKJ9waOGoQv6dKAFiFty9L6NP1AqJ4= -github.com/alecthomas/units v0.0.0-20210912230133-d1bdfacee922/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= +github.com/alecthomas/kingpin/v2 v2.3.2 h1:H0aULhgmSzN8xQ3nX1uxtdlTHYoPLu5AhHxWrKI6ocU= +github.com/alecthomas/kingpin/v2 v2.3.2/go.mod h1:0gyi0zQnjuFk8xrkNKamJoyUo382HRL7ATRpFZCw6tE= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137 h1:s6gZFSlWYmbqAuRjVTiNNhvNRfY2Wxp9nhfyel4rklc= +github.com/alecthomas/units v0.0.0-20211218093645-b94a6e3cc137/go.mod h1:OMCwj8VM1Kc9e19TLln2VL61YJF0x1XFtfdL4JdbSyE= github.com/atomicgo/cursor v0.0.1/go.mod h1:cBON2QmmrysudxNBFthvMtN32r3jxVRIvzkUiF/RuIk= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= @@ -66,6 +66,10 @@ github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk= github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= +github.com/theskyinflames/word2png v0.0.0-20230310162449-716270965f75 h1:/v9JPvd6n/3NnGO3dR3km6kO7djJ10H5c6A+44emnyU= +github.com/theskyinflames/word2png v0.0.0-20230310162449-716270965f75/go.mod h1:sEqjyLcA7jCDiW9eE/KfQKqeaC8+0NV1j5QX4Q+a6Ms= +github.com/xhit/go-str2duration/v2 v2.1.0 h1:lxklc02Drh6ynqX+DdPyp5pCKLUQpRT8bp8Ydu2Bstc= +github.com/xhit/go-str2duration/v2 v2.1.0/go.mod h1:ohY8p+0f07DiV6Em5LKB0s2YpLtXVyJfNt1+BlmyAsU= github.com/xo/terminfo v0.0.0-20210125001918-ca9a967f8778/go.mod h1:2MuV+tbUrU1zIOPMxZ5EncGwgmMJsa+9ucAQZXxsObs= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavMF/ppJZNG9ZpyihvCd0w101no= github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM= @@ -114,8 +118,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc= golang.org/x/tools v0.6.0/go.mod h1:Xwgl3UAJ/d3gWutnCtw505GrjyAbvKui8lOU390QaIU= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/alecthomas/kingpin.v2 v2.2.6 h1:jMFz6MfLP0/4fUyZle81rXUoxOBFi19VUFKVDOQfozc= -gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo= gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/wallet-seed1.png b/wallet-seed1.png new file mode 100644 index 0000000000000000000000000000000000000000..32a90e6d74711839724e58d7799f02d05830d69d GIT binary patch literal 1215 zcmW-h4@}f$7{?z_;*Xre12vdlvlZ1Wbi4|~)(Cg}IYH#?lo(q`(Hlrwu0)DcksC%1 zJ(`hw{f8HZW$w6JalzD%HB$%gnfZ63v*~0wa%x^FB>DDzf4}YS_UwJ1@ALV7pWp8D zlHz<*TuK}fnQR5t<@jBSPkhWId?%dmFC>a=DJgQ~q9kHOoJbH!BBd+Fh;d?qm?Wn3 zA!o!naY0-XSNg7CBsd8{LXuFrRWg#Cq#!9tDkza+q&O)-N|HhWZAe24&A6@f9Q|;{ z1Y?phrN^S;oN>XpWL#+q916~aU_vsXG!*Vi&ZJ;cGO56bR;D;pf+@)qrh*z`fCeS7 zaE8IqhBUO$th6Cr;}M)o&Xx9uv8aULLUN(BT~Odq3N9s=3hn`gyIcvbBv-J9Jb;OA z!~y?+fJ0D24A7v&Rd8T1v>^>GrIXXgsPRZ4lnxU9Fcy`RLMr46yP&|KP*N!5h@=q! zxNsdo!!4pj9>7F5;s6s2!y%|42558w3mg~>ZAdG;0= z*A&J^^*)UyX(%IiyvepM2K7*8T?1{&?cjNZ33Ux1!@gU*Y^5XV1#yMZeXITnXL%aC&W2 z?2Y1|)7th;j_%kw5WC})d18E1@DKNau{B-O%)J-CPq_QgRqw1?)zH4cv(Y`JtvksU zI+~eVz06Uhs_Rk?y?(95{^IfN{uzDq8c)~y!_$5B0}Cr}4kcEVy|6nbCtY3scT;xr z&D5Vxme#pXxg1HB#@=ruGama-nlB_I{#th8%;4Dg_VS+N!QE%C1op<<=^wWa4jr*f z8z^5`@niI@H`B6RzAr{zTGHFsUGd+08-vdb|I%{Xm+~-Zyp z@B03xgOA=Xb)V^caxt*utpz{SSz;@W_;*!*v$ocgy864Ti|y~u4BmMDw0E}s+{%*h z=$JFuQM0G?UNRk8UwJGdOPH3@7Oy8S@s4?J=s-$CVCa0!j7wEv%kS>5T%(?$dCNcb zb@fL&L!(*S@{j#(E4`nQ^@%HVFmUa)^!A3}uBQg~$4xE&(zanB5cSdF;R`Pp&!1}Q z^gO+7WZ7q3Db~m9lK$-8n(3MKby{k^Giqk@EU~(0j-~MOaBK4BXV