Merge remote-tracking branch 'upstream/master'

Author: pcj

closure/compiler/closure_js_library.bzl

@@ -136,7 +136,6 @@ def _closure_js_library_impl(
         suppress = suppress + [
             "analyzerChecks",
             "deprecated",
-            "legacyGoogScopeRequire",
             "lintChecks",
             "missingOverride",
             "reportUnknownTypes",

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",
     ],
 )
 

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",

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(

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",

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();
   }
 

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",
     ],
 )

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",

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",
     ],
 )

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",
     ],
 )