Skip to content

Commit 21667a5

Browse files
jbedardjbedard
committed
chore: upgrade aspect-gazelle to 3b24c7fb6b28
1 parent 7fee63f commit 21667a5

File tree

4 files changed

+66
-32
lines changed

4 files changed

+66
-32
lines changed

‎bazel/include/go.MODULE.bazel‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,46 +27,46 @@ archive_override(
2727
bazel_dep(name = "aspect_gazelle", version = "0.0.0")
2828
archive_override(
2929
module_name = "aspect_gazelle",
30-
integrity = "sha256-+BPYRzEbYQkV6+PpOBhOgvQAgV+vv8nKRq8LK5P+PuU=",
31-
strip_prefix = "aspect-gazelle-8e32503a9ac1d2d690553e36b7215a0e8061642a",
32-
urls = ["https://github.com/aspect-build/aspect-gazelle/archive/8e32503a9ac1d2d690553e36b7215a0e8061642a.tar.gz"],
30+
integrity = "sha256-AVtqWHZDYd2arPWInvEb+5Gz5G8IvNQ9Eir1+p9w2g0=",
31+
strip_prefix = "aspect-gazelle-3b24c7fb6b280f756fdb4808ffd4af2e689bfae7",
32+
urls = ["https://github.com/aspect-build/aspect-gazelle/archive/3b24c7fb6b280f756fdb4808ffd4af2e689bfae7.tar.gz"],
3333
)
3434

3535
bazel_dep(name = "aspect_gazelle_js", version = "0.0.0")
3636
archive_override(
3737
module_name = "aspect_gazelle_js",
38-
integrity = "sha256-+BPYRzEbYQkV6+PpOBhOgvQAgV+vv8nKRq8LK5P+PuU=",
39-
strip_prefix = "aspect-gazelle-8e32503a9ac1d2d690553e36b7215a0e8061642a/language/js",
40-
urls = ["https://github.com/aspect-build/aspect-gazelle/archive/8e32503a9ac1d2d690553e36b7215a0e8061642a.tar.gz"],
38+
integrity = "sha256-AVtqWHZDYd2arPWInvEb+5Gz5G8IvNQ9Eir1+p9w2g0=",
39+
strip_prefix = "aspect-gazelle-3b24c7fb6b280f756fdb4808ffd4af2e689bfae7/language/js",
40+
urls = ["https://github.com/aspect-build/aspect-gazelle/archive/3b24c7fb6b280f756fdb4808ffd4af2e689bfae7.tar.gz"],
4141
)
4242

4343
bazel_dep(name = "aspect_gazelle_orion", version = "0.0.0")
4444
archive_override(
4545
module_name = "aspect_gazelle_orion",
46-
integrity = "sha256-+BPYRzEbYQkV6+PpOBhOgvQAgV+vv8nKRq8LK5P+PuU=",
47-
strip_prefix = "aspect-gazelle-8e32503a9ac1d2d690553e36b7215a0e8061642a/language/orion",
48-
urls = ["https://github.com/aspect-build/aspect-gazelle/archive/8e32503a9ac1d2d690553e36b7215a0e8061642a.tar.gz"],
46+
integrity = "sha256-AVtqWHZDYd2arPWInvEb+5Gz5G8IvNQ9Eir1+p9w2g0=",
47+
strip_prefix = "aspect-gazelle-3b24c7fb6b280f756fdb4808ffd4af2e689bfae7/language/orion",
48+
urls = ["https://github.com/aspect-build/aspect-gazelle/archive/3b24c7fb6b280f756fdb4808ffd4af2e689bfae7.tar.gz"],
4949
)
5050

5151
bazel_dep(name = "aspect_gazelle_runner", version = "0.0.0")
5252
archive_override(
5353
module_name = "aspect_gazelle_runner",
54-
integrity = "sha256-+BPYRzEbYQkV6+PpOBhOgvQAgV+vv8nKRq8LK5P+PuU=",
54+
integrity = "sha256-AVtqWHZDYd2arPWInvEb+5Gz5G8IvNQ9Eir1+p9w2g0=",
5555
patch_strip = 2,
5656
patches = [
5757
"//patches:aspect-gazelle-runner.patch",
5858
],
59-
strip_prefix = "aspect-gazelle-8e32503a9ac1d2d690553e36b7215a0e8061642a/runner",
60-
urls = ["https://github.com/aspect-build/aspect-gazelle/archive/8e32503a9ac1d2d690553e36b7215a0e8061642a.tar.gz"],
59+
strip_prefix = "aspect-gazelle-3b24c7fb6b280f756fdb4808ffd4af2e689bfae7/runner",
60+
urls = ["https://github.com/aspect-build/aspect-gazelle/archive/3b24c7fb6b280f756fdb4808ffd4af2e689bfae7.tar.gz"],
6161
)
6262

6363
# Not direclty used but must be declared+overriden until aspect_gazelle_runner points to one published to BCR.
6464
bazel_dep(name = "aspect_gazelle_kotlin", version = "0.0.0")
6565
archive_override(
6666
module_name = "aspect_gazelle_kotlin",
67-
integrity = "sha256-+BPYRzEbYQkV6+PpOBhOgvQAgV+vv8nKRq8LK5P+PuU=",
68-
strip_prefix = "aspect-gazelle-8e32503a9ac1d2d690553e36b7215a0e8061642a/language/kotlin",
69-
urls = ["https://github.com/aspect-build/aspect-gazelle/archive/8e32503a9ac1d2d690553e36b7215a0e8061642a.tar.gz"],
67+
integrity = "sha256-AVtqWHZDYd2arPWInvEb+5Gz5G8IvNQ9Eir1+p9w2g0=",
68+
strip_prefix = "aspect-gazelle-3b24c7fb6b280f756fdb4808ffd4af2e689bfae7/language/kotlin",
69+
urls = ["https://github.com/aspect-build/aspect-gazelle/archive/3b24c7fb6b280f756fdb4808ffd4af2e689bfae7.tar.gz"],
7070
)
7171

7272
# Go modules

‎go.mod‎

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ go 1.24.5
55
require (
66
github.com/Masterminds/semver/v3 v3.4.0 // indirect
77
github.com/alphadose/haxmap v1.4.1
8-
github.com/aspect-build/aspect-gazelle/common v0.0.0-20251030042747-8e32503a9ac1
9-
github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251030042747-8e32503a9ac1
10-
github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251030042747-8e32503a9ac1
11-
github.com/bazelbuild/bazel-gazelle v0.46.0-rc2
8+
github.com/aspect-build/aspect-gazelle/common v0.0.0-20251031000201-3b24c7fb6b28
9+
github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251031000201-3b24c7fb6b28
10+
github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251031000201-3b24c7fb6b28
11+
github.com/bazelbuild/bazel-gazelle v0.46.0
1212
github.com/bazelbuild/bazelisk v1.27.0 // NOTE: keep vendored code in sync
1313
github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52
1414
github.com/bluekeyes/go-gitdiff v0.7.3
@@ -59,6 +59,14 @@ require (
5959
gotest.tools/v3 v3.5.1
6060
)
6161

62+
require (
63+
github.com/aspect-build/aspect-gazelle/language/js v0.0.0-20251007231102-88e4ec95608b // indirect
64+
github.com/aspect-build/aspect-gazelle/language/kotlin v0.0.0-20251007231102-88e4ec95608b // indirect
65+
github.com/bazel-contrib/rules_jvm v0.30.0 // indirect
66+
github.com/google/btree v1.1.3 // indirect
67+
github.com/msolo/jsonr v0.0.0-20231023064044-62fbfc3a0313 // indirect
68+
)
69+
6270
require (
6371
dario.cat/mergo v1.0.2 // indirect
6472
github.com/EngFlow/gazelle_cc v0.1.0 // indirect
@@ -160,7 +168,7 @@ require (
160168
github.com/yuin/gopher-lua v1.1.1 // indirect
161169
go.opentelemetry.io/auto/sdk v1.2.1 // indirect
162170
go.opentelemetry.io/otel/metric v1.38.0 // indirect
163-
go.starlark.net v0.0.0-20250906160240-bf296ed553ea // indirect
171+
go.starlark.net v0.0.0-20251029211736-7849196f18cf // indirect
164172
go.uber.org/atomic v1.9.0 // indirect
165173
go.uber.org/multierr v1.9.0 // indirect
166174
go.yaml.in/yaml/v3 v3.0.4 // indirect

‎go.sum‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,16 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
2727
github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
2828
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
2929
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
30-
github.com/aspect-build/aspect-gazelle/common v0.0.0-20251030042747-8e32503a9ac1 h1:ANjeT18fbpIrvDumfjikRi2tqCFzoHERW5M1p1TzJPI=
31-
github.com/aspect-build/aspect-gazelle/common v0.0.0-20251030042747-8e32503a9ac1/go.mod h1:G6awMFN6QlDY5yV9tUjTqGSlAKzd1SC/bBtPiiG/y48=
32-
github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251030042747-8e32503a9ac1 h1:nXzn575mQk9BClLPLiB/8zVK03iQYVah0+w4tKUoMsI=
33-
github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251030042747-8e32503a9ac1/go.mod h1:bVP8ioylRRmoxW1q1XexRb1RZcFY14+53ebToqDzIzw=
34-
github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251030042747-8e32503a9ac1 h1:vceqfFQBj+sSenkwz0yQyH1zTqmkLT8ieM6Vxo7pasQ=
35-
github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251030042747-8e32503a9ac1/go.mod h1:1tAv6P6NfvRO+no+cqgXaOAXGAqi/JLASdRMmqV4a8Y=
30+
github.com/aspect-build/aspect-gazelle/common v0.0.0-20251031000201-3b24c7fb6b28 h1:+Qa2sRp95WHdZkBoVvscfGQ4PjssBmsqBIr0z3GCSTY=
31+
github.com/aspect-build/aspect-gazelle/common v0.0.0-20251031000201-3b24c7fb6b28/go.mod h1:l9OOwXPoL7zYQheRplPikU04zxlDa+cTBucFxTlsapM=
32+
github.com/aspect-build/aspect-gazelle/language/js v0.0.0-20251007231102-88e4ec95608b h1:vuATFGAAYH51BjDs7mwQVjX9M8K3bZWlXHC9ZMD9NzU=
33+
github.com/aspect-build/aspect-gazelle/language/js v0.0.0-20251007231102-88e4ec95608b/go.mod h1:fy0EWFjJGq1F34BZ4Im0MVeLE7K95GRzR1hK/Ulx7KM=
34+
github.com/aspect-build/aspect-gazelle/language/kotlin v0.0.0-20251007231102-88e4ec95608b h1:nhucipu18c0u1pQBltXBgzIIMzrOA42Fh82pMy8APwE=
35+
github.com/aspect-build/aspect-gazelle/language/kotlin v0.0.0-20251007231102-88e4ec95608b/go.mod h1:EG9HPt++N4Icx3X9tYeKJ9uPLPZOyjT1NSwAb6LtuAc=
36+
github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251031000201-3b24c7fb6b28 h1:hisPQ7vg58Lj4+SV1UOOKsbWPPf9AmI40puSGJFPnz4=
37+
github.com/aspect-build/aspect-gazelle/language/orion v0.0.0-20251031000201-3b24c7fb6b28/go.mod h1:onRnU2eLXBcyMUjDP85WtrUbXSMHSmmjR76zoF981d4=
38+
github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251031000201-3b24c7fb6b28 h1:5myiqQvdwrbu8H0ebViI60gL+nS3xx2vH8jDwkCmzdo=
39+
github.com/aspect-build/aspect-gazelle/runner v0.0.0-20251031000201-3b24c7fb6b28/go.mod h1:XEMrq8FSxtF2BUoiSwFBPBZ8PqvgF6iOqnmOkqMCb70=
3640
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
3741
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
3842
github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
@@ -41,10 +45,12 @@ github.com/aymanbagabas/go-udiff v0.2.0 h1:TK0fH4MteXUDspT88n8CKzvK0X9O2xu9yQjWp
4145
github.com/aymanbagabas/go-udiff v0.2.0/go.mod h1:RE4Ex0qsGkTAJoQdQQCA0uG+nAzJO/pI/QwceO5fgrA=
4246
github.com/aymerick/douceur v0.2.0 h1:Mv+mAeH1Q+n9Fr+oyamOlAkUNPWPlA8PPGR0QAaYuPk=
4347
github.com/aymerick/douceur v0.2.0/go.mod h1:wlT5vV2O3h55X9m7iVYN0TBM0NH/MmbLnd30/FjWUq4=
48+
github.com/bazel-contrib/rules_jvm v0.30.0 h1:GSKDLgH7hi5dpOwmdhE3SJEQzVtsv31i2IvSUWIkP5Q=
49+
github.com/bazel-contrib/rules_jvm v0.30.0/go.mod h1:HxRDtmRlh/ErR+2QlVwYs4BcIrB248HeheKi5uyKeN4=
4450
github.com/bazel-contrib/rules_python/gazelle v0.0.0-20251012075144-43a5acf8cedf h1:HGT/ELJizYCYtTtyL4m9HAD0wYzuLBzDP3YYfk5N8Ow=
4551
github.com/bazel-contrib/rules_python/gazelle v0.0.0-20251012075144-43a5acf8cedf/go.mod h1:84dcq5fZ/hiQGnpjzH57+Xm7T6uwpPty1KPB7qzHDO0=
46-
github.com/bazelbuild/bazel-gazelle v0.46.0-rc2 h1:opKbd+Bj7ZKtlYJF1JqE9W4OVDvFEZogj2ncVtrLpOU=
47-
github.com/bazelbuild/bazel-gazelle v0.46.0-rc2/go.mod h1:8Ozf20jhv+in87nCUHdmUPPcVGTfKg/gotZ/hce3T+w=
52+
github.com/bazelbuild/bazel-gazelle v0.46.0 h1:kkpz+nQXdfMjwu3CT+Z/1pULi2uGrB/ExK9AD1pIl8A=
53+
github.com/bazelbuild/bazel-gazelle v0.46.0/go.mod h1:8Ozf20jhv+in87nCUHdmUPPcVGTfKg/gotZ/hce3T+w=
4854
github.com/bazelbuild/bazelisk v1.27.0 h1:X9m5b68QeLJm4JQLrJaFKDMCl91MFEG9zDtm+S+syLM=
4955
github.com/bazelbuild/bazelisk v1.27.0/go.mod h1:4QvGQZjg1BT9GTBh5eBTVBzTyigu3ZWA5FArOoOTq4g=
5056
github.com/bazelbuild/buildtools v0.0.0-20250930140053-2eb4fccefb52 h1:njQAmjTv/YHRm/0Lfv9DXHFZ4MdT2IA/RKHTnqZkgDw=
@@ -172,6 +178,8 @@ github.com/golang/mock v1.7.0-rc.1 h1:YojYx61/OLFsiv6Rw1Z96LpldJIy31o+UHmwAUMJ6/
172178
github.com/golang/mock v1.7.0-rc.1/go.mod h1:s42URUywIqd+OcERslBJvOjepvNymP31m3q8d/GkuRs=
173179
github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek=
174180
github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps=
181+
github.com/google/btree v1.1.3 h1:CVpQJjYgC4VbzxeGVHfvZrv1ctoYCAI8vbl07Fcxlyg=
182+
github.com/google/btree v1.1.3/go.mod h1:qOPhT0dTNdNzV6Z/lhRX0YXUafgPLFUh+gZMl761Gm4=
175183
github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
176184
github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
177185
github.com/google/go-cmp v0.5.9/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
@@ -262,6 +270,8 @@ github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4
262270
github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE=
263271
github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zxSIeXaQ=
264272
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
273+
github.com/msolo/jsonr v0.0.0-20231023064044-62fbfc3a0313 h1:A8w3/wSixa6RqN8bLYQ9mayk+d8xxq6jQCmlKs/jCRo=
274+
github.com/msolo/jsonr v0.0.0-20231023064044-62fbfc3a0313/go.mod h1:6qRblG2m4u2fk3x59GT4awRlwvZbnZ3P1RmFZrDjVwk=
265275
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
266276
github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
267277
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
@@ -380,8 +390,8 @@ go.opentelemetry.io/otel/sdk/metric v1.35.0 h1:1RriWBmCKgkeHEhM7a2uMjMUfP7MsOF5J
380390
go.opentelemetry.io/otel/sdk/metric v1.35.0/go.mod h1:is6XYCUMpcKi+ZsOvfluY5YstFnhW0BidkR+gL+qN+w=
381391
go.opentelemetry.io/otel/trace v1.38.0 h1:Fxk5bKrDZJUH+AMyyIXGcFAPah0oRcT+LuNtJrmcNLE=
382392
go.opentelemetry.io/otel/trace v1.38.0/go.mod h1:j1P9ivuFsTceSWe1oY+EeW3sc+Pp42sO++GHkg4wwhs=
383-
go.starlark.net v0.0.0-20250906160240-bf296ed553ea h1:Rq4H4YdaOlmkqVGG+COlYFyrG/FwfB8tQa5i6mtcSe4=
384-
go.starlark.net v0.0.0-20250906160240-bf296ed553ea/go.mod h1:YKMCv9b1WrfWmeqdV5MAuEHWsu5iC+fe6kYl2sQjdI8=
393+
go.starlark.net v0.0.0-20251029211736-7849196f18cf h1:iyRnW9PWEZDYnIKzNjW3K9Xa+/o19k/cLLwIkKGDEYg=
394+
go.starlark.net v0.0.0-20251029211736-7849196f18cf/go.mod h1:YKMCv9b1WrfWmeqdV5MAuEHWsu5iC+fe6kYl2sQjdI8=
385395
go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
386396
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
387397
go.uber.org/automaxprocs v1.6.0 h1:O3y2/QNTOdbF+e/dpXNNW7Rx2hZ4sTIPyybbxyNqTUs=

‎pkg/aspect/run/ibazel.go‎

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright 2023 Aspect Build Systems, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package run
218

319
import (
@@ -56,7 +72,7 @@ func (ib *IBazelProtocol) Env() []string {
5672
func (ib *IBazelProtocol) Serve(ctx context.Context) error {
5773
return nil
5874
}
59-
func (ib *IBazelProtocol) WaitForConnection() <-chan int {
75+
func (ib *IBazelProtocol) WaitForConnection() <-chan ibp.ProtocolVersion {
6076
return nil
6177
}
6278

@@ -165,7 +181,7 @@ func (ib *RestartBazelProtocol) Address() string {
165181
func (ib *RestartBazelProtocol) Env() []string {
166182
return []string{}
167183
}
168-
func (ib *RestartBazelProtocol) WaitForConnection() <-chan int {
184+
func (ib *RestartBazelProtocol) WaitForConnection() <-chan ibp.ProtocolVersion {
169185
return nil
170186
}
171187

0 commit comments

Comments
 (0)