diff --git a/v3/examples/plugins/main.go b/v3/examples/plugins/main.go index 99f273d00..a3141bbb4 100644 --- a/v3/examples/plugins/main.go +++ b/v3/examples/plugins/main.go @@ -6,7 +6,6 @@ import ( "plugin_demo/plugins/hashes" "github.com/wailsapp/wails/v3/pkg/application" - "github.com/wailsapp/wails/v3/plugins/experimental/server" "github.com/wailsapp/wails/v3/plugins/kvstore" "github.com/wailsapp/wails/v3/plugins/log" "github.com/wailsapp/wails/v3/plugins/single_instance" @@ -35,10 +34,10 @@ func main() { Filename: "store.json", AutoSave: true, }), - "server": server.NewPlugin(&server.Config{ - Enabled: true, - Port: 34115, - }), + //"server": server.NewPlugin(&server.Config{ + // Enabled: true, + // Port: 34115, + //}), "single_instance": single_instance.NewPlugin(&single_instance.Config{ // When true, the original app will be activated when a second instance is launched ActivateAppOnSubsequentLaunch: true, diff --git a/v3/examples/plugins/plugins/hashes/plugin.go b/v3/examples/plugins/plugins/hashes/plugin.go index b3b842690..aa6a5f4e9 100644 --- a/v3/examples/plugins/plugins/hashes/plugin.go +++ b/v3/examples/plugins/plugins/hashes/plugin.go @@ -5,6 +5,7 @@ import ( "crypto/sha1" "crypto/sha256" "encoding/hex" + "github.com/wailsapp/wails/v3/pkg/application" ) // ---------------- Plugin Setup ---------------- @@ -15,13 +16,13 @@ func NewPlugin() *Plugin { return &Plugin{} } -func (r *Plugin) Shutdown() {} +func (r *Plugin) Shutdown() error { return nil } func (r *Plugin) Name() string { return "Hashes Plugin" } -func (r *Plugin) Init() error { +func (r *Plugin) Init(api application.PluginAPI) error { return nil } diff --git a/v3/plugins/kvstore/kvstore.go b/v3/plugins/kvstore/kvstore.go index c5df22ed5..e2b5e7526 100644 --- a/v3/plugins/kvstore/kvstore.go +++ b/v3/plugins/kvstore/kvstore.go @@ -53,7 +53,7 @@ func (kvs *KeyValueStore) Name() string { // Init is called when the plugin is loaded. It is passed the application.App // instance. This is where you should do any setup. -func (kvs *KeyValueStore) Init() error { +func (kvs *KeyValueStore) Init(api application.PluginAPI) error { err := kvs.open(kvs.config.Filename) if err != nil { return err diff --git a/v3/plugins/log/plugin.go b/v3/plugins/log/plugin.go index 1cb59b860..623801aa5 100644 --- a/v3/plugins/log/plugin.go +++ b/v3/plugins/log/plugin.go @@ -57,7 +57,7 @@ func (p *Plugin) Name() string { return "github.com/wailsapp/wails/v3/plugins/log" } -func (p *Plugin) Init() error { +func (p *Plugin) Init(api application.PluginAPI) error { return nil } diff --git a/v3/plugins/single_instance/plugin.go b/v3/plugins/single_instance/plugin.go index b3bad39f5..caa8b68a4 100644 --- a/v3/plugins/single_instance/plugin.go +++ b/v3/plugins/single_instance/plugin.go @@ -43,8 +43,8 @@ func NewPlugin(config *Config) *Plugin { } // Shutdown is called when the app is shutting down -func (p *Plugin) Shutdown() { - p.lockfile.Close() +func (p *Plugin) Shutdown() error { + return p.lockfile.Close() } // Name returns the name of the plugin. @@ -55,7 +55,7 @@ func (p *Plugin) Name() string { // Init is called when the app is starting up. You can use this to // initialise any resources you need. You can also access the application // instance via the app property. -func (p *Plugin) Init() error { +func (p *Plugin) Init(api application.PluginAPI) error { var err error lockfileName := p.config.LockFilePath + "/" + p.config.LockFileName p.lockfile, err = CreateLockFile(lockfileName, application.Get().GetPID()) diff --git a/v3/plugins/sqlite/plugin.go b/v3/plugins/sqlite/plugin.go index 0e2b20282..f1ac8675f 100644 --- a/v3/plugins/sqlite/plugin.go +++ b/v3/plugins/sqlite/plugin.go @@ -5,6 +5,7 @@ import ( _ "embed" "errors" "fmt" + "github.com/wailsapp/wails/v3/pkg/application" _ "modernc.org/sqlite" "strings" ) @@ -60,7 +61,7 @@ func (p *Plugin) Name() string { // Init is called when the app is starting up. You can use this to // initialise any resources you need. -func (p *Plugin) Init() error { +func (p *Plugin) Init(api application.PluginAPI) error { p.callableMethods = []string{"Execute", "Select"} p.js = executeselectjs if p.config.CanOpenFromJS { diff --git a/v3/plugins/start_at_login/plugin.go b/v3/plugins/start_at_login/plugin.go index 313a7a053..7ad4cf009 100644 --- a/v3/plugins/start_at_login/plugin.go +++ b/v3/plugins/start_at_login/plugin.go @@ -1,5 +1,7 @@ package start_at_login +import "github.com/wailsapp/wails/v3/pkg/application" + type Plugin struct { disabled bool options Config @@ -27,7 +29,7 @@ func (p *Plugin) Name() string { return "github.com/wailsapp/wails/v3/plugins/start_at_login" } -func (p *Plugin) Init() error { +func (p *Plugin) Init(api application.PluginAPI) error { // OS specific initialiser err := p.init() if err != nil {