refactor: use blang/semver v4

paralin · paralin · commit 4488420bf813 · 2024-08-02T09:34:03.000-07:00
Signed-off-by: Christian Stewart &lt;christian@aperture.us&gt;
diff --git a/bus/api/controller/controller.go b/bus/api/controller/controller.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
 	"github.com/aperturerobotics/starpc/srpc"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/bus/api/controller/factory.go b/bus/api/controller/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // ControllerID identifies the API controller.
diff --git a/bus/bridge/bridge.go b/bus/bridge/bridge.go
@@ -7,7 +7,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // ControllerID is the controller identifier.
diff --git a/bus/controller.go b/bus/controller.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/bus/factory.go b/bus/factory.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/bus/inmem/mark_idle_test.go b/bus/inmem/mark_idle_test.go
@@ -10,7 +10,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/directive/controller"
 	boilerplate_controller "github.com/aperturerobotics/controllerbus/example/boilerplate/controller"
 	boilerplate_v1 "github.com/aperturerobotics/controllerbus/example/boilerplate/v1"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/controller/configset/controller/controller.go b/controller/configset/controller/controller.go
@@ -8,7 +8,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/controller/configset"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/controller/configset/controller/factory.go b/controller/configset/controller/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a configset controller.
diff --git a/controller/factory.go b/controller/factory.go
@@ -4,7 +4,7 @@ import (
 	"context"
 
 	"github.com/aperturerobotics/controllerbus/config"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/controller/info.go b/controller/info.go
@@ -1,7 +1,7 @@
 package controller
 
 import (
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // NewInfo constructs a new Info object.
diff --git a/controller/loader/loader.go b/controller/loader/loader.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/controller/resolver/static/resolver.go b/controller/resolver/static/resolver.go
@@ -8,7 +8,7 @@ import (
 
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"golang.org/x/exp/maps"
 )
 
diff --git a/directive/watchable-resolver_test.go b/directive/watchable-resolver_test.go
@@ -11,7 +11,7 @@ import (
 	cdc "github.com/aperturerobotics/controllerbus/directive/controller"
 	boilerplate_v1 "github.com/aperturerobotics/controllerbus/example/boilerplate/v1"
 	"github.com/aperturerobotics/util/ccontainer"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/directive/watchable-transform-resolver_test.go b/directive/watchable-transform-resolver_test.go
@@ -13,7 +13,7 @@ import (
 	cdc "github.com/aperturerobotics/controllerbus/directive/controller"
 	boilerplate_v1 "github.com/aperturerobotics/controllerbus/example/boilerplate/v1"
 	"github.com/aperturerobotics/util/ccontainer"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/example/boilerplate/controller/controller.go b/example/boilerplate/controller/controller.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/directive"
 	"github.com/aperturerobotics/controllerbus/example/boilerplate"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/example/hello-world/controller.go b/example/hello-world/controller.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 )
 
diff --git a/example/hello-world/controller_factory.go b/example/hello-world/controller_factory.go
@@ -6,7 +6,7 @@ import (
 
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // toyFactoryVersion is the compiled-in version
diff --git a/example/plugin-demo/demo-controller/controller.go b/example/plugin-demo/demo-controller/controller.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
 
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/sirupsen/logrus"
 
 	// The following import should be correctly transformed.
diff --git a/example/plugin-demo/demo-controller/factory.go b/example/plugin-demo/demo-controller/factory.go
@@ -6,7 +6,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a boilerplate controller.
diff --git a/go.mod b/go.mod
@@ -8,15 +8,15 @@ replace github.com/libp2p/go-libp2p => github.com/aperturerobotics/go-libp2p v0.
 replace github.com/libp2p/go-msgio => github.com/aperturerobotics/go-libp2p-msgio v0.0.0-20240511033615-1b69178aa5c8 // aperture
 
 require (
-	github.com/aperturerobotics/common v0.18.1 // latest
+	github.com/aperturerobotics/common v0.18.3 // latest
 	github.com/aperturerobotics/json-iterator-lite v1.0.0 // latest
 	github.com/aperturerobotics/protobuf-go-lite v0.6.5 // latest
 	github.com/aperturerobotics/starpc v0.33.6 // latest
-	github.com/aperturerobotics/util v1.25.5 // latest
+	github.com/aperturerobotics/util v1.25.7 // latest
 )
 
 require (
-	github.com/blang/semver v3.5.1+incompatible
+	github.com/blang/semver/v4 v4.0.0
 	github.com/cenkalti/backoff v2.2.1+incompatible
 	github.com/fsnotify/fsnotify v1.7.0
 	github.com/ghodss/yaml v1.0.0
diff --git a/go.sum b/go.sum
@@ -1,5 +1,5 @@
-github.com/aperturerobotics/common v0.18.1 h1:zXFzVFOPe/11YZv1EUevvTmoWRVhX+B+S/5oUk9emGQ=
-github.com/aperturerobotics/common v0.18.1/go.mod h1:qLWqm2T9MQmxDtE1ddNdWCHnUj1Z66GzNxllkZ3Fj7Y=
+github.com/aperturerobotics/common v0.18.3 h1:DicdT7Yi9xlHMgJOiH1ypkRGt/TOctWWgVfdgh4p+H4=
+github.com/aperturerobotics/common v0.18.3/go.mod h1:qLWqm2T9MQmxDtE1ddNdWCHnUj1Z66GzNxllkZ3Fj7Y=
 github.com/aperturerobotics/go-libp2p v0.33.1-0.20240511223728-e0b67c111765 h1:KTSK6vPrh6gaT6CH0G2yAnmlcdjsc9Bk5JCqSeePrUw=
 github.com/aperturerobotics/go-libp2p v0.33.1-0.20240511223728-e0b67c111765/go.mod h1:/TIElEA8TzmHQTgGJQyzg0zHNZRCMYbdKyOsKwn9i6E=
 github.com/aperturerobotics/json-iterator-lite v1.0.0 h1:cihbrYWoK/S2RYXhJLpDZd+GUjVvFJN+D3w1VOqqHRI=
@@ -8,10 +8,10 @@ github.com/aperturerobotics/protobuf-go-lite v0.6.5 h1:AuPPcZ7ZaJe9ZYYC4gF7/5/Xb
 github.com/aperturerobotics/protobuf-go-lite v0.6.5/go.mod h1:YTbfnUj3feSULhs8VgepAHFnF3wUc0CPj4jd2axy21I=
 github.com/aperturerobotics/starpc v0.33.6 h1:noc/MnmIMTek9bdEvd88QiD1p9KzEV8CUOBIoKmGgm0=
 github.com/aperturerobotics/starpc v0.33.6/go.mod h1:4IYcbulEzqhPT5jKaDeL1BJPFd8WVWZ7Ugu0/348/Is=
-github.com/aperturerobotics/util v1.25.5 h1:vUebti6skb9KeL6p50yI7YBwhhL8JoKlIH8OqwcvHDA=
-github.com/aperturerobotics/util v1.25.5/go.mod h1:DdflF5HvWF01S4MNnSV9O5LR0SGajkx0wDIiXTsNtFc=
-github.com/blang/semver v3.5.1+incompatible h1:cQNTCjp13qL8KC3Nbxr/y2Bqb63oX6wdnnjpJbkM4JQ=
-github.com/blang/semver v3.5.1+incompatible/go.mod h1:kRBLl5iJ+tD4TcOOxsy/0fnwebNt5EWlYSAyrTnjyyk=
+github.com/aperturerobotics/util v1.25.7 h1:e9fdF3W/E7IHdl7YAJC0jjuxGph7yzE3a5zZoLFJ3G0=
+github.com/aperturerobotics/util v1.25.7/go.mod h1:G5ybyxaL62Rdv0K5ZGqu+D1NfqlZCLYPQhdfiYhxlAg=
+github.com/blang/semver/v4 v4.0.0 h1:1PFHFE6yCCTv8C1TeyNNarDzntLi7wMI5i/pzqYIsAM=
+github.com/blang/semver/v4 v4.0.0/go.mod h1:IbckMUScFkM3pff0VJDNKRiT6TG/YpiHIM2yvyW5YoQ=
 github.com/cenkalti/backoff v2.2.1+incompatible h1:tNowT99t7UNflLxfYYSlKYsBpXdEet03Pg2g16Swow4=
 github.com/cenkalti/backoff v2.2.1+incompatible/go.mod h1:90ReRw6GdpyfrHakVjL/QHaoyV4aDUVVkXQJJJ3NXXM=
 github.com/cloudflare/circl v1.3.8 h1:j+V8jJt09PoeMFIu2uh5JUyEaIHTXVOHslFoLNAKqwI=
diff --git a/plugin/loader/shared-library/filesystem/controller.go b/plugin/loader/shared-library/filesystem/controller.go
@@ -11,7 +11,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/directive"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 	"github.com/pkg/errors"
 	"github.com/sirupsen/logrus"
 )
diff --git a/plugin/loader/shared-library/filesystem/factory.go b/plugin/loader/shared-library/filesystem/factory.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/bus"
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Factory constructs a hot loading from filesystem controller.
diff --git a/plugin/resolver.go b/plugin/resolver.go
@@ -9,7 +9,7 @@ import (
 	"github.com/aperturerobotics/controllerbus/config"
 	"github.com/aperturerobotics/controllerbus/controller"
 	"github.com/aperturerobotics/controllerbus/controller/resolver/static"
-	"github.com/blang/semver"
+	"github.com/blang/semver/v4"
 )
 
 // Version is the resolver version.

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ import (`
`9`	`9`	`"github.com/aperturerobotics/controllerbus/controller"`
`10`	`10`	`"github.com/aperturerobotics/controllerbus/directive"`
`11`	`11`	`"github.com/aperturerobotics/starpc/srpc"`
`12`		`- "github.com/blang/semver"`
	`12`	`+ "github.com/blang/semver/v4"`
`13`	`13`	`"github.com/sirupsen/logrus"`
`14`	`14`	`)`
`15`	`15`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import (`
`6`	`6`	`"github.com/aperturerobotics/controllerbus/bus"`
`7`	`7`	`"github.com/aperturerobotics/controllerbus/config"`
`8`	`8`	`"github.com/aperturerobotics/controllerbus/controller"`
`9`		`- "github.com/blang/semver"`
	`9`	`+ "github.com/blang/semver/v4"`
`10`	`10`	`)`
`11`	`11`
`12`	`12`	`// ControllerID identifies the API controller.`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ import (`
`7`	`7`	`"github.com/aperturerobotics/controllerbus/bus"`
`8`	`8`	`"github.com/aperturerobotics/controllerbus/controller"`
`9`	`9`	`"github.com/aperturerobotics/controllerbus/directive"`
`10`		`- "github.com/blang/semver"`
	`10`	`+ "github.com/blang/semver/v4"`
`11`	`11`	`)`
`12`	`12`
`13`	`13`	`// ControllerID is the controller identifier.`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ import (`
`5`	`5`
`6`	`6`	`"github.com/aperturerobotics/controllerbus/config"`
`7`	`7`	`"github.com/aperturerobotics/controllerbus/controller"`
`8`		`- "github.com/blang/semver"`
	`8`	`+ "github.com/blang/semver/v4"`
`9`	`9`	`"github.com/pkg/errors"`
`10`	`10`	`"github.com/sirupsen/logrus"`
`11`	`11`	`)`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ import (`
`10`	`10`	`"github.com/aperturerobotics/controllerbus/directive/controller"`
`11`	`11`	`boilerplate_controller "github.com/aperturerobotics/controllerbus/example/boilerplate/controller"`
`12`	`12`	`boilerplate_v1 "github.com/aperturerobotics/controllerbus/example/boilerplate/v1"`
`13`		`- "github.com/blang/semver"`
	`13`	`+ "github.com/blang/semver/v4"`
`14`	`14`	`"github.com/sirupsen/logrus"`
`15`	`15`	`)`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import (`
`8`	`8`	`"github.com/aperturerobotics/controllerbus/controller"`
`9`	`9`	`"github.com/aperturerobotics/controllerbus/controller/configset"`
`10`	`10`	`"github.com/aperturerobotics/controllerbus/directive"`
`11`		`- "github.com/blang/semver"`
	`11`	`+ "github.com/blang/semver/v4"`
`12`	`12`	`"github.com/sirupsen/logrus"`
`13`	`13`	`)`
`14`	`14`
Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ import (`
`4`	`4`	`"context"`
`5`	`5`
`6`	`6`	`"github.com/aperturerobotics/controllerbus/config"`
`7`		`- "github.com/blang/semver"`
	`7`	`+ "github.com/blang/semver/v4"`
`8`	`8`	`"github.com/sirupsen/logrus"`
`9`	`9`	`)`
`10`	`10`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package controller`
`2`	`2`
`3`	`3`	`import (`
`4`		`- "github.com/blang/semver"`
	`4`	`+ "github.com/blang/semver/v4"`
`5`	`5`	`)`
`6`	`6`
`7`	`7`	`// NewInfo constructs a new Info object.`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ import (`
`11`	`11`	`cdc "github.com/aperturerobotics/controllerbus/directive/controller"`
`12`	`12`	`boilerplate_v1 "github.com/aperturerobotics/controllerbus/example/boilerplate/v1"`
`13`	`13`	`"github.com/aperturerobotics/util/ccontainer"`
`14`		`- "github.com/blang/semver"`
	`14`	`+ "github.com/blang/semver/v4"`
`15`	`15`	`"github.com/sirupsen/logrus"`
`16`	`16`	`)`
`17`	`17`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import (`
`13`	`13`	`cdc "github.com/aperturerobotics/controllerbus/directive/controller"`
`14`	`14`	`boilerplate_v1 "github.com/aperturerobotics/controllerbus/example/boilerplate/v1"`
`15`	`15`	`"github.com/aperturerobotics/util/ccontainer"`
`16`		`- "github.com/blang/semver"`
	`16`	`+ "github.com/blang/semver/v4"`
`17`	`17`	`"github.com/sirupsen/logrus"`
`18`	`18`	`)`
`19`	`19`