From 0403e0a783b84b4ff981db7d2fd961f1ba823206 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Fri, 9 Oct 2020 10:30:01 +1100 Subject: [PATCH] Make logger a public 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/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 +- v2/{internal => pkg}/logger/custom_logger.go | 0 v2/{internal => pkg}/logger/default_logger.go | 0 v2/{internal => pkg}/logger/logger.go | 0 v2/{internal => pkg}/logger/logger_test.go | 0 34 files changed, 30 insertions(+), 30 deletions(-) rename v2/{internal => pkg}/logger/custom_logger.go (100%) rename v2/{internal => pkg}/logger/default_logger.go (100%) rename v2/{internal => pkg}/logger/logger.go (100%) rename v2/{internal => pkg}/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 a578ff0b..2a601c37 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 aeadade1..4d5cb618 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 b0f6df45..57dd68f1 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 55217aa7..f9a46fe9 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/logger" "github.com/wailsapp/wails/v2/internal/templates" ) diff --git a/v2/internal/app/desktop.go b/v2/internal/app/desktop.go index e28dd2d4..b9d41593 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 f39e7d64..a236de28 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 0530de58..55b472d8 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 479f964b..cb4e18e7 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/logger" ) type Bindings struct { diff --git a/v2/internal/ffenestri/ffenestri.go b/v2/internal/ffenestri/ffenestri.go index 41b213c9..9e97ed57 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 40acde18..f98966cc 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/logger" "github.com/wailsapp/wails/v2/pkg/options" ) diff --git a/v2/internal/messagedispatcher/dispatchclient.go b/v2/internal/messagedispatcher/dispatchclient.go index 0635b522..91a9a83a 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 744d3dbd..ecd6c46e 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 4a92e8fd..f0ebbdfa 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 73a000a0..f1c8c767 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/logger" "github.com/wailsapp/wails/v2/internal/servicebus" ) diff --git a/v2/internal/servicebus/servicebus.go b/v2/internal/servicebus/servicebus.go index 55c37480..9a574f2b 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 750a56aa..99efbce3 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/logger" ) type Person interface { diff --git a/v2/internal/signal/signal.go b/v2/internal/signal/signal.go index b394991c..c288493a 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/logger" "github.com/wailsapp/wails/v2/internal/servicebus" ) diff --git a/v2/internal/subsystem/binding.go b/v2/internal/subsystem/binding.go index 55c712b7..0de9131f 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 54407117..01a49082 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 aa219f8d..9c91b13a 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 99219948..0bd01af9 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 e57368d0..8be9a0b1 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/logger" "github.com/wailsapp/wails/v2/internal/servicebus" ) diff --git a/v2/internal/subsystem/runtime.go b/v2/internal/subsystem/runtime.go index f692738c..c97d4d4d 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 a52401df..21763a11 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/logger" ) // Cahce for the templates diff --git a/v2/internal/webserver/webserver.go b/v2/internal/webserver/webserver.go index 4b143d25..b82d877f 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 0fdc207a..729261b4 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 9c1707d2..4e23a56d 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 c516cefd..0283a741 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 15b5f08f..26a11b9f 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/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 897acbe7..e7388685 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/internal/logger" + "github.com/wailsapp/wails/v2/pkg/logger" ) // DesktopBuilder builds applications for the desktop diff --git a/v2/internal/logger/custom_logger.go b/v2/pkg/logger/custom_logger.go similarity index 100% rename from v2/internal/logger/custom_logger.go rename to v2/pkg/logger/custom_logger.go diff --git a/v2/internal/logger/default_logger.go b/v2/pkg/logger/default_logger.go similarity index 100% rename from v2/internal/logger/default_logger.go rename to v2/pkg/logger/default_logger.go diff --git a/v2/internal/logger/logger.go b/v2/pkg/logger/logger.go similarity index 100% rename from v2/internal/logger/logger.go rename to v2/pkg/logger/logger.go diff --git a/v2/internal/logger/logger_test.go b/v2/pkg/logger/logger_test.go similarity index 100% rename from v2/internal/logger/logger_test.go rename to v2/pkg/logger/logger_test.go