refactor: replace local version package with external go-version package

shopware · Feb 24, 2025 · 4c769d8 · 4c769d8
1 parent 76f29a4
commit 4c769d8
Show file tree

Hide file tree

Showing 21 changed files with 18 additions and 1,530 deletions.
diff --git a/cmd/project/project_create.go b/cmd/project/project_create.go
@@ -19,7 +19,7 @@ import (
 	"github.com/spf13/cobra"
 
 	"github.com/shopware/shopware-cli/logging"
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 var projectCreateCmd = &cobra.Command{

diff --git a/cmd/project/project_extension_upload.go b/cmd/project/project_extension_upload.go
@@ -19,7 +19,7 @@ import (
 	"github.com/shopware/shopware-cli/extension"
 	"github.com/shopware/shopware-cli/logging"
 	"github.com/shopware/shopware-cli/shop"
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 var projectExtensionUploadCmd = &cobra.Command{

diff --git a/extension/app.go b/extension/app.go
@@ -9,7 +9,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 type App struct {

diff --git a/extension/asset_platform.go b/extension/asset_platform.go
@@ -14,7 +14,7 @@ import (
 	"github.com/shopware/shopware-cli/internal/asset"
 	"github.com/shopware/shopware-cli/internal/esbuild"
 	"github.com/shopware/shopware-cli/logging"
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 const (

diff --git a/extension/bundle.go b/extension/bundle.go
@@ -7,7 +7,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 type ShopwareBundle struct {

diff --git a/extension/platform.go b/extension/platform.go
@@ -13,7 +13,7 @@ import (
 
 	"github.com/shopware/shopware-cli/internal/phplint"
 	"github.com/shopware/shopware-cli/logging"
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 var ErrPlatformInvalidType = errors.New("invalid composer type")

diff --git a/extension/project.go b/extension/project.go
@@ -16,7 +16,7 @@ import (
 
 	"github.com/shopware/shopware-cli/internal/asset"
 	"github.com/shopware/shopware-cli/logging"
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 func GetShopwareProjectConstraint(project string) (*version.Constraints, error) {

diff --git a/extension/root.go b/extension/root.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"strings"
 
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 const (

diff --git a/extension/zip.go b/extension/zip.go
@@ -19,7 +19,7 @@ import (
 	"github.com/shopware/shopware-cli/internal/changelog"
 
 	"github.com/shopware/shopware-cli/logging"
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 var (

diff --git a/extension/zip_test.go b/extension/zip_test.go
@@ -5,7 +5,7 @@ import (
 
 	"github.com/stretchr/testify/assert"
 
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 func TestDetermineMinVersion(t *testing.T) {

diff --git a/go.mod b/go.mod
@@ -31,7 +31,10 @@ require (
 	gopkg.in/yaml.v3 v3.0.1
 )
 
-require github.com/otiai10/mint v1.6.3 // indirect
+require (
+	github.com/otiai10/mint v1.6.3 // indirect
+	github.com/shyim/go-version v0.0.0-20240530110323-4b7091cee42c // indirect
+)
 
 replace github.com/doutorfinancas/go-mad v0.0.0-20240205120830-463c1e9760f0 => github.com/shyim/go-mad v0.0.0-20250212101107-a15f8dde1bce
 

diff --git a/go.sum b/go.sum
@@ -95,6 +95,8 @@ github.com/shyim/go-htmlprinter v0.0.0-20250212091723-cc11f7bf036d h1:H4beXhaWS4
 github.com/shyim/go-htmlprinter v0.0.0-20250212091723-cc11f7bf036d/go.mod h1:7pOn8MeVA6hUnFkgkXpNFVjGtNnh2/AeZTDwXwWtNp8=
 github.com/shyim/go-mad v0.0.0-20250212101107-a15f8dde1bce h1:xQidim5dm481TchU2tzi7SjQwfmD6ombHKPHFsUL8Z4=
 github.com/shyim/go-mad v0.0.0-20250212101107-a15f8dde1bce/go.mod h1:yfWKFJm6NisKuie2cdH5zUttu4gZYHa/CY7CHpA3tMU=
+github.com/shyim/go-version v0.0.0-20240530110323-4b7091cee42c h1:3venOxJzcKW4Xi5N9ipFNrnwAS4g1yTOTcBssDHHgQA=
+github.com/shyim/go-version v0.0.0-20240530110323-4b7091cee42c/go.mod h1:z47ygE4N7EC0H58FP5j5cXZtl1pSnfjwYJsHtiVtcwU=
 github.com/spf13/cobra v1.9.1 h1:CXSaggrXdbHK9CF+8ywj8Amf7PBRmPCOJugH954Nnlo=
 github.com/spf13/cobra v1.9.1/go.mod h1:nDyEzZ8ogv936Cinf6g1RU9MRY64Ir93oCnqb9wxYW0=
 github.com/spf13/pflag v1.0.6 h1:jFzHGLGAlb3ruxLB8MhbI6A8+AQX/2eW4qeyNZXNp2o=

diff --git a/internal/account-api/producer_extension.go b/internal/account-api/producer_extension.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/microcosm-cc/bluemonday"
 
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 type SoftwareVersionList []SoftwareVersion

diff --git a/shop/version_check.go b/shop/version_check.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"path"
 
-	"github.com/shopware/shopware-cli/version"
+	"github.com/shyim/go-version"
 )
 
 var (
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,7 +7,7 @@ import ( @@
     	"os"
     	"path"
-    	"github.com/shopware/shopware-cli/version"
+    	"github.com/shyim/go-version"
     )
     type ShopwareBundle struct {
@@ Expand Down @@