From 53b54a8e525ab67478cb39561a216f9456e80167 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 9 Oct 2020 10:33:11 +1100 Subject: [PATCH] Revert logger package --- v2/cmd/wails/internal/commands/build/build.go | 2 +- v2/cmd/wails/internal/commands/dev/dev.go | 2 +- v2/cmd/wails/internal/commands/doctor/doctor.go | 2 +- v2/cmd/wails/internal/commands/initialise/initialise.go | 2 +- v2/internal/app/desktop.go | 2 +- v2/internal/app/hybrid.go | 2 +- v2/internal/app/server.go | 2 +- v2/internal/binding/binding.go | 2 +- v2/internal/ffenestri/ffenestri.go | 2 +- v2/internal/ffenestri/ffenestri_client.go | 2 +- v2/{pkg => internal}/logger/custom_logger.go | 0 v2/{pkg => internal}/logger/default_logger.go | 0 v2/{pkg => internal}/logger/logger.go | 0 v2/{pkg => internal}/logger/logger_test.go | 0 v2/internal/messagedispatcher/dispatchclient.go | 2 +- v2/internal/messagedispatcher/messagedispatcher.go | 2 +- v2/internal/process/process.go | 2 +- v2/internal/runtime/goruntime/browser_test.go | 2 +- v2/internal/servicebus/servicebus.go | 2 +- v2/internal/servicebus/servicebus_test.go | 2 +- v2/internal/signal/signal.go | 2 +- v2/internal/subsystem/binding.go | 2 +- v2/internal/subsystem/call.go | 2 +- v2/internal/subsystem/event.go | 2 +- v2/internal/subsystem/event_test.go | 2 +- v2/internal/subsystem/log.go | 2 +- v2/internal/subsystem/runtime.go | 2 +- v2/internal/templates/templates.go | 2 +- v2/internal/webserver/webserver.go | 2 +- v2/internal/webserver/websockets.go | 2 +- v2/pkg/commands/build/base.go | 2 +- v2/pkg/commands/build/build.go | 2 +- v2/pkg/commands/build/builder.go | 2 +- v2/pkg/commands/build/desktop.go | 2 +- 34 files changed, 30 insertions(+), 30 deletions(-) rename v2/{pkg => internal}/logger/custom_logger.go (100%) rename v2/{pkg => internal}/logger/default_logger.go (100%) rename v2/{pkg => internal}/logger/logger.go (100%) rename v2/{pkg => internal}/logger/logger_test.go (100%) diff --git a/v2/cmd/wails/internal/commands/build/build.go b/v2/cmd/wails/internal/commands/build/build.go index 2a601c37..a578ff0b 100644 --- a/v2/cmd/wails/internal/commands/build/build.go +++ b/v2/cmd/wails/internal/commands/build/build.go @@ -9,7 +9,7 @@ import ( "github.com/leaanthony/clir" "github.com/leaanthony/slicer" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/pkg/commands/build" ) diff --git a/v2/cmd/wails/internal/commands/dev/dev.go b/v2/cmd/wails/internal/commands/dev/dev.go index 4d5cb618..aeadade1 100644 --- a/v2/cmd/wails/internal/commands/dev/dev.go +++ b/v2/cmd/wails/internal/commands/dev/dev.go @@ -13,7 +13,7 @@ import ( "github.com/leaanthony/clir" "github.com/leaanthony/slicer" "github.com/wailsapp/wails/v2/internal/fs" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/process" "github.com/wailsapp/wails/v2/pkg/commands/build" ) diff --git a/v2/cmd/wails/internal/commands/doctor/doctor.go b/v2/cmd/wails/internal/commands/doctor/doctor.go index 57dd68f1..b0f6df45 100644 --- a/v2/cmd/wails/internal/commands/doctor/doctor.go +++ b/v2/cmd/wails/internal/commands/doctor/doctor.go @@ -8,7 +8,7 @@ import ( "text/tabwriter" "github.com/leaanthony/clir" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/system" "github.com/wailsapp/wails/v2/internal/system/packagemanager" ) diff --git a/v2/cmd/wails/internal/commands/initialise/initialise.go b/v2/cmd/wails/internal/commands/initialise/initialise.go index f9a46fe9..55217aa7 100644 --- a/v2/cmd/wails/internal/commands/initialise/initialise.go +++ b/v2/cmd/wails/internal/commands/initialise/initialise.go @@ -7,7 +7,7 @@ import ( "time" "github.com/leaanthony/clir" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/templates" ) diff --git a/v2/internal/app/desktop.go b/v2/internal/app/desktop.go index b9d41593..e28dd2d4 100644 --- a/v2/internal/app/desktop.go +++ b/v2/internal/app/desktop.go @@ -7,7 +7,7 @@ import ( "github.com/wailsapp/wails/v2/internal/binding" "github.com/wailsapp/wails/v2/internal/ffenestri" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher" "github.com/wailsapp/wails/v2/internal/servicebus" "github.com/wailsapp/wails/v2/internal/signal" diff --git a/v2/internal/app/hybrid.go b/v2/internal/app/hybrid.go index a236de28..f39e7d64 100644 --- a/v2/internal/app/hybrid.go +++ b/v2/internal/app/hybrid.go @@ -9,7 +9,7 @@ import ( "github.com/leaanthony/clir" "github.com/wailsapp/wails/v2/internal/binding" "github.com/wailsapp/wails/v2/internal/ffenestri" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher" "github.com/wailsapp/wails/v2/internal/servicebus" "github.com/wailsapp/wails/v2/internal/subsystem" diff --git a/v2/internal/app/server.go b/v2/internal/app/server.go index 55b472d8..0530de58 100644 --- a/v2/internal/app/server.go +++ b/v2/internal/app/server.go @@ -8,7 +8,7 @@ import ( "github.com/leaanthony/clir" "github.com/wailsapp/wails/v2/internal/binding" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher" "github.com/wailsapp/wails/v2/internal/servicebus" "github.com/wailsapp/wails/v2/internal/subsystem" diff --git a/v2/internal/binding/binding.go b/v2/internal/binding/binding.go index cb4e18e7..479f964b 100755 --- a/v2/internal/binding/binding.go +++ b/v2/internal/binding/binding.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" ) type Bindings struct { diff --git a/v2/internal/ffenestri/ffenestri.go b/v2/internal/ffenestri/ffenestri.go index 9e97ed57..41b213c9 100644 --- a/v2/internal/ffenestri/ffenestri.go +++ b/v2/internal/ffenestri/ffenestri.go @@ -5,7 +5,7 @@ import ( "strings" "unsafe" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher" "github.com/wailsapp/wails/v2/pkg/options" ) diff --git a/v2/internal/ffenestri/ffenestri_client.go b/v2/internal/ffenestri/ffenestri_client.go index f98966cc..40acde18 100644 --- a/v2/internal/ffenestri/ffenestri_client.go +++ b/v2/internal/ffenestri/ffenestri_client.go @@ -14,7 +14,7 @@ import "C" import ( "strconv" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/pkg/options" ) diff --git a/v2/pkg/logger/custom_logger.go b/v2/internal/logger/custom_logger.go similarity index 100% rename from v2/pkg/logger/custom_logger.go rename to v2/internal/logger/custom_logger.go diff --git a/v2/pkg/logger/default_logger.go b/v2/internal/logger/default_logger.go similarity index 100% rename from v2/pkg/logger/default_logger.go rename to v2/internal/logger/default_logger.go diff --git a/v2/pkg/logger/logger.go b/v2/internal/logger/logger.go similarity index 100% rename from v2/pkg/logger/logger.go rename to v2/internal/logger/logger.go diff --git a/v2/pkg/logger/logger_test.go b/v2/internal/logger/logger_test.go similarity index 100% rename from v2/pkg/logger/logger_test.go rename to v2/internal/logger/logger_test.go diff --git a/v2/internal/messagedispatcher/dispatchclient.go b/v2/internal/messagedispatcher/dispatchclient.go index 91a9a83a..0635b522 100644 --- a/v2/internal/messagedispatcher/dispatchclient.go +++ b/v2/internal/messagedispatcher/dispatchclient.go @@ -3,7 +3,7 @@ package messagedispatcher import ( "fmt" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher/message" "github.com/wailsapp/wails/v2/internal/servicebus" "github.com/wailsapp/wails/v2/pkg/options" diff --git a/v2/internal/messagedispatcher/messagedispatcher.go b/v2/internal/messagedispatcher/messagedispatcher.go index ecd6c46e..744d3dbd 100644 --- a/v2/internal/messagedispatcher/messagedispatcher.go +++ b/v2/internal/messagedispatcher/messagedispatcher.go @@ -7,7 +7,7 @@ import ( "sync" "github.com/wailsapp/wails/v2/internal/crypto" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher/message" "github.com/wailsapp/wails/v2/internal/servicebus" "github.com/wailsapp/wails/v2/pkg/options" diff --git a/v2/internal/process/process.go b/v2/internal/process/process.go index f0ebbdfa..4a92e8fd 100644 --- a/v2/internal/process/process.go +++ b/v2/internal/process/process.go @@ -3,7 +3,7 @@ package process import ( "os/exec" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" ) // Process defines a process that can be executed diff --git a/v2/internal/runtime/goruntime/browser_test.go b/v2/internal/runtime/goruntime/browser_test.go index f1c8c767..73a000a0 100644 --- a/v2/internal/runtime/goruntime/browser_test.go +++ b/v2/internal/runtime/goruntime/browser_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/servicebus" ) diff --git a/v2/internal/servicebus/servicebus.go b/v2/internal/servicebus/servicebus.go index 9a574f2b..55c37480 100644 --- a/v2/internal/servicebus/servicebus.go +++ b/v2/internal/servicebus/servicebus.go @@ -5,7 +5,7 @@ import ( "strings" "sync" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" ) // ServiceBus is a messaging bus for Wails applications diff --git a/v2/internal/servicebus/servicebus_test.go b/v2/internal/servicebus/servicebus_test.go index 99efbce3..750a56aa 100644 --- a/v2/internal/servicebus/servicebus_test.go +++ b/v2/internal/servicebus/servicebus_test.go @@ -5,7 +5,7 @@ import ( "testing" "github.com/matryer/is" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" ) type Person interface { diff --git a/v2/internal/signal/signal.go b/v2/internal/signal/signal.go index c288493a..b394991c 100644 --- a/v2/internal/signal/signal.go +++ b/v2/internal/signal/signal.go @@ -5,7 +5,7 @@ import ( gosignal "os/signal" "syscall" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/servicebus" ) diff --git a/v2/internal/subsystem/binding.go b/v2/internal/subsystem/binding.go index 0de9131f..55c712b7 100644 --- a/v2/internal/subsystem/binding.go +++ b/v2/internal/subsystem/binding.go @@ -2,7 +2,7 @@ package subsystem import ( "github.com/wailsapp/wails/v2/internal/binding" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/runtime/goruntime" "github.com/wailsapp/wails/v2/internal/servicebus" ) diff --git a/v2/internal/subsystem/call.go b/v2/internal/subsystem/call.go index 01a49082..54407117 100644 --- a/v2/internal/subsystem/call.go +++ b/v2/internal/subsystem/call.go @@ -6,7 +6,7 @@ import ( "strings" "github.com/wailsapp/wails/v2/internal/binding" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher/message" "github.com/wailsapp/wails/v2/internal/servicebus" "github.com/wailsapp/wails/v2/internal/runtime/goruntime" diff --git a/v2/internal/subsystem/event.go b/v2/internal/subsystem/event.go index 9c91b13a..aa219f8d 100644 --- a/v2/internal/subsystem/event.go +++ b/v2/internal/subsystem/event.go @@ -4,7 +4,7 @@ import ( "strings" "sync" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher/message" "github.com/wailsapp/wails/v2/internal/servicebus" ) diff --git a/v2/internal/subsystem/event_test.go b/v2/internal/subsystem/event_test.go index 0bd01af9..99219948 100644 --- a/v2/internal/subsystem/event_test.go +++ b/v2/internal/subsystem/event_test.go @@ -6,7 +6,7 @@ import ( "testing" "github.com/matryer/is" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher/message" "github.com/wailsapp/wails/v2/internal/servicebus" ) diff --git a/v2/internal/subsystem/log.go b/v2/internal/subsystem/log.go index 8be9a0b1..e57368d0 100644 --- a/v2/internal/subsystem/log.go +++ b/v2/internal/subsystem/log.go @@ -3,7 +3,7 @@ package subsystem import ( "strings" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/servicebus" ) diff --git a/v2/internal/subsystem/runtime.go b/v2/internal/subsystem/runtime.go index c97d4d4d..f692738c 100644 --- a/v2/internal/subsystem/runtime.go +++ b/v2/internal/subsystem/runtime.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/runtime/goruntime" "github.com/wailsapp/wails/v2/internal/servicebus" ) diff --git a/v2/internal/templates/templates.go b/v2/internal/templates/templates.go index 21763a11..a52401df 100644 --- a/v2/internal/templates/templates.go +++ b/v2/internal/templates/templates.go @@ -12,7 +12,7 @@ import ( "github.com/leaanthony/slicer" "github.com/olekukonko/tablewriter" "github.com/wailsapp/wails/v2/internal/fs" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" ) // Cahce for the templates diff --git a/v2/internal/webserver/webserver.go b/v2/internal/webserver/webserver.go index b82d877f..4b143d25 100644 --- a/v2/internal/webserver/webserver.go +++ b/v2/internal/webserver/webserver.go @@ -7,7 +7,7 @@ import ( "github.com/wailsapp/wails/v2/internal/assetdb" "github.com/wailsapp/wails/v2/internal/binding" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/messagedispatcher" "github.com/wailsapp/wails/v2/internal/subsystem" ) diff --git a/v2/internal/webserver/websockets.go b/v2/internal/webserver/websockets.go index 729261b4..0fdc207a 100644 --- a/v2/internal/webserver/websockets.go +++ b/v2/internal/webserver/websockets.go @@ -5,7 +5,7 @@ import ( "net/http" "strings" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" ws "nhooyr.io/websocket" "nhooyr.io/websocket/wsjson" ) diff --git a/v2/pkg/commands/build/base.go b/v2/pkg/commands/build/base.go index 4e23a56d..9c1707d2 100644 --- a/v2/pkg/commands/build/base.go +++ b/v2/pkg/commands/build/base.go @@ -14,7 +14,7 @@ import ( "github.com/wailsapp/wails/v2/internal/assetdb" "github.com/wailsapp/wails/v2/internal/fs" "github.com/wailsapp/wails/v2/internal/html" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/project" "github.com/wailsapp/wails/v2/internal/shell" ) diff --git a/v2/pkg/commands/build/build.go b/v2/pkg/commands/build/build.go index 0283a741..c516cefd 100644 --- a/v2/pkg/commands/build/build.go +++ b/v2/pkg/commands/build/build.go @@ -6,7 +6,7 @@ import ( "runtime" "github.com/leaanthony/slicer" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/project" ) diff --git a/v2/pkg/commands/build/builder.go b/v2/pkg/commands/build/builder.go index 26a11b9f..15b5f08f 100644 --- a/v2/pkg/commands/build/builder.go +++ b/v2/pkg/commands/build/builder.go @@ -1,7 +1,7 @@ package build import ( - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" "github.com/wailsapp/wails/v2/internal/project" ) diff --git a/v2/pkg/commands/build/desktop.go b/v2/pkg/commands/build/desktop.go index e7388685..897acbe7 100644 --- a/v2/pkg/commands/build/desktop.go +++ b/v2/pkg/commands/build/desktop.go @@ -7,7 +7,7 @@ import ( "github.com/wailsapp/wails/v2/internal/fs" "github.com/wailsapp/wails/v2/internal/html" - "github.com/wailsapp/wails/v2/pkg/logger" + "github.com/wailsapp/wails/v2/internal/logger" ) // DesktopBuilder builds applications for the desktop