Update module declaration and imports

Open-CMSIS-Pack · Dec 19, 2023 · 96f482b · 96f482b
1 parent 3b09782
commit 96f482b
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 45 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -170,4 +170,4 @@ jobs:
         with:
           debug: true
           coverageLocations: ./build/cover.out:gocov
-          prefix: cbuild
+          prefix: github.com/Open-CMSIS-Pack/cbuild/v2
diff --git a/cmd/cbuild/commands/build/buildcprj.go b/cmd/cbuild/commands/build/buildcprj.go
@@ -6,12 +6,12 @@
 package build
 
 import (
-	"cbuild/pkg/builder"
-	"cbuild/pkg/builder/cproject"
-	"cbuild/pkg/utils"
 	"errors"
 	"path/filepath"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/cproject"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/cbuild/commands/build/buildcprj_test.go b/cmd/cbuild/commands/build/buildcprj_test.go
@@ -7,10 +7,10 @@
 package build_test
 
 import (
-	"cbuild/cmd/cbuild/commands"
 	"os"
 	"testing"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/cmd/cbuild/commands/list/list_contexts.go b/cmd/cbuild/commands/list/list_contexts.go
@@ -6,10 +6,9 @@
 package list
 
 import (
-	"cbuild/pkg/builder"
-	"cbuild/pkg/builder/csolution"
-	"cbuild/pkg/utils"
-
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/csolution"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/cbuild/commands/list/list_contexts_test.go b/cmd/cbuild/commands/list/list_contexts_test.go
@@ -7,9 +7,9 @@
 package list_test
 
 import (
-	"cbuild/cmd/cbuild/commands"
 	"testing"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/cmd/cbuild/commands/list/list_environment.go b/cmd/cbuild/commands/list/list_environment.go
@@ -6,10 +6,9 @@
 package list
 
 import (
-	"cbuild/pkg/builder"
-	"cbuild/pkg/builder/csolution"
-	"cbuild/pkg/utils"
-
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/csolution"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/cbuild/commands/list/list_environment_test.go b/cmd/cbuild/commands/list/list_environment_test.go
@@ -7,9 +7,9 @@
 package list_test
 
 import (
-	"cbuild/cmd/cbuild/commands"
 	"testing"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/cmd/cbuild/commands/list/list_test.go b/cmd/cbuild/commands/list/list_test.go
@@ -7,9 +7,9 @@
 package list_test
 
 import (
-	"cbuild/cmd/cbuild/commands"
 	"testing"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/cmd/cbuild/commands/list/list_toolchains.go b/cmd/cbuild/commands/list/list_toolchains.go
@@ -6,10 +6,9 @@
 package list
 
 import (
-	"cbuild/pkg/builder"
-	"cbuild/pkg/builder/csolution"
-	"cbuild/pkg/utils"
-
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/csolution"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 	"github.com/spf13/cobra"
 )
 

diff --git a/cmd/cbuild/commands/list/list_toolchains_test.go b/cmd/cbuild/commands/list/list_toolchains_test.go
@@ -7,9 +7,9 @@
 package list_test
 
 import (
-	"cbuild/cmd/cbuild/commands"
 	"testing"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/cmd/cbuild/commands/root.go b/cmd/cbuild/commands/root.go
@@ -7,19 +7,19 @@
 package commands
 
 import (
-	"cbuild/cmd/cbuild/commands/build"
-	"cbuild/cmd/cbuild/commands/list"
-	"cbuild/pkg/builder"
-	"cbuild/pkg/builder/cproject"
-	"cbuild/pkg/builder/csolution"
-	"cbuild/pkg/utils"
 	"errors"
 	"fmt"
 	"io"
 	"os"
 	"path/filepath"
 	"strings"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands/build"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands/list"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/cproject"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/csolution"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 )

diff --git a/cmd/cbuild/commands/root_test.go b/cmd/cbuild/commands/root_test.go
@@ -7,11 +7,11 @@
 package commands_test
 
 import (
-	"cbuild/cmd/cbuild/commands"
-	"cbuild/pkg/inittest"
 	"os"
 	"testing"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/inittest"
 	log "github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/assert"
 )

diff --git a/cmd/cbuild/main.go b/cmd/cbuild/main.go
@@ -7,10 +7,10 @@
 package main
 
 import (
-	"cbuild/cmd/cbuild/commands"
 	"fmt"
 	"os"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/cmd/cbuild/commands"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module cbuild
+module github.com/Open-CMSIS-Pack/cbuild/v2
 
 go 1.21
 

diff --git a/pkg/builder/cproject/builder.go b/pkg/builder/cproject/builder.go
@@ -15,9 +15,8 @@ import (
 	"runtime"
 	"strings"
 
-	builder "cbuild/pkg/builder"
-	utils "cbuild/pkg/utils"
-
+	builder "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
+	utils "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/pkg/builder/cproject/builder_test.go b/pkg/builder/cproject/builder_test.go
@@ -7,16 +7,16 @@
 package cproject
 
 import (
-	"cbuild/pkg/builder"
-	"cbuild/pkg/inittest"
-	"cbuild/pkg/utils"
 	"errors"
 	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
 	"testing"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/inittest"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/builder/csolution/builder.go b/pkg/builder/csolution/builder.go
@@ -7,9 +7,6 @@
 package csolution
 
 import (
-	builder "cbuild/pkg/builder"
-	"cbuild/pkg/builder/cproject"
-	utils "cbuild/pkg/utils"
 	"errors"
 	"fmt"
 	"os"
@@ -18,6 +15,9 @@ import (
 	"strconv"
 	"strings"
 
+	builder "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder/cproject"
+	utils "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/pkg/builder/csolution/builder_test.go b/pkg/builder/csolution/builder_test.go
@@ -7,15 +7,15 @@
 package csolution
 
 import (
-	builder "cbuild/pkg/builder"
-	"cbuild/pkg/inittest"
-	"cbuild/pkg/utils"
 	"errors"
 	"os"
 	"path/filepath"
 	"strings"
 	"testing"
 
+	builder "github.com/Open-CMSIS-Pack/cbuild/v2/pkg/builder"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/inittest"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 	"github.com/stretchr/testify/assert"
 )
 

diff --git a/pkg/builder/interface.go b/pkg/builder/interface.go
@@ -7,7 +7,7 @@
 package builder
 
 import (
-	"cbuild/pkg/utils"
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/utils"
 )
 
 type BuilderParams struct {

diff --git a/pkg/utils/configs_test.go b/pkg/utils/configs_test.go
@@ -7,9 +7,9 @@
 package utils
 
 import (
-	"cbuild/pkg/inittest"
 	"testing"
 
+	"github.com/Open-CMSIS-Pack/cbuild/v2/pkg/inittest"
 	"github.com/stretchr/testify/assert"
 )