From 73c139ad58d60dc1f36f7be3f4e41208817b94b4 Mon Sep 17 00:00:00 2001 From: Blake Miner Date: Wed, 25 Sep 2019 15:15:19 -0400 Subject: [PATCH] Update imports to dbus/v5 --- AccessPoint.go | 2 +- ActiveConnection.go | 2 +- Checkpoint.go | 2 +- Connection.go | 2 +- DHCP4Config.go | 2 +- DHCP6Config.go | 2 +- Device.go | 2 +- DeviceDummy.go | 2 +- DeviceGeneric.go | 2 +- DeviceIpTunnel.go | 2 +- DeviceStatistics.go | 2 +- DeviceWired.go | 2 +- DeviceWireless.go | 2 +- IP4Config.go | 4 ++-- IP6Config.go | 2 +- NetworkManager.go | 2 +- Settings.go | 2 +- go.mod | 4 +--- go.sum | 3 +-- utils.go | 2 +- 20 files changed, 21 insertions(+), 24 deletions(-) diff --git a/AccessPoint.go b/AccessPoint.go index b77ea29..bad167e 100644 --- a/AccessPoint.go +++ b/AccessPoint.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/ActiveConnection.go b/ActiveConnection.go index 48625cb..c03d6eb 100644 --- a/ActiveConnection.go +++ b/ActiveConnection.go @@ -1,7 +1,7 @@ package gonetworkmanager import ( - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/Checkpoint.go b/Checkpoint.go index a10e2d5..cccf063 100644 --- a/Checkpoint.go +++ b/Checkpoint.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/Connection.go b/Connection.go index fc03603..1031178 100644 --- a/Connection.go +++ b/Connection.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/DHCP4Config.go b/DHCP4Config.go index d4cba99..f946f20 100644 --- a/DHCP4Config.go +++ b/DHCP4Config.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/DHCP6Config.go b/DHCP6Config.go index b2de1de..2dde63c 100644 --- a/DHCP6Config.go +++ b/DHCP6Config.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/Device.go b/Device.go index 3356fbd..5c17b95 100644 --- a/Device.go +++ b/Device.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/DeviceDummy.go b/DeviceDummy.go index f9aa10b..c92a396 100644 --- a/DeviceDummy.go +++ b/DeviceDummy.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/DeviceGeneric.go b/DeviceGeneric.go index 3e11492..19d401e 100644 --- a/DeviceGeneric.go +++ b/DeviceGeneric.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/DeviceIpTunnel.go b/DeviceIpTunnel.go index ba156c3..7fc4344 100644 --- a/DeviceIpTunnel.go +++ b/DeviceIpTunnel.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/DeviceStatistics.go b/DeviceStatistics.go index 15e23bf..28439c6 100644 --- a/DeviceStatistics.go +++ b/DeviceStatistics.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/DeviceWired.go b/DeviceWired.go index 5512a29..b40e971 100644 --- a/DeviceWired.go +++ b/DeviceWired.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/DeviceWireless.go b/DeviceWireless.go index 5ac7f4b..187406d 100644 --- a/DeviceWireless.go +++ b/DeviceWireless.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/IP4Config.go b/IP4Config.go index 65be912..242e0f0 100644 --- a/IP4Config.go +++ b/IP4Config.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( @@ -315,4 +315,4 @@ func (c *ip4Config) MarshalJSON() ([]byte, error) { "Nameservers": Nameservers, "Domains": Domains, }) -} \ No newline at end of file +} diff --git a/IP6Config.go b/IP6Config.go index e000eb9..55dffcf 100644 --- a/IP6Config.go +++ b/IP6Config.go @@ -4,7 +4,7 @@ import ( "encoding/json" "errors" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/NetworkManager.go b/NetworkManager.go index ddaa100..63483b7 100644 --- a/NetworkManager.go +++ b/NetworkManager.go @@ -3,7 +3,7 @@ package gonetworkmanager import ( "encoding/json" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/Settings.go b/Settings.go index 27b85c9..3476348 100644 --- a/Settings.go +++ b/Settings.go @@ -1,7 +1,7 @@ package gonetworkmanager import ( - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const ( diff --git a/go.mod b/go.mod index 10255eb..63441ed 100644 --- a/go.mod +++ b/go.mod @@ -2,6 +2,4 @@ module github.com/Wifx/gonetworkmanager go 1.12 -require github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f - -replace github.com/godbus/dbus => github.com/godbus/dbus/v5 v5.0.2 +require github.com/godbus/dbus/v5 v5.0.2 diff --git a/go.sum b/go.sum index 8addbb6..f0856ca 100644 --- a/go.sum +++ b/go.sum @@ -1,3 +1,2 @@ -github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f h1:zlOR3rOlPAVvtfuxGKoghCmop5B0TRyu/ZieziZuGiM= -github.com/godbus/dbus v0.0.0-20181101234600-2ff6f7ffd60f/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw= +github.com/godbus/dbus/v5 v5.0.2 h1:QtWdZQyXTEn7S0LXv9nVxPUiT37d1i7UntpRTiKM86E= github.com/godbus/dbus/v5 v5.0.2/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= diff --git a/utils.go b/utils.go index a35a711..6f53f6b 100644 --- a/utils.go +++ b/utils.go @@ -5,7 +5,7 @@ import ( "fmt" "net" - "github.com/godbus/dbus" + "github.com/godbus/dbus/v5" ) const (