From 708ea661988fd0e4886fc63f3f6dffe25b6fa276 Mon Sep 17 00:00:00 2001 From: Jeff Carr Date: Sun, 14 Jan 2024 15:24:34 -0600 Subject: [PATCH] clean go mod files Signed-off-by: Jeff Carr --- andlabs/Makefile | 6 +++++ andlabs/go.mod | 11 +++++++++ andlabs/go.sum | 8 ++++++ go.mod | 19 --------------- gocui/go.mod | 21 ++++++++++++++++ go.sum => gocui/go.sum | 14 +++++------ log.go | 55 ------------------------------------------ nocui/go.mod | 6 ++--- nocui/go.sum | 12 ++++----- 9 files changed, 61 insertions(+), 91 deletions(-) create mode 100644 andlabs/go.mod create mode 100644 andlabs/go.sum create mode 100644 gocui/go.mod rename go.sum => gocui/go.sum (69%) delete mode 100644 log.go diff --git a/andlabs/Makefile b/andlabs/Makefile index b839c33..331617a 100644 --- a/andlabs/Makefile +++ b/andlabs/Makefile @@ -5,3 +5,9 @@ plugin: goget: GO111MODULE="off" go get -v -t -u + +redomod: + rm -f go.* + GO111MODULE= go mod init + GO111MODULE= go mod tidy + diff --git a/andlabs/go.mod b/andlabs/go.mod new file mode 100644 index 0000000..4b65a1f --- /dev/null +++ b/andlabs/go.mod @@ -0,0 +1,11 @@ +module go.wit.com/gui/toolkits/andlabs + +go 1.21.4 + +require ( + github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e + go.wit.com/gui/widget v1.1.3 + go.wit.com/log v0.5.3 +) + +require go.wit.com/dev/davecgh/spew v1.1.3 // indirect diff --git a/andlabs/go.sum b/andlabs/go.sum new file mode 100644 index 0000000..6c41536 --- /dev/null +++ b/andlabs/go.sum @@ -0,0 +1,8 @@ +github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e h1:wSQCJiig/QkoUnpvelSPbLiZNWvh2yMqQTQvIQqSUkU= +github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e/go.mod h1:5G2EjwzgZUPnnReoKvPWVneT8APYbyKkihDVAHUi0II= +go.wit.com/dev/davecgh/spew v1.1.3 h1:hqnB5qsPgC2cLZaJXqQJspQ5n/Ugry9kyL3tLk0hVzQ= +go.wit.com/dev/davecgh/spew v1.1.3/go.mod h1:sihvWmnQ/09FWplnEmozt90CCVqBtGuPXM811tgfhFA= +go.wit.com/gui/widget v1.1.3 h1:GvLzGSOF9tfmoh6HNbFdN+NSlBo2qeS/Ba2TnQQ1A1U= +go.wit.com/gui/widget v1.1.3/go.mod h1:A6/FaiFQtAHTjgo7c4FrokXe6bXX1Cowo35b2Lgi31E= +go.wit.com/log v0.5.3 h1:/zHkniOPusPEuX1R401rMny9uwSO/nSU/QOMx6qoEnE= +go.wit.com/log v0.5.3/go.mod h1:LzIzVxc2xJQxWQBtV9VbV605P4TOxmYDCl+BZF38yGE= diff --git a/go.mod b/go.mod index 51512c9..ae4b32a 100644 --- a/go.mod +++ b/go.mod @@ -1,22 +1,3 @@ module go.wit.com/gui/toolkits go 1.21.4 - -require ( - github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e - github.com/awesome-gocui/gocui v1.1.0 - go.wit.com/gui/widget v0.0.0-20240111013810-ab0d77d388af - go.wit.com/log v0.4.2 -) - -require ( - github.com/gdamore/encoding v1.0.0 // indirect - github.com/gdamore/tcell/v2 v2.4.0 // indirect - github.com/lucasb-eyer/go-colorful v1.0.3 // indirect - github.com/mattn/go-runewidth v0.0.10 // indirect - github.com/rivo/uniseg v0.1.0 // indirect - go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 // indirect - golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect - golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect - golang.org/x/text v0.3.3 // indirect -) diff --git a/gocui/go.mod b/gocui/go.mod new file mode 100644 index 0000000..a10c691 --- /dev/null +++ b/gocui/go.mod @@ -0,0 +1,21 @@ +module go.wit.com/gui/toolkits/gocui + +go 1.21.4 + +require ( + github.com/awesome-gocui/gocui v1.1.0 + go.wit.com/gui/widget v1.1.3 + go.wit.com/log v0.5.3 +) + +require ( + github.com/gdamore/encoding v1.0.0 // indirect + github.com/gdamore/tcell/v2 v2.4.0 // indirect + github.com/lucasb-eyer/go-colorful v1.0.3 // indirect + github.com/mattn/go-runewidth v0.0.10 // indirect + github.com/rivo/uniseg v0.1.0 // indirect + go.wit.com/dev/davecgh/spew v1.1.3 // indirect + golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 // indirect + golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf // indirect + golang.org/x/text v0.3.3 // indirect +) diff --git a/go.sum b/gocui/go.sum similarity index 69% rename from go.sum rename to gocui/go.sum index 43050dd..1c3f9ae 100644 --- a/go.sum +++ b/gocui/go.sum @@ -1,5 +1,3 @@ -github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e h1:wSQCJiig/QkoUnpvelSPbLiZNWvh2yMqQTQvIQqSUkU= -github.com/andlabs/ui v0.0.0-20200610043537-70a69d6ae31e/go.mod h1:5G2EjwzgZUPnnReoKvPWVneT8APYbyKkihDVAHUi0II= github.com/awesome-gocui/gocui v1.1.0 h1:db2j7yFEoHZjpQFeE2xqiatS8bm1lO3THeLwE6MzOII= github.com/awesome-gocui/gocui v1.1.0/go.mod h1:M2BXkrp7PR97CKnPRT7Rk0+rtswChPtksw/vRAESGpg= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= @@ -12,12 +10,12 @@ github.com/mattn/go-runewidth v0.0.10 h1:CoZ3S2P7pvtP45xOtBw+/mDL2z0RKI576gSkzRR github.com/mattn/go-runewidth v0.0.10/go.mod h1:RAqKPSqVFrSLVXbA8x7dzmKdmGzieGRCM46jaSJTDAk= github.com/rivo/uniseg v0.1.0 h1:+2KBaVoUmb9XzDsrx/Ct0W/EYOSFf/nWTauy++DprtY= github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= -go.wit.com/gui/widget v0.0.0-20240111013810-ab0d77d388af h1:7x7ReF26/BWnMgervVZaOu29bqUg5nvrQ2C5o9fr5LY= -go.wit.com/gui/widget v0.0.0-20240111013810-ab0d77d388af/go.mod h1:A6/FaiFQtAHTjgo7c4FrokXe6bXX1Cowo35b2Lgi31E= -go.wit.com/log v0.4.2 h1:oYCOD7qCY0A+LsrQXPv5ETtVyD8AhIHgvNBMdly9hy0= -go.wit.com/log v0.4.2/go.mod h1:EZLvivLZpMoXl5AUBArH0zsIgr+c+WyNXm14BCF+sdw= -go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 h1:UEX2EzLQPzLTfy/kUFQD7OXtvKn8wk/+jpDOkbl4ff4= -go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9/go.mod h1:qBpgJXThMMT15vym7/E4Ur9y8oOo2nP7t2RP52QHUNw= +go.wit.com/dev/davecgh/spew v1.1.3 h1:hqnB5qsPgC2cLZaJXqQJspQ5n/Ugry9kyL3tLk0hVzQ= +go.wit.com/dev/davecgh/spew v1.1.3/go.mod h1:sihvWmnQ/09FWplnEmozt90CCVqBtGuPXM811tgfhFA= +go.wit.com/gui/widget v1.1.3 h1:GvLzGSOF9tfmoh6HNbFdN+NSlBo2qeS/Ba2TnQQ1A1U= +go.wit.com/gui/widget v1.1.3/go.mod h1:A6/FaiFQtAHTjgo7c4FrokXe6bXX1Cowo35b2Lgi31E= +go.wit.com/log v0.5.3 h1:/zHkniOPusPEuX1R401rMny9uwSO/nSU/QOMx6qoEnE= +go.wit.com/log v0.5.3/go.mod h1:LzIzVxc2xJQxWQBtV9VbV605P4TOxmYDCl+BZF38yGE= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68 h1:nxC68pudNYkKU6jWhgrqdreuFiOQWj1Fs7T3VrH4Pjw= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/term v0.0.0-20201210144234-2321bbc49cbf h1:MZ2shdL+ZM/XzY3ZGOnh4Nlpnxz5GSOhOmtHo3iPU6M= diff --git a/log.go b/log.go deleted file mode 100644 index 33dc558..0000000 --- a/log.go +++ /dev/null @@ -1,55 +0,0 @@ -package main - -import ( - "io" -// "fmt" -// "strings" - witlog "go.wit.com/log" -) - -// various debugging flags -var logNow bool = true // useful for active development -var logError bool = true -var logWarn bool = false -var logInfo bool = false -var logVerbose bool = false - -var outputS []string - -func log(b bool, a ...any) { - witlog.Log(b, a...) -} - -func sleep(a ...any) { - witlog.Sleep(a...) -} - -func exit(a ...any) { - witlog.Exit(a...) -} - -/* -func newLog(a ...any) { - s := fmt.Sprint(a...) - tmp := strings.Split(s, "\n") - outputS = append(outputS, tmp...) - if (len(outputS) > 50) { - outputS = outputS[10:] - } - if (me.baseGui != nil) { - v, _ := me.baseGui.View("msg") - if (v != nil) { - v.Clear() - fmt.Fprintln(v, strings.Join(outputS, "\n")) - } - } -} -*/ - -func setOutput(w io.Writer) { - if (w == nil) { - return - } - witlog.SetTmp() - // witlog.SetToolkitOutput(newLog) -} diff --git a/nocui/go.mod b/nocui/go.mod index 0e2f341..a8e4af7 100644 --- a/nocui/go.mod +++ b/nocui/go.mod @@ -3,8 +3,8 @@ module go.wit.com/gui/toolkits/nocui go 1.21.4 require ( - go.wit.com/gui/widget v0.0.0-20240105185907-84aafa536a93 - go.wit.com/log v0.4.2 + go.wit.com/gui/widget v1.1.3 + go.wit.com/log v0.5.3 ) -require go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 // indirect +require go.wit.com/dev/davecgh/spew v1.1.3 // indirect diff --git a/nocui/go.sum b/nocui/go.sum index 1141ffb..6f919cd 100644 --- a/nocui/go.sum +++ b/nocui/go.sum @@ -1,6 +1,6 @@ -go.wit.com/gui/widget v0.0.0-20240105185907-84aafa536a93 h1:zCzaHvXJJ/rWXmDc/v79VvM6W2lxxzJGfnW2lHCv3Ho= -go.wit.com/gui/widget v0.0.0-20240105185907-84aafa536a93/go.mod h1:A6/FaiFQtAHTjgo7c4FrokXe6bXX1Cowo35b2Lgi31E= -go.wit.com/log v0.4.2 h1:oYCOD7qCY0A+LsrQXPv5ETtVyD8AhIHgvNBMdly9hy0= -go.wit.com/log v0.4.2/go.mod h1:EZLvivLZpMoXl5AUBArH0zsIgr+c+WyNXm14BCF+sdw= -go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9 h1:UEX2EzLQPzLTfy/kUFQD7OXtvKn8wk/+jpDOkbl4ff4= -go.wit.com/spew v0.0.0-20240101141411-c7b8e91573c9/go.mod h1:qBpgJXThMMT15vym7/E4Ur9y8oOo2nP7t2RP52QHUNw= +go.wit.com/dev/davecgh/spew v1.1.3 h1:hqnB5qsPgC2cLZaJXqQJspQ5n/Ugry9kyL3tLk0hVzQ= +go.wit.com/dev/davecgh/spew v1.1.3/go.mod h1:sihvWmnQ/09FWplnEmozt90CCVqBtGuPXM811tgfhFA= +go.wit.com/gui/widget v1.1.3 h1:GvLzGSOF9tfmoh6HNbFdN+NSlBo2qeS/Ba2TnQQ1A1U= +go.wit.com/gui/widget v1.1.3/go.mod h1:A6/FaiFQtAHTjgo7c4FrokXe6bXX1Cowo35b2Lgi31E= +go.wit.com/log v0.5.3 h1:/zHkniOPusPEuX1R401rMny9uwSO/nSU/QOMx6qoEnE= +go.wit.com/log v0.5.3/go.mod h1:LzIzVxc2xJQxWQBtV9VbV605P4TOxmYDCl+BZF38yGE=