From 6681526cc58df115624de0e41e0843b697d620fa Mon Sep 17 00:00:00 2001 From: Simon Stewart Date: Tue, 22 Oct 2024 18:12:08 +0100 Subject: [PATCH] Bump ruleset deps from the BCR (#299) --- MODULE.bazel | 24 +++---- examples/workspace-based/WORKSPACE | 15 +--- .../examples/tests_and_lints/ExampleTest.java | 8 +++ .../gazelle/private/servermanager/BUILD.bazel | 2 +- java/private/contrib_rules_jvm_deps.zip | Bin 211946 -> 234450 bytes repositories.bzl | 68 ++++++++---------- setup.bzl | 2 + 7 files changed, 53 insertions(+), 66 deletions(-) create mode 100644 examples/workspace-based/src/test/com/github/bazel_contrib/contrib_rules_jvm/examples/tests_and_lints/ExampleTest.java diff --git a/MODULE.bazel b/MODULE.bazel index 8bc69be3..7b206cec 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -13,30 +13,24 @@ PROTOBUF_JAVA_VERSION = "3.{}".format(PROTOBUF_VERSION) bazel_dep( name = "apple_rules_lint", - version = "0.3.2", + version = "0.4.0", ) bazel_dep( name = "bazel_skylib", - version = "1.4.2", + version = "1.7.1", ) bazel_dep( name = "bazel_skylib_gazelle_plugin", - version = "1.4.2", + version = "1.7.1", dev_dependency = True, ) bazel_dep( name = "gazelle", - version = "0.36.0", + version = "0.39.1", repo_name = "bazel_gazelle", ) -git_override( - module_name = "gazelle", - commit = "ba2ce367a545e0bdd74a7abca40ef5e0a0cb8dcb", - remote = "https://github.com/bazelbuild/bazel-gazelle.git", -) - bazel_dep( name = "protobuf", version = "27.2", @@ -44,20 +38,20 @@ bazel_dep( ) bazel_dep( name = "rules_cc", - version = "0.0.9", + version = "0.0.11", ) bazel_dep( name = "rules_go", - version = "0.48.1", + version = "0.50.1", repo_name = "io_bazel_rules_go", ) bazel_dep( name = "rules_java", - version = "6.1.1", + version = "7.12.1", ) bazel_dep( name = "rules_jvm_external", - version = "6.2", + version = "6.4", ) bazel_dep( name = "rules_proto", @@ -66,7 +60,7 @@ bazel_dep( bazel_dep( name = "stardoc", - version = "0.5.6", + version = "0.7.1", dev_dependency = True, repo_name = "io_bazel_stardoc", ) diff --git a/examples/workspace-based/WORKSPACE b/examples/workspace-based/WORKSPACE index 093db4d9..f161438c 100644 --- a/examples/workspace-based/WORKSPACE +++ b/examples/workspace-based/WORKSPACE @@ -7,16 +7,9 @@ local_repository( path = "../..", ) -http_archive( - name = "apple_rules_lint", - sha256 = "483ea03d73d5fb33275d029da8d36811243fc32dfa4dc73a43acbb6f4b1af621", - strip_prefix = "apple_rules_lint-0.4.0", - url = "https://github.com/apple/apple_rules_lint/releases/download/0.4.0/apple_rules_lint-0.4.0.tar.gz", -) - -load("@apple_rules_lint//lint:repositories.bzl", "lint_deps") +load("@contrib_rules_jvm//:repositories.bzl", "contrib_rules_jvm_deps", "contrib_rules_jvm_gazelle_deps") -lint_deps() +contrib_rules_jvm_deps() load("@apple_rules_lint//lint:setup.bzl", "lint_setup") @@ -26,10 +19,6 @@ lint_setup({ "java-spotbugs": "@contrib_rules_jvm//java:spotbugs-default-config", }) -load("@contrib_rules_jvm//:repositories.bzl", "contrib_rules_jvm_deps", "contrib_rules_jvm_gazelle_deps") - -contrib_rules_jvm_deps() - load("@contrib_rules_jvm//:setup.bzl", "contrib_rules_jvm_setup") contrib_rules_jvm_setup() diff --git a/examples/workspace-based/src/test/com/github/bazel_contrib/contrib_rules_jvm/examples/tests_and_lints/ExampleTest.java b/examples/workspace-based/src/test/com/github/bazel_contrib/contrib_rules_jvm/examples/tests_and_lints/ExampleTest.java new file mode 100644 index 00000000..e6ff0e3d --- /dev/null +++ b/examples/workspace-based/src/test/com/github/bazel_contrib/contrib_rules_jvm/examples/tests_and_lints/ExampleTest.java @@ -0,0 +1,8 @@ +package com.github.bazel_contrib.contrib_rules_jvm.examples.tests_and_lints; + +import org.junit.jupiter.api.Test; + +public class ExampleTest { + @Test + public void passes() {} +} diff --git a/java/gazelle/private/servermanager/BUILD.bazel b/java/gazelle/private/servermanager/BUILD.bazel index f8420e9f..63f03aef 100644 --- a/java/gazelle/private/servermanager/BUILD.bazel +++ b/java/gazelle/private/servermanager/BUILD.bazel @@ -9,6 +9,6 @@ go_library( deps = [ "//java/gazelle/private/javaparser/proto/gazelle/java/javaparser/v0:javaparser", "@io_bazel_rules_go//go/runfiles:go_default_library", - "@org_golang_google_grpc//:go_default_library", + "@org_golang_google_grpc//:grpc", ], ) diff --git a/java/private/contrib_rules_jvm_deps.zip b/java/private/contrib_rules_jvm_deps.zip index 773291cb5fefd83ac32763c04f11f028f8c0b370..060352001dc19d2059ea205962c2f1526aa4ace0 100644 GIT binary patch delta 13341 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 delta 6036 zcmZu#d0f_Iw(p!rUf^Y4#Es28FR}E^F8}H&+m6`Z}1QI z0xRExwgl%-59aTQ48}(ygUP=y{7jSx(NvNMyD7LI45Ascp&!pl0sy*m7BcC_L z2s|r+undBEYZ+_>n=rQ=CQ0OlFhf7;=)(`oAcTz?8#3;xtl1MT>24WGL0%UuV0(SW-lWu(?a>f z-7o_vaX$=nlR2oa5Yl+tUijK823+``umPy<5RB!tcfjswqi1|6<&gBu!GmzhWui_> zA7b%IS#{)Z>s(a4?Oiw_4ShrgkQwRy@54w-i|%~C12?f`omL-n&8u@CfRFn)kV-xP zUp*zm$$vQtuK&t;K>c}zT2pnq5UPq5~4v| z@fYy5U|jN7*a$TC?~qHX5eD#rzd^9gP&u>jZ}vs04I#2HRDS_{x!WaJY69Eq#t|+$Yh2#= z20EY@zTgT3aPwuD1=RJQFxbo!*IqTcz(acGdkEx`?_r^3BQ^aK`q)OAtTZG~#`x%K zaNZ*oK@B%#JO|x?mpxK`difYnp_*M8M}6-~y=`fMj?}qXM%=9yd2GE2ZX?6 z*uNm#sv)s$EZ5zJw>_$ybmR_%(4e0nny24^sU|#IS76JI2IEujx4Gxz|K_ahr{&H3!&>eNRDho62%4Ma9Y(Sb3np8f(j8FG!`(> zAdaIJU-W(dK1#L?vkWN*RU#S{E5=PUiFM^9Urto`jBT4xIO#%Bf)-*b{dl3+81sPG(bcD*EcI z(jbZEngo<3A!pM_V8P@}kwgS%;vnNOoD-8V#3K|g5fXuwJR}wKY^l*bF_2sPW3dgZ z$UqxbrPqHQO=Uw-)1QY3Yll23n9+lAB(KfDlODJay`F;s7IhU}%Em6da47Z_{tTQ+ zat6|x^T{5dn}b=C^ckD`Ar=owNled>fZtkr08JbyFS|DE2PAH zjO3|f@e?!DQFMGF`stfJ`?A!&t3|mn(>%rm8+-Q zg6I!XID;xC;G;ZrJjR#-HYj?TbwHIx*nz(+!p}TpQ~zI%Xx=;tKX;4!Q{8m*rI2C_ zr}f1WNOJ}>Ou{gh|NPBRL{Zx`EcRyO<`R6E z&ZLSmjN;|9upa2>0-WQXWJ`3)bAg;WSA>juGl8+X<(VknKOfO`pR6mx$wF%G5gC6w zJ=os5;W;M>wl9@CWv*vDgZpIZzks=B`ncdZY;U1CYca|;T>TOzSeZ?H5pNq;hIIYj z3z7WY?*N30CrXwxnkG&QyOvkB#rH}PEy z^=4JPH-^7hi?VHv2pD`F`O|f{*XFB!3vKK$ieH8PR9cOWKdr}vb{@PgsS4)4TX2&p zGs4T*{oAFeR)2-VsAebjqFdXr#v?`{JH?gPF3Lg4dJNzXcHoP)*8E*=FIc>I!pk^4 z^wmImeFt`D|Gma0F~X?#uQ0M?IL$x2jU`@iiVc%>J#xP>Sq&(SJ!m+@f|c&{xZH9G z_t<3dtGwc^CtVJrjkU7X>JDR9s=Fe;TK-EK-6PuTJ);gy@-9craxo1V@+avS4~#-L zphGvUa?%?YCF%0yjEiLP_$l@nWU{ZVhd)KD)JZO3rEZFhaO9fTCK zQuKw(p{C`!zPcA3x`KHG4c-L$;ObB_lJdjBOHQD?A)C=`tV!_XkoW#K26_3R<7>j{ zmqXZHe)w_gM<}nUrd0l#WK)WzO!K`2=+Y+`Mk{wnn&p?1U;YGF*-qCrN+jH+t!G^c zwnN>B@wDZ<%+&d(ZHu|)jJqLf*V>`79Hr=UQb%oPT`eKVPTYJBx7%7$zQmqhT8>=_ zv9!ql-3%>uNg86hWoK|QIRls#W{H8Iu?MK{Y!lJ13E_T&PTLSrN3l@5) zLiHK>um5d4>cRCP!HlA9cQAk|{?`?9nHmN-ip&0GjJCoD;>^1Vsvj@9hY>)p#H%56 z?Y?a8rT2~G`~ND_$vCG&O8HXR&v?(m+RWrdi@2!@d9r42JhTYxyEvJ$_EyxjWlYFVzPetkn-v-g$Ky}}vKm;PG zHbhB(2CEN%rbMcIj}&KwsW>lsE{srL03Gb8MwuYq(%yZ3ItIG%i4LmX^}6-@PO3o6 zJe;7?s4iA@;x3(4v`IFB%3~p5U5s*YX|(#%OCXlwpNhP!7xtHy1V3G>seTk~XwL7UkSq+eBoSUq2T$rv9MJcJ0v}gLMl`bb9 zrm9Sru6b!nHu;@lDvL`87ly*&?O0f3-fm~G~FV4eMJ{so}-JD(q zvluL8FQ6x>ag=gU_GsbUI!ax&ICWfoe~V2VJ!}KZpHO~!;W2;yyg=Qsb;tj^GQLQe ztzg821tfP)llV}f@~7kDg}Bpr)#3`UvqSjqm_I#ac$v(uyl&Gv4ds{*LBL|w63BWJn_WS?nD?t%i$ zWVslPx6>|1k$n0o^|E;srDOhPTsy>pIGR_c%Jr&i!E|q~jFIA5>X3(xw#^X@yUWGO z&^b!Rpzuaf^#T=R#3_c39gwwSi~tf-e(}ih!TGA(MlV}rqggbSdh7}0&E@I^x8t>c z&$2G7^8KPKuY5)=vc3P|WLJLhoT>q;T_(ymFII->W~;R>R_$!m!&8BL=0znRFa(ul zWxsa0wArsqR4CneNwt{P@qwl4j~0_Yc-pEw7Tn_&4IijfyXD)`DrwZMjZV>H