From 4f635b90a37cc491df3aee71514db75f4cfb6cc5 Mon Sep 17 00:00:00 2001 From: Laura Harker Date: Mon, 22 Sep 2025 16:08:40 -0400 Subject: [PATCH 1/6] Migrate away from deprecated ScopedAliases pass constructor (#667) --- java/com/google/javascript/jscomp/JsCheckerPassConfig.java | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/java/com/google/javascript/jscomp/JsCheckerPassConfig.java b/java/com/google/javascript/jscomp/JsCheckerPassConfig.java index efb152493e..30f5889227 100644 --- a/java/com/google/javascript/jscomp/JsCheckerPassConfig.java +++ b/java/com/google/javascript/jscomp/JsCheckerPassConfig.java @@ -102,11 +102,7 @@ private PassFactory scopedAliases() { return PassFactory.builder() .setName("scopedAliases") .setInternalFactory( - (compiler) -> - new ScopedAliases( - compiler, - /*preprocessorSymbolTable=*/ null, - compiler.getOptions().getAliasTransformationHandler())) + (compiler) -> ScopedAliases.builder(compiler).build()) .build(); } From b8735ca629a4361c3baafccb5c2234a504875291 Mon Sep 17 00:00:00 2001 From: Goktug Gokdogan Date: Tue, 23 Sep 2025 01:10:20 -0700 Subject: [PATCH 2/6] Add missing rules_java loads (#670) --- closure/stylesheets/BUILD | 1 + javatests/io/bazel/rules/closure/webfiles/BUILD | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/closure/stylesheets/BUILD b/closure/stylesheets/BUILD index de317e56fb..e324438d7a 100644 --- a/closure/stylesheets/BUILD +++ b/closure/stylesheets/BUILD @@ -13,6 +13,7 @@ # limitations under the License. load("@bazel_skylib//:bzl_library.bzl", "bzl_library") +load("@rules_java//java:defs.bzl", "java_binary") package(default_visibility = ["//visibility:public"]) diff --git a/javatests/io/bazel/rules/closure/webfiles/BUILD b/javatests/io/bazel/rules/closure/webfiles/BUILD index 97cdf2aacc..2095b7852d 100644 --- a/javatests/io/bazel/rules/closure/webfiles/BUILD +++ b/javatests/io/bazel/rules/closure/webfiles/BUILD @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -load("@rules_java//java:defs.bzl", "java_test") +load("@rules_java//java:defs.bzl", "java_library", "java_test") licenses(["notice"]) From e687d2432578ef2bc2f22572a599438987f4fb43 Mon Sep 17 00:00:00 2001 From: Goktug Gokdogan Date: Tue, 23 Sep 2025 01:14:22 -0700 Subject: [PATCH 3/6] Remove no-op diagnostic groups (#669) Co-authored-by: Julien Dramaix --- closure/compiler/closure_js_library.bzl | 1 - java/com/google/javascript/jscomp/Diagnostics.java | 2 -- java/io/bazel/rules/closure/webfiles/BUILD | 4 +--- 3 files changed, 1 insertion(+), 6 deletions(-) diff --git a/closure/compiler/closure_js_library.bzl b/closure/compiler/closure_js_library.bzl index 0a6d1b7ad2..e2165aa4de 100644 --- a/closure/compiler/closure_js_library.bzl +++ b/closure/compiler/closure_js_library.bzl @@ -133,7 +133,6 @@ def _closure_js_library_impl( suppress = suppress + [ "analyzerChecks", "deprecated", - "legacyGoogScopeRequire", "lintChecks", "missingOverride", "reportUnknownTypes", diff --git a/java/com/google/javascript/jscomp/Diagnostics.java b/java/com/google/javascript/jscomp/Diagnostics.java index b3380076d5..26c27c967a 100644 --- a/java/com/google/javascript/jscomp/Diagnostics.java +++ b/java/com/google/javascript/jscomp/Diagnostics.java @@ -90,7 +90,6 @@ final class Diagnostics { "globalThis", "invalidCasts", "lateProvide", - "legacyGoogScopeRequire", "lintChecks", "messageConventions", "misplacedTypeAnnotation", @@ -118,7 +117,6 @@ final class Diagnostics { "unknownDefines", "untranspilableFeatures", "unusedLocalVariables", - "unusedPrivateMembers", "useOfGoogProvide", "uselessCode", "visibility", diff --git a/java/io/bazel/rules/closure/webfiles/BUILD b/java/io/bazel/rules/closure/webfiles/BUILD index 95d1a70513..0f30b8129e 100644 --- a/java/io/bazel/rules/closure/webfiles/BUILD +++ b/java/io/bazel/rules/closure/webfiles/BUILD @@ -19,9 +19,7 @@ licenses(["notice"]) java_library( name = "webfiles", - srcs = glob( - ["*.java"], - ), + srcs = glob(["*.java"]), visibility = ["//visibility:public"], deps = [ ":build_info_java_proto", From 6de69f0c02cd2c255c649972aa33c3a115e326c3 Mon Sep 17 00:00:00 2001 From: Goktug Gokdogan Date: Tue, 23 Sep 2025 01:24:05 -0700 Subject: [PATCH 4/6] Use a consisten jsr305 target (#668) Co-authored-by: Julien Dramaix --- java/io/bazel/rules/closure/webfiles/compiler/BUILD | 2 +- java/io/bazel/rules/closure/worker/BUILD | 2 +- javatests/io/bazel/rules/closure/http/BUILD | 2 +- javatests/io/bazel/rules/closure/worker/BUILD | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/java/io/bazel/rules/closure/webfiles/compiler/BUILD b/java/io/bazel/rules/closure/webfiles/compiler/BUILD index 25aa5cd348..ba35695871 100644 --- a/java/io/bazel/rules/closure/webfiles/compiler/BUILD +++ b/java/io/bazel/rules/closure/webfiles/compiler/BUILD @@ -23,7 +23,7 @@ java_library( deps = [ "@google_bazel_common//third_party/java/dagger", "@google_bazel_common//third_party/java/guava", + "@google_bazel_common//third_party/java/jsr330_inject", "@maven//:com_google_closure_stylesheets_closure_stylesheets", - "@maven//:javax_inject_javax_inject", ], ) diff --git a/java/io/bazel/rules/closure/worker/BUILD b/java/io/bazel/rules/closure/worker/BUILD index a4b873b1e5..24a505dd2d 100644 --- a/java/io/bazel/rules/closure/worker/BUILD +++ b/java/io/bazel/rules/closure/worker/BUILD @@ -31,7 +31,7 @@ java_library( "@google_bazel_common//third_party/java/auto:value", "@google_bazel_common//third_party/java/dagger", "@google_bazel_common//third_party/java/guava", - "@maven//:javax_inject_javax_inject", + "@google_bazel_common//third_party/java/jsr330_inject", ], ) diff --git a/javatests/io/bazel/rules/closure/http/BUILD b/javatests/io/bazel/rules/closure/http/BUILD index edf2431bc5..a0fff0f0f7 100644 --- a/javatests/io/bazel/rules/closure/http/BUILD +++ b/javatests/io/bazel/rules/closure/http/BUILD @@ -28,9 +28,9 @@ java_test( "@google_bazel_common//third_party/java/dagger", "@google_bazel_common//third_party/java/guava", "@google_bazel_common//third_party/java/guava:testlib", + "@google_bazel_common//third_party/java/jsr330_inject", "@google_bazel_common//third_party/java/junit", "@google_bazel_common//third_party/java/truth", "@maven//:com_google_dagger_dagger_producers", - "@maven//:javax_inject_javax_inject", ], ) diff --git a/javatests/io/bazel/rules/closure/worker/BUILD b/javatests/io/bazel/rules/closure/worker/BUILD index afd91e619e..540156c498 100644 --- a/javatests/io/bazel/rules/closure/worker/BUILD +++ b/javatests/io/bazel/rules/closure/worker/BUILD @@ -28,10 +28,10 @@ java_test( "@google_bazel_common//third_party/java/dagger", "@google_bazel_common//third_party/java/guava", "@google_bazel_common//third_party/java/jsr305_annotations", + "@google_bazel_common//third_party/java/jsr330_inject", "@google_bazel_common//third_party/java/junit", "@google_bazel_common//third_party/java/mockito", "@google_bazel_common//third_party/java/truth", "@maven//:com_google_jimfs_jimfs", - "@maven//:javax_inject_javax_inject", ], ) From e96aeeffe40298cef875bef727c4bd62abd266a7 Mon Sep 17 00:00:00 2001 From: Goktug Gokdogan Date: Tue, 23 Sep 2025 02:08:15 -0700 Subject: [PATCH 5/6] Remove custom repo names for rules_webtesting (#671) Co-authored-by: Julien Dramaix --- MODULE.bazel | 2 -- closure/testing/BUILD | 2 +- closure/testing/test/BUILD | 4 ++-- closure/testing/webdriver_test.bzl | 2 +- java/io/bazel/rules/closure/testing/BUILD | 2 +- 5 files changed, 5 insertions(+), 7 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index d3627769a9..a795b4e314 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -33,13 +33,11 @@ bazel_dep( bazel_dep( name = "rules_webtesting", version = "0.4.1", - repo_name = "io_bazel_rules_webtesting", ) bazel_dep( name = "rules_web_testing_java", version = "0.4.1", - repo_name = "io_rules_web_testing_java", ) ##### Java dependencies ##### diff --git a/closure/testing/BUILD b/closure/testing/BUILD index 04b93c5a21..8df8076777 100644 --- a/closure/testing/BUILD +++ b/closure/testing/BUILD @@ -61,7 +61,7 @@ bzl_library( srcs = ["webdriver_test.bzl"], deps = [ "//closure:web_library_bzl", - "@io_bazel_rules_webtesting//web:web", + "@rules_webtesting//web:web", ], ) diff --git a/closure/testing/test/BUILD b/closure/testing/test/BUILD index 28375c81e8..dfb1ed3454 100644 --- a/closure/testing/test/BUILD +++ b/closure/testing/test/BUILD @@ -118,7 +118,7 @@ closure_js_test( name = "simple_webtest_test", timeout = "short", srcs = ["simple_test.js"], - browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"], + browsers = ["@rules_webtesting//browsers:chromium-local"], tags = [ "local", "manual", @@ -133,7 +133,7 @@ closure_js_test( name = "arithmetic_module_webtest_test", timeout = "short", srcs = ["arithmetic_module_test.js"], - browsers = ["@io_bazel_rules_webtesting//browsers:chromium-local"], + browsers = ["@rules_webtesting//browsers:chromium-local"], entry_points = ["goog:arithmetic_module_test"], tags = [ "local", diff --git a/closure/testing/webdriver_test.bzl b/closure/testing/webdriver_test.bzl index 3e652e0f57..5ccc281c85 100644 --- a/closure/testing/webdriver_test.bzl +++ b/closure/testing/webdriver_test.bzl @@ -14,7 +14,7 @@ """Macro for running webtest with a test driver.""" -load("@io_bazel_rules_webtesting//web:web.bzl", "web_test", "web_test_suite") +load("@rules_webtesting//web:web.bzl", "web_test", "web_test_suite") load("//closure:webfiles/web_library.bzl", "web_library") def webdriver_test( diff --git a/java/io/bazel/rules/closure/testing/BUILD b/java/io/bazel/rules/closure/testing/BUILD index a07a322d01..9841c47f67 100644 --- a/java/io/bazel/rules/closure/testing/BUILD +++ b/java/io/bazel/rules/closure/testing/BUILD @@ -31,6 +31,6 @@ java_binary( "@maven//:org_seleniumhq_selenium_selenium_api", "@maven//:org_seleniumhq_selenium_selenium_remote_driver", "@maven//:org_seleniumhq_selenium_selenium_support", - "@io_rules_web_testing_java//java/com/google/testing/web", + "@rules_web_testing_java//java/com/google/testing/web", ], ) From 327c568e7aa051feffdc98a5bcf961495fedded0 Mon Sep 17 00:00:00 2001 From: Paul Johnston Date: Mon, 6 Oct 2025 16:34:59 -0600 Subject: [PATCH 6/6] Remove repo_name(s) --- MODULE.bazel | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index a189522b6f..c58a00efb4 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -21,8 +21,8 @@ bazel_dep(name = "rules_jvm_external", version = "6.8") bazel_dep(name = "rules_proto", version = "7.1.0") bazel_dep(name = "rules_python", version = "1.5.3") bazel_dep(name = "rules_tsickle", version = "1.0.0") -bazel_dep(name = "rules_web_testing_java", version = "0.4.1", repo_name = "io_rules_web_testing_java") -bazel_dep(name = "rules_webtesting", version = "0.4.1", repo_name = "io_bazel_rules_webtesting") +bazel_dep(name = "rules_web_testing_java", version = "0.4.1") +bazel_dep(name = "rules_webtesting", version = "0.4.1") # ------------------------------------------------------------------- # Overrides