chore(deps): bump gazelle and sync versions (#1211)

Renovate tried to bump gazelle, but it couldn't because of the patches
we had, so I removed them and fixed the code.

Signed-off-by: Thulio Ferraz Assis <3149049+f0rmiga@users.noreply.github.com>
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
GitOrigin-RevId: a4ab91c347eb923a78ebaf356cb4e067a165f6ba

Author: 2 people

pkg/aspect/configure/BUILD.bazel

@@ -1,7 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
-# gazelle:resolve go github.com/bazelbuild/bazel-gazelle/internal/wspace @bazel_gazelle//internal/wspace
-
 go_library(
     name = "configure",
     srcs = [
@@ -20,7 +18,6 @@ go_library(
         "//pkg/ioutils",
         "@bazel_gazelle//config:go_default_library",
         "@bazel_gazelle//flag:go_default_library",
-        "@bazel_gazelle//internal/wspace",
         "@bazel_gazelle//label:go_default_library",
         "@bazel_gazelle//language:go_default_library",
         "@bazel_gazelle//language/go:go_default_library",

pkg/aspect/configure/fix-update.go

@@ -28,7 +28,6 @@ import (
 
 	"github.com/bazelbuild/bazel-gazelle/config"
 	gzflag "github.com/bazelbuild/bazel-gazelle/flag"
-	"github.com/bazelbuild/bazel-gazelle/internal/wspace"
 	"github.com/bazelbuild/bazel-gazelle/label"
 	"github.com/bazelbuild/bazel-gazelle/language"
 	"github.com/bazelbuild/bazel-gazelle/merger"
@@ -137,7 +136,7 @@ func (ucr *updateConfigurer) CheckFlags(fs *flag.FlagSet, c *config.Config) erro
 	// dependency resolution for Go.
 	// TODO(jayconrod): Go-specific code should be moved to language/go.
 	if ucr.repoConfigPath == "" {
-		ucr.repoConfigPath = wspace.FindWORKSPACEFile(c.RepoRoot)
+		ucr.repoConfigPath = findWORKSPACEFile(c.RepoRoot)
 	}
 	repoConfigFile, err := rule.LoadWorkspaceFile(ucr.repoConfigPath, "")
 	if err != nil && !os.IsNotExist(err) {
@@ -165,7 +164,7 @@ func (ucr *updateConfigurer) CheckFlags(fs *flag.FlagSet, c *config.Config) erro
 
 	// If the repo configuration file is not WORKSPACE, also load WORKSPACE
 	// and any declared macro files so we can apply fixes.
-	workspacePath := wspace.FindWORKSPACEFile(c.RepoRoot)
+	workspacePath := findWORKSPACEFile(c.RepoRoot)
 	var workspace *rule.File
 	if ucr.repoConfigPath == workspacePath {
 		workspace = repoConfigFile
@@ -455,7 +454,7 @@ func fixRepoFiles(c *config.Config, loads []rule.LoadInfo) error {
 
 	for _, f := range uc.workspaceFiles {
 		merger.FixLoads(f, loads)
-		workspaceFile := wspace.FindWORKSPACEFile(c.RepoRoot)
+		workspaceFile := findWORKSPACEFile(c.RepoRoot)
 
 		if f.Path == workspaceFile {
 			removeLegacyGoRepository(f)
@@ -581,3 +580,11 @@ func appendOrMergeKindMapping(mappedLoads []rule.LoadInfo, mappedKind config.Map
 		Symbols: []string{mappedKind.KindName},
 	})
 }
+
+func findWORKSPACEFile(root string) string {
+	pathWithExt := filepath.Join(root, "WORKSPACE.bazel")
+	if _, err := os.Stat(pathWithExt); err == nil {
+		return pathWithExt
+	}
+	return filepath.Join(root, "WORKSPACE")
+}

pkg/aspect/init/BUILD.bazel

@@ -14,7 +14,7 @@ go_library(
         "//pkg/ioutils",
         "@com_github_fatih_color//:color",
         "@com_github_manifoldco_promptui//:promptui",
-        "@com_github_masterminds_semver//:semver",
+        "@com_github_masterminds_semver_v3//:semver",
         "@com_github_spf13_cobra//:cobra",
     ],
 )

pkg/aspect/init/init.go

@@ -23,13 +23,13 @@ import (
 	"path"
 	"strings"
 
+	"github.com/Masterminds/semver"
 	"aspect.build/cli/buildinfo"
 	"aspect.build/cli/docs/bazelrc"
 	"aspect.build/cli/pkg/aspect/init/template"
 	"aspect.build/cli/pkg/bazel"
 	"aspect.build/cli/pkg/bazel/workspace"
 	"aspect.build/cli/pkg/ioutils"
-	"github.com/Masterminds/semver"
 	"github.com/fatih/color"
 	"github.com/manifoldco/promptui"
 	"github.com/spf13/cobra"