From 495c2fec60c217cef033c59e815dac801036b25b Mon Sep 17 00:00:00 2001 From: Borja Lorente Date: Tue, 4 Jun 2024 17:35:24 +0100 Subject: [PATCH 01/17] build: Upgrade Gazelle versions (#6461) To pick up some compatibility fixes with Bzlmod --- WORKSPACE.bzlmod | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index d3d7b96b807..847782a87d3 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -876,10 +876,10 @@ register_toolchains("//:custom_java_17_toolchain_definition") # Dependency needed for Go test library http_archive( name = "bazel_gazelle", - sha256 = "29218f8e0cebe583643cbf93cae6f971be8a2484cdcfa1e45057658df8d54002", + sha256 = "d76bf7a60fd8b050444090dfa2837a4eaf9829e1165618ee35dceca5cbdf58d5", urls = [ - "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz", - "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz", + "https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz", + "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.37.0/bazel-gazelle-v0.37.0.tar.gz", ], ) @@ -903,6 +903,6 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe go_rules_dependencies() -go_register_toolchains(version = "1.19.3") +go_register_toolchains(version = "1.20.5") gazelle_dependencies(go_repository_default_config = "//:WORKSPACE.bzlmod") From e94d3d0a92ad1b5b65a0ccee4008cf3466ae26ab Mon Sep 17 00:00:00 2001 From: Borja Lorente Date: Tue, 4 Jun 2024 19:58:57 +0100 Subject: [PATCH 02/17] fix: Default to project name to workspace name instead of root directory (#6458) --- .../idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java b/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java index a4174cb65ee..02eaecbfa0c 100644 --- a/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java +++ b/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeEditProjectViewControl.java @@ -315,7 +315,7 @@ private void updateDefaultProjectNameUiState() { branchDefaultNameOption.setEnabled(workspaceData.branchName() != null); importDirectoryDefaultNameOption.setEnabled(projectViewOption.getImportDirectory() != null); - InferDefaultNameMode inferDefaultNameMode = InferDefaultNameMode.FromImportDirectory; + InferDefaultNameMode inferDefaultNameMode = InferDefaultNameMode.FromWorkspace; try { String lastModeString = PropertiesComponent.getInstance().getValue(LAST_WORKSPACE_MODE_PROPERTY); From b7a40e311903f4e918491efb1a1a0e97627f6e6f Mon Sep 17 00:00:00 2001 From: Tanishk Tyagi <144092358+tanishktyagii@users.noreply.github.com> Date: Wed, 5 Jun 2024 11:46:48 +0530 Subject: [PATCH 03/17] Update CHANGELOG for v2024.06.04 (#6465) * Update CHANGELOG for v2024.06.04 --- CHANGELOG | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGELOG b/CHANGELOG index f36505fc53b..3abe6943d2d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,10 @@ +v2024.06.04 +=========== +* feat: Support JetBrains IDEs 2024.2 #6434 +* feat: Editor notification on bazel files if the project is not imported #6153 +* perf: perf: Pass --override_repository flag to all commands for faster analysis phase #6453 +* fix: Default to project name to workspace name instead of root directory #6458 + v2024.05.21 =========== * Plugin aspect now depends on @rules_java. If this breaks you, please update your @rules_java version to 5.3.5 or later. From b890a76d80d68a20311c070bdb56703548f37a07 Mon Sep 17 00:00:00 2001 From: Borja Lorente Date: Wed, 5 Jun 2024 10:23:42 +0100 Subject: [PATCH 04/17] fix: Rely on the bazel zipper instead of zip (#6462) --- intellij_platform_sdk/build_defs.bzl | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/intellij_platform_sdk/build_defs.bzl b/intellij_platform_sdk/build_defs.bzl index e7ee71cef83..58447694d46 100644 --- a/intellij_platform_sdk/build_defs.bzl +++ b/intellij_platform_sdk/build_defs.bzl @@ -618,8 +618,26 @@ def no_mockito_extensions(name, jars, **kwargs): cmd = """ cp "$<" "$@" chmod u+w "$@" - zip -d "$@" mockito-extensions/* + tmpdir=$$(mktemp -d) + zipper="$$(pwd)/$(execpath @bazel_tools//tools/zip:zipper)" + "$$zipper" x "$@" -d ".out" + mv ".out" "$$tmpdir" + + pushd "$$tmpdir/.out" >/dev/null + rm -fr "mockito-extensions" + + # We store the results from `find` in a file to deal with filenames with spaces + files_to_tar_file=$$(mktemp) + find . -type f | sed 's:^./::' > "$${files_to_tar_file}" + IFS="\n" read -r -d "" -a files_to_tar < "$${files_to_tar_file}" || true + + "$$zipper" cC "../out.jar" "$${files_to_tar[@]}" + popd + + cp "$$tmpdir/out.jar" "$@" + chmod u+rw "$@" """, + tools = ["@bazel_tools//tools/zip:zipper"], ) output_jars.append(output_jar_name) java_import( From 37f515bf05ecc4ea6197bcefe45a52edd3d6aeee Mon Sep 17 00:00:00 2001 From: Borja Lorente Date: Wed, 5 Jun 2024 10:40:15 +0100 Subject: [PATCH 05/17] fix: Mark saveAllFiles as a WriteAction (#6459) --- base/src/com/google/idea/blaze/base/util/SaveUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/com/google/idea/blaze/base/util/SaveUtil.java b/base/src/com/google/idea/blaze/base/util/SaveUtil.java index 940481e8f19..63a9852f0f6 100644 --- a/base/src/com/google/idea/blaze/base/util/SaveUtil.java +++ b/base/src/com/google/idea/blaze/base/util/SaveUtil.java @@ -21,7 +21,7 @@ /** Utility for saving all files. */ public class SaveUtil { public static void saveAllFiles() { - Transactions.submitTransactionAndWait( + Transactions.submitWriteActionTransactionAndWait( () -> FileDocumentManager.getInstance().saveAllDocuments()); } } From ff5d037c0feadf8fc93ddbc0c40eece9cd009d5d Mon Sep 17 00:00:00 2001 From: Borja Lorente Date: Thu, 6 Jun 2024 09:42:02 +0100 Subject: [PATCH 06/17] fix(coverage): Account for SHA in lcov DA parsing (#6463) --- .../java/run/coverage/BlazeCoverageData.java | 12 ++++++---- .../run/coverage/BlazeCoverageDataTest.java | 24 +++++++++++++++++++ 2 files changed, 32 insertions(+), 4 deletions(-) diff --git a/java/src/com/google/idea/blaze/java/run/coverage/BlazeCoverageData.java b/java/src/com/google/idea/blaze/java/run/coverage/BlazeCoverageData.java index 594af88f6c3..30da50bbf8a 100644 --- a/java/src/com/google/idea/blaze/java/run/coverage/BlazeCoverageData.java +++ b/java/src/com/google/idea/blaze/java/run/coverage/BlazeCoverageData.java @@ -82,12 +82,16 @@ private static TIntIntHashMap parseHits(BufferedReader reader) throws IOExceptio return hits; } if (line.startsWith(DA)) { - // DA:line,hits - int comma = line.indexOf(','); + // DA:line,hits,sha + String[] segments = line.substring(DA.length()).split(","); + if (segments.length < 2) { + logger.warn(String.format("Cannot parse LCOV line: Expected entry to have format DA:,, was: %s", line)); + continue; + } try { hits.put( - Integer.parseInt(line.substring(DA.length(), comma)), - Integer.parseInt(line.substring(comma + 1))); + Integer.parseInt(segments[0]), + Integer.parseInt(segments[1])); } catch (NumberFormatException e) { logger.warn("Cannot parse LCOV line: " + line, e); } diff --git a/java/tests/unittests/com/google/idea/blaze/java/run/coverage/BlazeCoverageDataTest.java b/java/tests/unittests/com/google/idea/blaze/java/run/coverage/BlazeCoverageDataTest.java index 20d26c1c2d7..bf3784506fd 100644 --- a/java/tests/unittests/com/google/idea/blaze/java/run/coverage/BlazeCoverageDataTest.java +++ b/java/tests/unittests/com/google/idea/blaze/java/run/coverage/BlazeCoverageDataTest.java @@ -81,6 +81,30 @@ public void testEmptyFilesIgnored() throws IOException { assertThat(data.perFileData.keySet()).containsExactly("path/to/another/file.txt"); } + /** + * Some test runners, such as the one for `py_test` in rules_python, append extra data to DA entries. + * This test data is taken from a run of one such `py_test`. + * @throws IOException + */ + @Test + public void testDALinesWithShaCanBeParsed() throws IOException { + BlazeCoverageData data = + BlazeCoverageData.parse( + inputStream( + "SF:path/to/file.txt", + "DA:1,1,CjTuYq8+gnNfbQNgi09Ocg", + "DA:40,1,E/tvV9JPVDhEcTCkgrwOFw", + "DA:42,1,SZ/sLwIPxdnoU2xnoUB7pg", + "end_of_record" + )); + + assertThat(data.perFileData).hasSize(1); + FileData fileData = data.perFileData.get("path/to/file.txt"); + assertThat(fileData).isNotNull(); + assertThat(fileData.source).isEqualTo("path/to/file.txt"); + assertThat(toMap(fileData.lineHits)).containsExactly(1, 1, 40, 1, 42, 1); + } + private static ImmutableMap toMap(TIntIntHashMap troveMap) { return Arrays.stream(troveMap.keys()) .boxed() From 6850b2c08bea10da25ff2cc6012dca09dbf7e614 Mon Sep 17 00:00:00 2001 From: Borja Lorente Date: Thu, 6 Jun 2024 15:54:16 +0100 Subject: [PATCH 07/17] fix: Use argfile with bazel zipper (#6470) --- intellij_platform_sdk/build_defs.bzl | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/intellij_platform_sdk/build_defs.bzl b/intellij_platform_sdk/build_defs.bzl index 58447694d46..b97d13bb643 100644 --- a/intellij_platform_sdk/build_defs.bzl +++ b/intellij_platform_sdk/build_defs.bzl @@ -629,9 +629,8 @@ def no_mockito_extensions(name, jars, **kwargs): # We store the results from `find` in a file to deal with filenames with spaces files_to_tar_file=$$(mktemp) find . -type f | sed 's:^./::' > "$${files_to_tar_file}" - IFS="\n" read -r -d "" -a files_to_tar < "$${files_to_tar_file}" || true - "$$zipper" cC "../out.jar" "$${files_to_tar[@]}" + "$$zipper" cC "../out.jar" "@$${files_to_tar_file}" popd cp "$$tmpdir/out.jar" "$@" From 82e447de87fc7ed1e5822b7385d9471fb62bab37 Mon Sep 17 00:00:00 2001 From: Delvis Taveras Date: Thu, 6 Jun 2024 14:32:30 -0400 Subject: [PATCH 08/17] Add Blaze User Setting for FastBuild Java Binary Path (#6431) * Blaze Fast Build Updates * Add Blazer User Setting for FastBuild Java Binary Path * remove extra space from formatting * remove extra space from formatting * update java doc on getStandardJavaBinary method --- .../base/settings/BlazeUserSettings.java | 12 +++++++++++ .../ui/BlazeUserSettingsConfigurable.java | 20 ++++++++++++++++--- .../BazelFastBuildTestEnvironmentCreator.java | 11 +++++++++- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/base/src/com/google/idea/blaze/base/settings/BlazeUserSettings.java b/base/src/com/google/idea/blaze/base/settings/BlazeUserSettings.java index 39052d57844..28d9394e062 100644 --- a/base/src/com/google/idea/blaze/base/settings/BlazeUserSettings.java +++ b/base/src/com/google/idea/blaze/base/settings/BlazeUserSettings.java @@ -63,6 +63,7 @@ public String toString() { private static final String DEFAULT_BLAZE_PATH = "blaze"; private static final String DEFAULT_BAZEL_PATH = "bazel"; private static final String DEFAULT_BUILDIFIER_PATH = "buildifier"; + private static final String DEFAULT_FAST_BUILD_JAVA_BINARY_PATH_IN_RUN_FILES = ""; private FocusBehavior showBlazeConsoleOnSync = FocusBehavior.ALWAYS; private FocusBehavior showBlazeProblemsViewOnSync = FocusBehavior.ALWAYS; @@ -81,6 +82,7 @@ public String toString() { private String blazeBinaryPath = DEFAULT_BLAZE_PATH; private String bazelBinaryPath = DEFAULT_BAZEL_PATH; private String buildifierBinaryPath = DEFAULT_BUILDIFIER_PATH; + private String fastBuildJavaBinaryPathInRunFiles = ""; public static BlazeUserSettings getInstance() { return ServiceManager.getService(BlazeUserSettings.class); @@ -170,6 +172,16 @@ public boolean isDefaultBlazePath() { || OLD_DEFAULT_BLAZE_PATH.equals(getBlazeBinaryPath()); } + public String getFastBuildJavaBinaryPathInRunFiles() { + return StringUtil.defaultIfEmpty(fastBuildJavaBinaryPathInRunFiles, + DEFAULT_FAST_BUILD_JAVA_BINARY_PATH_IN_RUN_FILES).trim(); + } + + public void setFastBuildJavaBinaryPathInRunFiles(String javaRunFilesBinaryPath) { + this.fastBuildJavaBinaryPathInRunFiles = StringUtil.defaultIfEmpty(javaRunFilesBinaryPath, + DEFAULT_FAST_BUILD_JAVA_BINARY_PATH_IN_RUN_FILES).trim(); + } + public String getBuildifierBinaryPath() { return StringUtil.defaultIfEmpty(buildifierBinaryPath, DEFAULT_BUILDIFIER_PATH).trim(); } diff --git a/base/src/com/google/idea/blaze/base/settings/ui/BlazeUserSettingsConfigurable.java b/base/src/com/google/idea/blaze/base/settings/ui/BlazeUserSettingsConfigurable.java index 9baf49bc36e..40a2775d0a6 100644 --- a/base/src/com/google/idea/blaze/base/settings/ui/BlazeUserSettingsConfigurable.java +++ b/base/src/com/google/idea/blaze/base/settings/ui/BlazeUserSettingsConfigurable.java @@ -28,10 +28,12 @@ import com.google.idea.common.settings.ConfigurableSetting; import com.google.idea.common.settings.ConfigurableSetting.ComponentFactory; import com.google.idea.common.settings.SearchableText; +import com.google.idea.common.settings.SettingComponent; import com.google.idea.common.settings.SettingComponent.LabeledComponent; import com.google.idea.common.settings.SettingComponent.SimpleComponent; import com.intellij.openapi.options.UnnamedConfigurable; import com.intellij.ui.IdeBorderFactory; +import com.intellij.ui.TextFieldWithStoredHistory; import com.intellij.ui.components.JBLabel; import com.intellij.uiDesigner.core.GridConstraints; import com.intellij.uiDesigner.core.GridLayoutManager; @@ -150,6 +152,16 @@ public ImmutableCollection getSearchableText() { .componentFactory( fileSelector(BUILDIFIER_BINARY_PATH_KEY, "Specify the buildifier binary path")); + public static final String FAST_BUILD_JAVA_BINARY_PATH_IN_RUN_FILES_KEY = "java.runfiles.binary.path"; + private static final ConfigurableSetting FAST_BUILD_JAVA_IN_RUN_FILES_BINARY_PATH = + setting("FastBuild Java binary location in runfiles dir") + .getter(BlazeUserSettings::getFastBuildJavaBinaryPathInRunFiles) + .setter(BlazeUserSettings::setFastBuildJavaBinaryPathInRunFiles) + .componentFactory(SettingComponent.LabeledComponent.factory( + () -> new TextFieldWithStoredHistory(FAST_BUILD_JAVA_BINARY_PATH_IN_RUN_FILES_KEY), + s -> Strings.nullToEmpty(s.getText()).trim(), + TextFieldWithStoredHistory::setTextAndAddToHistory)); + private static final ImmutableList> SETTINGS = ImmutableList.of( SHOW_CONSOLE_ON_SYNC, @@ -163,14 +175,15 @@ public ImmutableCollection getSearchableText() { ALWAYS_SELECT_NEWEST_CHILD_TASK, BLAZE_BINARY_PATH, BAZEL_BINARY_PATH, - BUILDIFIER_BINARY_PATH); + BUILDIFIER_BINARY_PATH, + FAST_BUILD_JAVA_IN_RUN_FILES_BINARY_PATH); private static ConfigurableSetting.Builder setting(String label) { return ConfigurableSetting.builder(BlazeUserSettings::getInstance).label(label); } private static ComponentFactory> - fileSelector(String historyKey, String title) { + fileSelector(String historyKey, String title) { return LabeledComponent.factory( () -> FileSelectorWithStoredHistory.create(historyKey, title), s -> Strings.nullToEmpty(s.getText()).trim(), @@ -193,7 +206,8 @@ public JComponent createComponent() { ALWAYS_SELECT_NEWEST_CHILD_TASK, BLAZE_BINARY_PATH, BAZEL_BINARY_PATH, - BUILDIFIER_BINARY_PATH)); + BUILDIFIER_BINARY_PATH, + FAST_BUILD_JAVA_IN_RUN_FILES_BINARY_PATH)); } private JComponent getFocusBehaviorSettingsUi() { diff --git a/java/src/com/google/idea/blaze/java/run/fastbuild/BazelFastBuildTestEnvironmentCreator.java b/java/src/com/google/idea/blaze/java/run/fastbuild/BazelFastBuildTestEnvironmentCreator.java index 9c2fdfab7fe..20be9f8c669 100644 --- a/java/src/com/google/idea/blaze/java/run/fastbuild/BazelFastBuildTestEnvironmentCreator.java +++ b/java/src/com/google/idea/blaze/java/run/fastbuild/BazelFastBuildTestEnvironmentCreator.java @@ -17,10 +17,11 @@ import com.google.common.collect.ImmutableSet; import com.google.idea.blaze.base.model.primitives.Label; +import com.google.idea.blaze.base.settings.BlazeUserSettings; import com.google.idea.blaze.base.settings.BuildSystemName; import com.intellij.openapi.project.Project; -import java.io.File; import javax.annotation.Nullable; +import java.io.File; final class BazelFastBuildTestEnvironmentCreator extends FastBuildTestEnvironmentCreator { @@ -67,6 +68,8 @@ private static boolean isDefaultLauncher(Label label) { *

Bazel adds the Java launcher to the runfiles path when building a Java test target. If * `bzlmod` is enabled, the directory name is formatted as * 'rules_java~{RULES_JAVA_VERSION}~toolchains~local_jdk' otherwise it is `local_jdk`. + * If the user setting `java.runfiles.binary.path` is specified it will take precedence + * over `local_jdk`. */ private static File getStandardJavaBinary(String runfilesPath) { for (File file : @@ -76,6 +79,12 @@ private static File getStandardJavaBinary(String runfilesPath) { return file.toPath().resolve("bin/java").toFile(); } } + + String javaBinaryPath = BlazeUserSettings.getInstance().getFastBuildJavaBinaryPathInRunFiles(); + if (javaBinaryPath != null && !javaBinaryPath.isBlank()) { + return new File("../").toPath().resolve(javaBinaryPath).toFile(); + } + return STANDARD_JAVA_BINARY; } From 644c5ef33623711b2d339b2d017c8c624f17ae96 Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Mon, 10 Jun 2024 20:54:17 +0200 Subject: [PATCH 09/17] Bump JetBrains IDEs (#6477) --- WORKSPACE.bzlmod | 92 ++++++++++++++++++++++++------------------------ 1 file changed, 46 insertions(+), 46 deletions(-) diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index 847782a87d3..ed39bfe8832 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -48,9 +48,9 @@ http_archive( ) # The plugin api for intellij_ce_2023_1. This is required to build IJwB and run integration tests. -IC_231_SHA = "7389053a22cd25e0da47ba2afd8d5243f64d01acbc115f7ee7d605fae072a585" +IC_231_SHA = "4e1dbd508a3dc6394735ae864034aa3598d16ddd568c3de2a9d7a386f3508fff" -IC_231_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIC/2023.1.6/ideaIC-2023.1.6.zip" +IC_231_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIC/2023.1.7/ideaIC-2023.1.7.zip" http_archive( name = "intellij_ce_2023_1", @@ -60,9 +60,9 @@ http_archive( ) # The plugin api for intellij_ce_2023_2. This is required to build IJwB and run integration tests. -IC_232_SHA = "92b6604d956261f3efbaf2fa05d18cfdcba5d06361627b50f60e21e71cdf50c0" +IC_232_SHA = "781a6e6ef0094e923a8719db716f5d3f6c3316209123c3e94b0e41c8100e55c8" -IC_232_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIC/2023.2.6/ideaIC-2023.2.6.zip" +IC_232_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIC/2023.2.7/ideaIC-2023.2.7.zip" http_archive( name = "intellij_ce_2023_2", @@ -72,9 +72,9 @@ http_archive( ) # The plugin api for intellij_ce_2023_2. This is required to build IJwB and run integration tests. -IC_233_SHA = "c7c4064ef95f58503ecb0d1bcebc6d9e04587adaf407da085497e8b37b788125" +IC_233_SHA = "bbd5c853b0bda2ad07d3d13f49371c8572266dfdfc0ee8c97657b4b46307a9a9" -IC_233_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIC/2023.3.6/ideaIC-2023.3.6.zip" +IC_233_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIC/2023.3.7/ideaIC-2023.3.7.zip" http_archive( name = "intellij_ce_2023_3", @@ -84,9 +84,9 @@ http_archive( ) # The plugin api for intellij_ce_2024_1. This is required to build IJwB and run integration tests. -IC_241_SHA = "456805da1a95f98b8bd7b26ee2b49705ef1656598d438889ee4cc18099e87928" +IC_241_SHA = "cece6fd66d39144a2b0cdb06b89c88a8a3cfbdb6679c8bf869c0c0081b262b1c" -IC_241_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIC/2024.1.2/ideaIC-2024.1.2.zip" +IC_241_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIC/2024.1.3/ideaIC-2024.1.3.zip" http_archive( name = "intellij_ce_2024_1", @@ -96,9 +96,9 @@ http_archive( ) # The plugin api for intellij_ce_2024_2. This is required to build IJwB and run integration tests. -IC_242_SHA = "a20df4b2fb9c96a2943db019807d9e0da57c0db28544cbd7dbb3c40818e2bbfd" +IC_242_SHA = "b193be0c0b377c20e102c208f5f48899162930d6d9ff54e1b95642c35f5ca32a" -IC_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIC/242.12881.66-EAP-SNAPSHOT/ideaIC-242.12881.66-EAP-SNAPSHOT.zip" +IC_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIC/242.15523.18-EAP-SNAPSHOT/ideaIC-242.15523.18-EAP-SNAPSHOT.zip" http_archive( name = "intellij_ce_2024_2", @@ -149,9 +149,9 @@ http_archive( ) # The plugin api for intellij_ue_2023_1. This is required to run UE-specific integration tests. -IU_231_SHA = "cbcdb51b096bb4b7318233766b20e8d4e941410f77eb999e00812f5a7b01f2f0" +IU_231_SHA = "46900f8b8aa65a4b522e2b7eb365337e836bc7c49b00b23b47860170f5b95c07" -IU_231_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIU/2023.1.6/ideaIU-2023.1.6.zip" +IU_231_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIU/2023.1.7/ideaIU-2023.1.7.zip" http_archive( name = "intellij_ue_2023_1", @@ -161,9 +161,9 @@ http_archive( ) # The plugin api for intellij_ue_2023_2. This is required to run UE-specific integration tests. -IU_232_SHA = "30850f55a991aa4b74fec0fbd91206f6c261885b46d4fbe11ba54f7d8305c993" +IU_232_SHA = "1656b955207eb526db2b5b08a1d32e21440699e55fd21f7337f22e462c0bc9ec" -IU_232_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIU/2023.2.6/ideaIU-2023.2.6.zip" +IU_232_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIU/2023.2.7/ideaIU-2023.2.7.zip" http_archive( name = "intellij_ue_2023_2", @@ -172,9 +172,9 @@ http_archive( url = IU_232_URL, ) -IU_233_SHA = "ba40dbd0347a86567f2e916271dac2532cb7e8f512a31cbb63552f563ba5de24" +IU_233_SHA = "d79751726a42d5135c1e1220a2b87ce632f7cf78cc5576840b7d06afc9a7fd74" -IU_233_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIU/2023.3.6/ideaIU-2023.3.6.zip" +IU_233_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIU/2023.3.7/ideaIU-2023.3.7.zip" http_archive( name = "intellij_ue_2023_3", @@ -183,9 +183,9 @@ http_archive( url = IU_233_URL, ) -IU_241_SHA = "dcaa925724bcdea67d6b45856d44bf231d5e0653e466967f1c53f364b8394b10" +IU_241_SHA = "e40a2970438a5cc3ea00bc74d62a64e4500e07eb3698126ac9be2fefa636933a" -IU_241_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIU/2024.1.2/ideaIU-2024.1.2.zip" +IU_241_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/idea/ideaIU/2024.1.3/ideaIU-2024.1.3.zip" http_archive( name = "intellij_ue_2024_1", @@ -194,9 +194,9 @@ http_archive( url = IU_241_URL, ) -IU_242_SHA = "32519a1763ab4e0061cdaa23e7f801932c83f6ccdb27df6e0cc27800fc7f66ca" +IU_242_SHA = "52a9b4d6b004099851b49a8a2c5210c2dc50fa992b0f7b515b3cd81514cd65ad" -IU_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIU/242.12881.66-EAP-SNAPSHOT/ideaIU-242.12881.66-EAP-SNAPSHOT.zip" +IU_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIU/242.15523.18-EAP-SNAPSHOT/ideaIU-242.15523.18-EAP-SNAPSHOT.zip" http_archive( name = "intellij_ue_2024_2", @@ -246,9 +246,9 @@ http_archive( ) # The plugin api for clion_2023_1. This is required to build CLwB\, and run integration tests. -CLION_231_SHA = "7bce4b0ba262974b3d7e75d12a0c5ae04aa79e27900647b2164aa5ed8c1e690b" +CLION_231_SHA = "2e94bfda121f54f96b7faf1a4df2da50d394c6ae46da6e98f37a731e2b50b189" -CLION_231_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/clion/clion/2023.1.6/clion-2023.1.6.zip" +CLION_231_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/clion/clion/2023.1.7/clion-2023.1.7.zip" http_archive( name = "clion_2023_1", @@ -258,9 +258,9 @@ http_archive( ) # The plugin api for clion_2023_2. This is required to build CLwB\, and run integration tests. -CLION_232_SHA = "51f08f0c902d6a2c6d8d37109998178270ee72ad28ef76809464de7147b4802e" +CLION_232_SHA = "1bb67402b98a479a6eaab6a8e434988bbbc9c87442197788aa2c1dba5a328df0" -CLION_232_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/clion/clion/2023.2.3/clion-2023.2.3.zip" +CLION_232_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/clion/clion/2023.2.4/clion-2023.2.4.zip" http_archive( name = "clion_2023_2", @@ -269,9 +269,9 @@ http_archive( url = CLION_232_URL, ) -CLION_233_SHA = "2b4491c6f4bc1423afd39b1d35d25ab00d4071e2d43835b149a43fb0a39efae9" +CLION_233_SHA = "2ac8c3b89bb31e6d3644c3b06f50b8963370e623736d2900baad8225c6d52359" -CLION_233_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/clion/clion/2023.3.4/clion-2023.3.4.zip" +CLION_233_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/clion/clion/2023.3.5/clion-2023.3.5.zip" http_archive( name = "clion_2023_3", @@ -280,9 +280,9 @@ http_archive( url = CLION_233_URL, ) -CLION_241_SHA = "4d3f1f28d6780bb60cff01a35fbe2a9877d793ed2d8227d36dd47db5d1ca0cb2" +CLION_241_SHA = "2f9d4cd5134dd52de80e6b62c5fae24a0c6333417127ebb5fbb14f2e823c53e7" -CLION_241_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/clion/clion/2024.1.1/clion-2024.1.1.zip" +CLION_241_URL = "https://www.jetbrains.com/intellij-repository/releases/com/jetbrains/intellij/clion/clion/2024.1.3/clion-2024.1.3.zip" http_archive( name = "clion_2024_1", @@ -291,9 +291,9 @@ http_archive( url = CLION_241_URL, ) -# CLION_242_SHA = "35c1136b62f84c233b3e91a0fefa84f3da14a8b3939245fb373f728383aca1f0" +# CLION_242_SHA = "23039b46c172d820a3764e16b2f2f88bf6a2859436ae8ccf6fe5d9c78689b068" -# CLION_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/clion/clion/242.12881.46-EAP-SNAPSHOT/clion-242.12881.46-EAP-SNAPSHOT.zip" +# CLION_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/clion/clion/242.14146.22-EAP-SNAPSHOT/clion-242.14146.22-EAP-SNAPSHOT.zip" # http_archive( # name = "clion_2024_2", @@ -310,9 +310,9 @@ java_import( ) """ -DEVKIT_233_SHA = "c089d69d8ccaf50a4126d0c6e62e459fc3607442141cc7672cabb4395284b369" +DEVKIT_233_SHA = "de6c1660d9744c2c10f26837debfa1256c0b87720eb506966a94cbba1a8a917f" -DEVKIT_233_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/233.15026.24/DevKit-233.15026.24.zip" +DEVKIT_233_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/233.15325.26/DevKit-233.15325.26.zip" http_archive( name = "devkit_2023_3", @@ -321,9 +321,9 @@ http_archive( url = DEVKIT_233_URL, ) -DEVKIT_241_SHA = "7fbabd16a4b8b66de40a3fac80ea927dc44c1f5234b829b5dfb082f0b8de4cc2" +DEVKIT_241_SHA = "2a0a945e977d8094a61fe16d805cafb3d8a39d939a0855b5edac695eb15505de" -DEVKIT_241_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/241.17011.92/DevKit-241.17011.92.zip" +DEVKIT_241_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/241.17890.21/DevKit-241.17890.21.zip" http_archive( name = "devkit_2024_1", @@ -332,9 +332,9 @@ http_archive( url = DEVKIT_241_URL, ) -DEVKIT_242_SHA = "e6eb3d2409581f74dda654db30003f98c7913a17887ee9caf3aa7d551ed0a354" +DEVKIT_242_SHA = "7e9f4cf4bee6f4e92d8dedae059ad7572d51953c1d7aebaf16d82316ab16b89b" -DEVKIT_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/242.12881.66/DevKit-242.12881.66.zip" +DEVKIT_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/242.14146.24/DevKit-242.14146.24.zip" http_archive( name = "devkit_2024_2", @@ -436,9 +436,9 @@ http_archive( url = PYTHON_PLUGIN_233_URL, ) -PYTHON_PLUGIN_241_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/PythonCore/241.17011.48/PythonCore-241.17011.48.zip" +PYTHON_PLUGIN_241_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/PythonCore/241.17890.1/PythonCore-241.17890.1.zip" -PYTHON_PLUGIN_241_SHA = "f0d1a93979a9aa650250ee46d3b21038f7b37c2c02f17ab879fc188c29a54592" +PYTHON_PLUGIN_241_SHA = "193735e322d48fbfbfd200f5713c7d4c5daec94815efcfd112f9da9bbcf8d83c" http_archive( name = "python_2024_1", @@ -460,9 +460,9 @@ filegroup( ) """ -PYTHON_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/PythonCore/242.12881.66/PythonCore-242.12881.66.zip" +PYTHON_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/PythonCore/242.15523.18/PythonCore-242.15523.18.zip" -PYTHON_PLUGIN_242_SHA = "297463c5f43ff2e4410e071ff469a7d4a80e6a961bf6d4c7578a7065906c8181" +PYTHON_PLUGIN_242_SHA = "e52984e3b601406f6fed7f177c1bcfd9d67951df928a2550257ad0b85ff5954d" http_archive( name = "python_2024_2", @@ -577,9 +577,9 @@ java_import( ) """ -GO_PLUGIN_242_SHA = "0121c273808f255622ff8d448aa6d33c8db69dbd651957bfabc68b96c42889c5" +GO_PLUGIN_242_SHA = "8489d1398a2a52190719bb0de642bd4e126a254b5f897e9a6aa79381a83b84c9" -GO_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.jetbrains.plugins.go/242.12881.66/org.jetbrains.plugins.go-242.12881.66.zip" +GO_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.jetbrains.plugins.go/242.15523.18/org.jetbrains.plugins.go-242.15523.18.zip" http_archive( name = "go_2024_2", @@ -678,9 +678,9 @@ http_archive( url = SCALA_PLUGIN_241_URL, ) -SCALA_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.intellij.scala/2024.2.2/org.intellij.scala-2024.2.2.zip" +SCALA_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.intellij.scala/2024.2.5/org.intellij.scala-2024.2.5.zip" -SCALA_PLUGIN_242_SHA = "a9186fca99cefec3780926e336f61ee178223c62e10781278da45e6631f32bbe" +SCALA_PLUGIN_242_SHA = "9452e577faecff1861a521205715f5f01ce547cc2bba98e11467dc89c34cceb6" http_archive( name = "scala_2024_2", @@ -709,9 +709,9 @@ http_archive( url = TOML_PLUGIN_241_URL, ) -TOML_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.toml.lang/242.12881.22/org.toml.lang-242.12881.22.zip" +TOML_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.toml.lang/242.15523.17/org.toml.lang-242.15523.17.zip" -TOML_PLUGIN_242_SHA = "871efa88a3ee41af6fc4e172dcff7567636f0b2e39bb7544da5556b9378a0f0e" +TOML_PLUGIN_242_SHA = "2cf4e13c711298446297a43797a0e97a2a6da6ac604d356f0c4db2aa468d0a0b" # TOML required by Python since 242.13688.18 http_archive( From 6da9ea8dc591c0dabdd174073c7dd54b82889da6 Mon Sep 17 00:00:00 2001 From: Daniel Brauner <44034965+LeFrosch@users.noreply.github.com> Date: Tue, 11 Jun 2024 22:23:35 +0200 Subject: [PATCH 10/17] Revert "Reapply "Automatic code cleanup."" (#6476) This reverts commit 697b9a9a9fe4d0b3c0672a694d8bbd3a5e5a5d4e. Co-authored-by: Mai Hussien <70515749+mai93@users.noreply.github.com> --- aspect/build_dependencies.bzl | 1 - aspect/fast_build_info.bzl | 1 - aspect/intellij_info_impl.bzl | 1 - aspect/java_classpath.bzl | 2 -- 4 files changed, 5 deletions(-) diff --git a/aspect/build_dependencies.bzl b/aspect/build_dependencies.bzl index f2e504f46d6..bcfb9b9c531 100644 --- a/aspect/build_dependencies.bzl +++ b/aspect/build_dependencies.bzl @@ -5,7 +5,6 @@ load( "CPP_COMPILE_ACTION_NAME", "C_COMPILE_ACTION_NAME", ) -load("@rules_java//java:defs.bzl", "JavaInfo") ALWAYS_BUILD_RULES = "java_proto_library,java_lite_proto_library,java_mutable_proto_library,kt_proto_library_helper,_java_grpc_library,_java_lite_grpc_library,kt_grpc_library_helper,java_stubby_library,kt_stubby_library_helper,aar_import,java_import" diff --git a/aspect/fast_build_info.bzl b/aspect/fast_build_info.bzl index 7ed2e11809a..f1c6fc44aa6 100644 --- a/aspect/fast_build_info.bzl +++ b/aspect/fast_build_info.bzl @@ -1,6 +1,5 @@ """An aspect to gather info needed by the FastBuildService.""" -load("@rules_java//java:defs.bzl", "JavaInfo", "java_common") load( ":artifacts.bzl", "artifact_location", diff --git a/aspect/intellij_info_impl.bzl b/aspect/intellij_info_impl.bzl index 5732ca3807e..4cf0fa401a4 100644 --- a/aspect/intellij_info_impl.bzl +++ b/aspect/intellij_info_impl.bzl @@ -1,6 +1,5 @@ """Implementation of IntelliJ-specific information collecting aspect.""" -load("@rules_java//java:defs.bzl", "JavaInfo", "java_common") load( ":artifacts.bzl", "artifact_location", diff --git a/aspect/java_classpath.bzl b/aspect/java_classpath.bzl index 1a47bd9448a..be3dfb648c6 100644 --- a/aspect/java_classpath.bzl +++ b/aspect/java_classpath.bzl @@ -1,7 +1,5 @@ """An aspect which extracts the runtime classpath from a java target.""" -load("@rules_java//java:defs.bzl", "JavaInfo") - def _runtime_classpath_impl(target, ctx): """The top level aspect implementation function. From ca9c95e73deb35d193938e00dc2a4c885bfe998a Mon Sep 17 00:00:00 2001 From: Daniel Brauner <44034965+LeFrosch@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:00:38 +0200 Subject: [PATCH 11/17] Fix for wrong compiler executable when using custom toolchains (#6419) * Replaced hardcoded action names with constants * Use get_tool_for_action to get c and cpp compiler path * Updated tests to work with two compilers * Small changes - Use ACTION_NAMES constants - Fixed getCppCompiler returns cCompiler - Renamed setCompiler to setCCppCompiler - Fixed CToolchainIdeInfo proto order * Keep only one compiler version per toolchain * Added registry flags to toggle get_tool_for_action usage * Fixed error if the registry key is not present --- MODULE.bazel.lock | 974 ++++++------------ aspect/intellij_info_impl.bzl | 90 +- .../cpp/cctoolchain/CcToolchainTest.java | 3 +- .../NbTargetMapBuilderTest.java | 8 +- .../targetmapbuilder/NbCcToolchain.java | 3 +- .../blaze/base/ideinfo/CToolchainIdeInfo.java | 68 +- cpp/src/META-INF/blaze-cpp.xml | 2 + .../blaze/cpp/BlazeConfigurationResolver.java | 30 +- .../BlazeConfigurationToolchainResolver.java | 101 +- .../cpp/BlazeResolveConfigurationData.java | 5 +- .../idea/blaze/cpp/CppAspectArgsProvider.java | 54 + .../cpp/BlazeConfigurationResolverTest.java | 16 +- ...zeResolveConfigurationEquivalenceTest.java | 2 +- proto/intellij_ide_info.proto | 5 +- 14 files changed, 588 insertions(+), 773 deletions(-) create mode 100644 cpp/src/com/google/idea/blaze/cpp/CppAspectArgsProvider.java diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 5636c9be352..6c6b3b0879f 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -1,5 +1,5 @@ { - "lockFileVersion": 3, + "lockFileVersion": 6, "moduleFileHash": "43e0737985bcc0fc909358d2d9127e6b0ade556e3b79eaf591f0738ffd2bb52d", "flags": { "cmdRegistries": [ @@ -13,7 +13,7 @@ "compatibilityMode": "ERROR" }, "localOverrideHashes": { - "bazel_tools": "922ea6752dc9105de5af957f7a99a6933c0a6a712d23df6aad16a9c399f7e787" + "bazel_tools": "1ae69322ac3823527337acf02016e8ee95813d8d356f47060255b8956fa642f0" }, "moduleDepGraph": { "": { @@ -275,10 +275,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "platforms", "urls": [ "https://github.com/bazelbuild/platforms/releases/download/0.0.8/platforms-0.0.8.tar.gz" ], @@ -376,10 +375,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0", "urls": [ "https://github.com/bazelbuild/rules_java/releases/download/7.4.0/rules_java-7.4.0.tar.gz" ], @@ -485,10 +483,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0", "urls": [ "https://github.com/bazelbuild/rules_python/releases/download/0.31.0/rules_python-0.31.0.tar.gz" ], @@ -517,10 +514,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_proto~5.3.0-21.7", "urls": [ "https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz" ], @@ -597,10 +593,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "protobuf~21.7", "urls": [ "https://github.com/protocolbuffers/protobuf/releases/download/v21.7/protobuf-all-21.7.zip" ], @@ -633,10 +628,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "bazel_skylib~1.5.0", "urls": [ "https://github.com/bazelbuild/bazel-skylib/releases/download/1.5.0/bazel-skylib-1.5.0.tar.gz" ], @@ -663,10 +657,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_pkg~0.10.1", "urls": [ "https://github.com/bazelbuild/rules_pkg/releases/download/0.10.1/rules_pkg-0.10.1.tar.gz" ], @@ -798,10 +791,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_kotlin~1.9.0", "urls": [ "https://github.com/bazelbuild/rules_kotlin/releases/download/v1.9.0/rules_kotlin-v1.9.0.tar.gz" ], @@ -827,10 +819,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_android~0.1.1", "urls": [ "https://github.com/bazelbuild/rules_android/archive/refs/tags/v0.1.1.tar.gz" ], @@ -862,10 +853,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_bazel_integration_test~0.23.0", "urls": [ "https://github.com/bazel-contrib/rules_bazel_integration_test/releases/download/v0.23.0/rules_bazel_integration_test.v0.23.0.tar.gz" ], @@ -905,7 +895,7 @@ "hasNonDevUseExtension": true }, { - "extensionBzlFile": ":extensions.bzl", + "extensionBzlFile": "@rules_jvm_external//:extensions.bzl", "extensionName": "maven", "usingModule": "rules_jvm_external@6.0", "location": { @@ -1184,10 +1174,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_jvm_external~6.0", "urls": [ "https://github.com/bazelbuild/rules_jvm_external/releases/download/6.0/rules_jvm_external-6.0.tar.gz" ], @@ -1217,7 +1206,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 17, + "line": 18, "column": 29 }, "imports": { @@ -1235,7 +1224,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 21, + "line": 22, "column": 32 }, "imports": { @@ -1252,7 +1241,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 24, + "line": 25, "column": 32 }, "imports": { @@ -1274,7 +1263,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 35, + "line": 36, "column": 39 }, "imports": { @@ -1291,7 +1280,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 39, + "line": 40, "column": 48 }, "imports": { @@ -1308,7 +1297,7 @@ "usingModule": "bazel_tools@_", "location": { "file": "@@bazel_tools//:MODULE.bazel", - "line": 42, + "line": 43, "column": 42 }, "imports": { @@ -1319,6 +1308,23 @@ "tags": [], "hasDevUseExtension": false, "hasNonDevUseExtension": true + }, + { + "extensionBzlFile": "@buildozer//:buildozer_binary.bzl", + "extensionName": "buildozer_binary", + "usingModule": "bazel_tools@_", + "location": { + "file": "@@bazel_tools//:MODULE.bazel", + "line": 47, + "column": 33 + }, + "imports": { + "buildozer_binary": "buildozer_binary" + }, + "devImports": [], + "tags": [], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true } ], "deps": { @@ -1327,6 +1333,7 @@ "rules_license": "rules_license@0.0.7", "rules_proto": "rules_proto@5.3.0-21.7", "rules_python": "rules_python@0.31.0", + "buildozer": "buildozer@6.4.0.2", "platforms": "platforms@0.0.8", "com_google_protobuf": "protobuf@21.7", "zlib": "zlib@1.3", @@ -1360,10 +1367,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_license~0.0.7", "urls": [ "https://github.com/bazelbuild/rules_license/releases/download/0.0.7/rules_license-0.0.7.tar.gz" ], @@ -1408,10 +1414,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_cc~0.0.9", "urls": [ "https://github.com/bazelbuild/rules_cc/releases/download/0.0.9/rules_cc-0.0.9.tar.gz" ], @@ -1456,10 +1461,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "bazel_features~1.1.1", "urls": [ "https://github.com/bazel-contrib/bazel_features/releases/download/v1.1.1/bazel_features-v1.1.1.tar.gz" ], @@ -1487,10 +1491,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "abseil-cpp~20211102.0", "urls": [ "https://github.com/abseil/abseil-cpp/archive/refs/tags/20211102.0.tar.gz" ], @@ -1518,10 +1521,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "zlib~1.3", "urls": [ "https://github.com/madler/zlib/releases/download/v1.3/zlib-1.3.tar.gz" ], @@ -1553,10 +1555,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "upb~0.0.0-20220923-a547704", "urls": [ "https://github.com/protocolbuffers/upb/archive/a5477045acaa34586420942098f5fecd3570f577.tar.gz" ], @@ -1585,10 +1586,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "googletest~1.11.0", "urls": [ "https://github.com/google/googletest/archive/refs/tags/release-1.11.0.tar.gz" ], @@ -1617,10 +1617,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "stardoc~0.5.6", "urls": [ "https://github.com/bazelbuild/stardoc/releases/download/0.5.6/stardoc-0.5.6.tar.gz" ], @@ -1684,10 +1683,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "cgrindel_bazel_starlib~0.18.0", "urls": [ "https://github.com/cgrindel/bazel-starlib/releases/download/v0.18.0/bazel-starlib.v0.18.0.tar.gz" ], @@ -1700,6 +1698,72 @@ } } }, + "buildozer@6.4.0.2": { + "name": "buildozer", + "version": "6.4.0.2", + "key": "buildozer@6.4.0.2", + "repoName": "buildozer", + "executionPlatformsToRegister": [], + "toolchainsToRegister": [], + "extensionUsages": [ + { + "extensionBzlFile": "@buildozer//:buildozer_binary.bzl", + "extensionName": "buildozer_binary", + "usingModule": "buildozer@6.4.0.2", + "location": { + "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel", + "line": 7, + "column": 33 + }, + "imports": { + "buildozer_binary": "buildozer_binary" + }, + "devImports": [], + "tags": [ + { + "tagName": "buildozer", + "attributeValues": { + "sha256": { + "darwin-amd64": "d29e347ecd6b5673d72cb1a8de05bf1b06178dd229ff5eb67fad5100c840cc8e", + "darwin-arm64": "9b9e71bdbec5e7223871e913b65d12f6d8fa026684daf991f00e52ed36a6978d", + "linux-amd64": "8dfd6345da4e9042daa738d7fdf34f699c5dfce4632f7207956fceedd8494119", + "linux-arm64": "6559558fded658c8fa7432a9d011f7c4dcbac6b738feae73d2d5c352e5f605fa", + "windows-amd64": "e7f05bf847f7c3689dd28926460ce6e1097ae97380ac8e6ae7147b7b706ba19b" + }, + "version": "6.4.0" + }, + "devDependency": false, + "location": { + "file": "https://bcr.bazel.build/modules/buildozer/6.4.0.2/MODULE.bazel", + "line": 8, + "column": 27 + } + } + ], + "hasDevUseExtension": false, + "hasNonDevUseExtension": true + } + ], + "deps": { + "bazel_tools": "bazel_tools@_", + "local_config_platform": "local_config_platform@_" + }, + "repoSpec": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", + "attributes": { + "urls": [ + "https://github.com/fmeum/buildozer/releases/download/v6.4.0.2/buildozer-v6.4.0.2.tar.gz" + ], + "integrity": "sha256-k7tFKQMR2AygxpmZfH0yEPnQmF3efFgD9rBPkj+Yz/8=", + "strip_prefix": "buildozer-6.4.0.2", + "remote_patches": { + "https://bcr.bazel.build/modules/buildozer/6.4.0.2/patches/module_dot_bazel_version.patch": "sha256-gKANF2HMilj7bWmuXs4lbBIAAansuWC4IhWGB/CerjU=" + }, + "remote_patch_strip": 1 + } + } + }, "apple_support@1.5.0": { "name": "apple_support", "version": "1.5.0", @@ -1736,10 +1800,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "apple_support~1.5.0", "urls": [ "https://github.com/bazelbuild/apple_support/releases/download/1.5.0/apple_support.1.5.0.tar.gz" ], @@ -1869,10 +1932,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_go~0.41.0", "urls": [ "https://github.com/bazelbuild/rules_go/releases/download/v0.41.0/rules_go-v0.41.0.zip" ], @@ -1976,10 +2038,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "gazelle~0.32.0", "urls": [ "https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.32.0/bazel-gazelle-v0.32.0.tar.gz" ], @@ -2025,10 +2086,9 @@ "local_config_platform": "local_config_platform@_" }, "repoSpec": { - "bzlFile": "@bazel_tools//tools/build_defs/repo:http.bzl", + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "buildifier_prebuilt~6.0.0.1", "urls": [ "https://github.com/keith/buildifier-prebuilt/archive/refs/tags/6.0.0.1.tar.gz" ], @@ -2041,53 +2101,54 @@ } }, "moduleExtensions": { - "@@apple_support~1.5.0//crosstool:setup.bzl%apple_cc_configure_extension": { + "@@apple_support~//crosstool:setup.bzl%apple_cc_configure_extension": { "general": { "bzlTransitiveDigest": "pMLFCYaRPkgXPQ8vtuNkMfiHfPmRBy6QJfnid4sWfv0=", - "accumulatedFileDigests": {}, + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_apple_cc": { - "bzlFile": "@@apple_support~1.5.0//crosstool:setup.bzl", + "bzlFile": "@@apple_support~//crosstool:setup.bzl", "ruleClassName": "_apple_cc_autoconf", - "attributes": { - "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc" - } + "attributes": {} }, "local_config_apple_cc_toolchains": { - "bzlFile": "@@apple_support~1.5.0//crosstool:setup.bzl", + "bzlFile": "@@apple_support~//crosstool:setup.bzl", "ruleClassName": "_apple_cc_autoconf_toolchains", - "attributes": { - "name": "apple_support~1.5.0~apple_cc_configure_extension~local_config_apple_cc_toolchains" - } + "attributes": {} } }, - "recordedRepoMappingEntries": [] + "recordedRepoMappingEntries": [ + [ + "apple_support~", + "bazel_tools", + "bazel_tools" + ] + ] } }, - "@@bazel_features~1.1.1//private:extensions.bzl%version_extension": { + "@@bazel_tools//tools/android:android_extensions.bzl%remote_android_tools_extensions": { "general": { - "bzlTransitiveDigest": "xm7Skm1Las5saxzFWt2hbS+e68BWi+MXyt6+lKIhjPA=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "ZggrqnDIPRFCqT9XaCYOxLiJx1XuMtOZNG1jvKYZ5lA=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { - "bazel_features_version": { - "bzlFile": "@@bazel_features~1.1.1//private:version_repo.bzl", - "ruleClassName": "version_repo", + "android_tools": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_archive", "attributes": { - "name": "bazel_features~1.1.1~version_extension~bazel_features_version" + "sha256": "2b661a761a735b41c41b3a78089f4fc1982626c76ddb944604ae3ff8c545d3c2", + "url": "https://mirror.bazel.build/bazel_android_tools/android_tools_pkg-0.30.0.tar" } }, - "bazel_features_globals": { - "bzlFile": "@@bazel_features~1.1.1//private:globals_repo.bzl", - "ruleClassName": "globals_repo", + "android_gmaven_r8": { + "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", + "ruleClassName": "http_jar", "attributes": { - "name": "bazel_features~1.1.1~version_extension~bazel_features_globals", - "globals": { - "RunEnvironmentInfo": "5.3.0", - "DefaultInfo": "0.0.1", - "__TestingOnly_NeverAvailable": "1000000000.0.0" - } + "sha256": "57a696749695a09381a87bc2f08c3a8ed06a717a5caa3ef878a3077e0d3af19d", + "url": "https://maven.google.com/com/android/tools/r8/8.1.56/r8-8.1.56.jar" } } }, @@ -2096,23 +2157,20 @@ }, "@@bazel_tools//tools/cpp:cc_configure.bzl%cc_configure_extension": { "general": { - "bzlTransitiveDigest": "mcsWHq3xORJexV5/4eCvNOLxFOQKV6eli3fkr+tEaqE=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "PHpT2yqMGms2U4L3E/aZ+WcQalmZWm+ILdP3yiLsDhA=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_cc": { "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl", "ruleClassName": "cc_autoconf", - "attributes": { - "name": "bazel_tools~cc_configure_extension~local_config_cc" - } + "attributes": {} }, "local_config_cc_toolchains": { "bzlFile": "@@bazel_tools//tools/cpp:cc_configure.bzl", "ruleClassName": "cc_autoconf_toolchains", - "attributes": { - "name": "bazel_tools~cc_configure_extension~local_config_cc_toolchains" - } + "attributes": {} } }, "recordedRepoMappingEntries": [ @@ -2127,14 +2185,14 @@ "@@bazel_tools//tools/osx:xcode_configure.bzl%xcode_configure_extension": { "general": { "bzlTransitiveDigest": "Qh2bWTU6QW6wkrd87qrU4YeY+SG37Nvw3A0PR4Y0L2Y=", - "accumulatedFileDigests": {}, + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_xcode": { "bzlFile": "@@bazel_tools//tools/osx:xcode_configure.bzl", "ruleClassName": "xcode_autoconf", "attributes": { - "name": "bazel_tools~xcode_configure_extension~local_config_xcode", "xcode_locator": "@bazel_tools//tools/osx:xcode_locator.m", "remote_xcode": "" } @@ -2146,52 +2204,30 @@ "@@bazel_tools//tools/sh:sh_configure.bzl%sh_configure_extension": { "general": { "bzlTransitiveDigest": "hp4NgmNjEg5+xgvzfh6L83bt9/aiiWETuNpwNuF1MSU=", - "accumulatedFileDigests": {}, + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "local_config_sh": { "bzlFile": "@@bazel_tools//tools/sh:sh_configure.bzl", "ruleClassName": "sh_config", - "attributes": { - "name": "bazel_tools~sh_configure_extension~local_config_sh" - } + "attributes": {} } }, "recordedRepoMappingEntries": [] } }, - "@@bazel_tools//tools/test:extensions.bzl%remote_coverage_tools_extension": { + "@@buildifier_prebuilt~//:defs.bzl%buildifier_prebuilt_deps_extension": { "general": { - "bzlTransitiveDigest": "y48q5zUu2oMiYv7yUyi7rFB0wt14eqiF/RQcWT6vP7I=", - "accumulatedFileDigests": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "remote_coverage_tools": { - "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", - "ruleClassName": "http_archive", - "attributes": { - "name": "bazel_tools~remote_coverage_tools_extension~remote_coverage_tools", - "sha256": "7006375f6756819b7013ca875eab70a541cf7d89142d9c511ed78ea4fefa38af", - "urls": [ - "https://mirror.bazel.build/bazel_coverage_output_generator/releases/coverage_output_generator-v2.6.zip" - ] - } - } - }, - "recordedRepoMappingEntries": [] - } - }, - "@@buildifier_prebuilt~6.0.0.1//:defs.bzl%buildifier_prebuilt_deps_extension": { - "general": { - "bzlTransitiveDigest": "e/ywZz1v92DyiMnlC9hasz8Co0tsLhzEkfjuKBqw0WY=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "NvIZr5G7dpZTvf3pJq8bYU5dwPRf0BO2NAY4FWZbw1Q=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "buildozer_darwin_amd64": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "buildifier_prebuilt~6.0.0.1~buildifier_prebuilt_deps_extension~buildozer_darwin_amd64", "urls": [ "https://github.com/bazelbuild/buildtools/releases/download/6.0.0/buildozer-darwin-amd64" ], @@ -2204,7 +2240,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "buildifier_prebuilt~6.0.0.1~buildifier_prebuilt_deps_extension~buildifier_linux_amd64", "urls": [ "https://github.com/bazelbuild/buildtools/releases/download/6.0.0/buildifier-linux-amd64" ], @@ -2217,7 +2252,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "buildifier_prebuilt~6.0.0.1~buildifier_prebuilt_deps_extension~buildozer_darwin_arm64", "urls": [ "https://github.com/bazelbuild/buildtools/releases/download/6.0.0/buildozer-darwin-arm64" ], @@ -2230,7 +2264,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "buildifier_prebuilt~6.0.0.1~buildifier_prebuilt_deps_extension~buildozer_linux_amd64", "urls": [ "https://github.com/bazelbuild/buildtools/releases/download/6.0.0/buildozer-linux-amd64" ], @@ -2243,7 +2276,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "buildifier_prebuilt~6.0.0.1~buildifier_prebuilt_deps_extension~buildozer_linux_arm64", "urls": [ "https://github.com/bazelbuild/buildtools/releases/download/6.0.0/buildozer-linux-arm64" ], @@ -2253,10 +2285,9 @@ } }, "buildifier_prebuilt_toolchains": { - "bzlFile": "@@buildifier_prebuilt~6.0.0.1//:defs.bzl", + "bzlFile": "@@buildifier_prebuilt~//:defs.bzl", "ruleClassName": "_buildifier_toolchain_setup", "attributes": { - "name": "buildifier_prebuilt~6.0.0.1~buildifier_prebuilt_deps_extension~buildifier_prebuilt_toolchains", "assets_json": "[{\"arch\":\"amd64\",\"name\":\"buildifier\",\"platform\":\"darwin\",\"sha256\":\"3f8ab7dd5d5946ce44695f29c3b895ad11a9a6776c247ad5273e9c8480216ae1\",\"version\":\"6.0.0\"},{\"arch\":\"arm64\",\"name\":\"buildifier\",\"platform\":\"darwin\",\"sha256\":\"21fa0d48ef0b7251eb6e3521cbe25d1e52404763cd2a43aa29f69b5380559dd1\",\"version\":\"6.0.0\"},{\"arch\":\"amd64\",\"name\":\"buildifier\",\"platform\":\"linux\",\"sha256\":\"7ff82176879c0c13bc682b6b0e482d670fbe13bbb20e07915edb0ad11be50502\",\"version\":\"6.0.0\"},{\"arch\":\"arm64\",\"name\":\"buildifier\",\"platform\":\"linux\",\"sha256\":\"9ffa62ea1f55f420c36eeef1427f71a34a5d24332cb861753b2b59c66d6343e2\",\"version\":\"6.0.0\"},{\"arch\":\"amd64\",\"name\":\"buildozer\",\"platform\":\"darwin\",\"sha256\":\"17c97b23ebf0aa59c3c457800090e5d9b937511bafbe91d22aec972fbdf588d0\",\"version\":\"6.0.0\"},{\"arch\":\"arm64\",\"name\":\"buildozer\",\"platform\":\"darwin\",\"sha256\":\"8d5e26446cd5a945588b1e0c72854d2cc367fac98d16ddeccbc59b0c87a9a05e\",\"version\":\"6.0.0\"},{\"arch\":\"amd64\",\"name\":\"buildozer\",\"platform\":\"linux\",\"sha256\":\"b46c12c81ab45306d3bbb4b3a6cd795532d1c3036ed126fbc43fde23d6c35f2d\",\"version\":\"6.0.0\"},{\"arch\":\"arm64\",\"name\":\"buildozer\",\"platform\":\"linux\",\"sha256\":\"548c3a6c890ef5cc4398d5afeb1399717b43740eb910f7488a36b76440ca0383\",\"version\":\"6.0.0\"}]" } }, @@ -2264,7 +2295,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "buildifier_prebuilt~6.0.0.1~buildifier_prebuilt_deps_extension~buildifier_darwin_amd64", "urls": [ "https://github.com/bazelbuild/buildtools/releases/download/6.0.0/buildifier-darwin-amd64" ], @@ -2277,7 +2307,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "buildifier_prebuilt~6.0.0.1~buildifier_prebuilt_deps_extension~buildifier_darwin_arm64", "urls": [ "https://github.com/bazelbuild/buildtools/releases/download/6.0.0/buildifier-darwin-arm64" ], @@ -2290,7 +2319,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "buildifier_prebuilt~6.0.0.1~buildifier_prebuilt_deps_extension~buildifier_linux_arm64", "urls": [ "https://github.com/bazelbuild/buildtools/releases/download/6.0.0/buildifier-linux-arm64" ], @@ -2302,109 +2330,29 @@ }, "recordedRepoMappingEntries": [ [ - "buildifier_prebuilt~6.0.0.1", + "buildifier_prebuilt~", "bazel_skylib", - "bazel_skylib~1.5.0" + "bazel_skylib~" ], [ - "buildifier_prebuilt~6.0.0.1", + "buildifier_prebuilt~", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_bazel_integration_test~0.23.0//:extensions.bzl%bazel_binaries": { + "@@rules_go~//go:extensions.bzl%go_sdk": { "general": { - "bzlTransitiveDigest": "2YpQtmxm7IW8Ldz4jpGThmEDybtrPhL/NCQeG1JSpPI=", - "accumulatedFileDigests": {}, - "envVariables": {}, - "generatedRepoSpecs": { - "build_bazel_bazel_7_0_2": { - "bzlFile": "@@rules_bazel_integration_test~0.23.0//bazel_integration_test/private:bazel_binaries.bzl", - "ruleClassName": "bazel_binary", - "attributes": { - "name": "rules_bazel_integration_test~0.23.0~bazel_binaries~build_bazel_bazel_7_0_2", - "version": "7.0.2", - "bazelisk": "@bazel_binaries_bazelisk//:bazelisk" - } - }, - "build_bazel_bazel_5_4_1": { - "bzlFile": "@@rules_bazel_integration_test~0.23.0//bazel_integration_test/private:bazel_binaries.bzl", - "ruleClassName": "bazel_binary", - "attributes": { - "name": "rules_bazel_integration_test~0.23.0~bazel_binaries~build_bazel_bazel_5_4_1", - "version": "5.4.1", - "bazelisk": "@bazel_binaries_bazelisk//:bazelisk" - } - }, - "build_bazel_bazel_6_5_0": { - "bzlFile": "@@rules_bazel_integration_test~0.23.0//bazel_integration_test/private:bazel_binaries.bzl", - "ruleClassName": "bazel_binary", - "attributes": { - "name": "rules_bazel_integration_test~0.23.0~bazel_binaries~build_bazel_bazel_6_5_0", - "version": "6.5.0", - "bazelisk": "@bazel_binaries_bazelisk//:bazelisk" - } - }, - "bazel_binaries_bazelisk": { - "bzlFile": "@@rules_bazel_integration_test~0.23.0//bazel_integration_test/private:bazel_binaries.bzl", - "ruleClassName": "bazelisk_binary", - "attributes": { - "name": "rules_bazel_integration_test~0.23.0~bazel_binaries~bazel_binaries_bazelisk", - "version": "1.18.0" - } - }, - "bazel_binaries": { - "bzlFile": "@@rules_bazel_integration_test~0.23.0//bazel_integration_test/bzlmod:bazel_binaries.bzl", - "ruleClassName": "_bazel_binaries_helper", - "attributes": { - "name": "rules_bazel_integration_test~0.23.0~bazel_binaries~bazel_binaries", - "version_to_repo": { - "5.4.1": "build_bazel_bazel_5_4_1", - "6.5.0": "build_bazel_bazel_6_5_0", - "7.0.2": "build_bazel_bazel_7_0_2" - }, - "current_version": "5.4.1" - } - } - }, - "moduleExtensionMetadata": { - "explicitRootModuleDirectDeps": [], - "explicitRootModuleDirectDevDeps": [ - "bazel_binaries_bazelisk", - "build_bazel_bazel_5_4_1", - "build_bazel_bazel_6_5_0", - "build_bazel_bazel_7_0_2", - "bazel_binaries" - ], - "useAllRepos": "NO" - }, - "recordedRepoMappingEntries": [ - [ - "rules_bazel_integration_test~0.23.0", - "bazel_skylib", - "bazel_skylib~1.5.0" - ], - [ - "rules_bazel_integration_test~0.23.0", - "cgrindel_bazel_starlib", - "cgrindel_bazel_starlib~0.18.0" - ] - ] - } - }, - "@@rules_go~0.41.0//go:extensions.bzl%go_sdk": { - "general": { - "bzlTransitiveDigest": "kZQzc5M2J0wQinnS72B4HG2lcJyqP8zeW814pl4uHI8=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "bkrnpy1VxwiJcOOl7yXetkuzf3wwVpFEprr0vL4InKk=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "go_default_sdk": { - "bzlFile": "@@rules_go~0.41.0//go/private:sdk.bzl", + "bzlFile": "@@rules_go~//go/private:sdk.bzl", "ruleClassName": "go_download_sdk_rule", "attributes": { - "name": "rules_go~0.41.0~go_sdk~go_default_sdk", "goos": "", "goarch": "", "sdks": {}, @@ -2415,18 +2363,16 @@ } }, "go_host_compatible_sdk_label": { - "bzlFile": "@@rules_go~0.41.0//go/private:extensions.bzl", + "bzlFile": "@@rules_go~//go/private:extensions.bzl", "ruleClassName": "host_compatible_toolchain", "attributes": { - "name": "rules_go~0.41.0~go_sdk~go_host_compatible_sdk_label", "toolchain": "@go_default_sdk//:ROOT" } }, "go_toolchains": { - "bzlFile": "@@rules_go~0.41.0//go/private:sdk.bzl", + "bzlFile": "@@rules_go~//go/private:sdk.bzl", "ruleClassName": "go_multiple_toolchains", "attributes": { - "name": "rules_go~0.41.0~go_sdk~go_toolchains", "prefixes": [ "_0000_go_default_sdk_" ], @@ -2450,56 +2396,52 @@ }, "recordedRepoMappingEntries": [ [ - "rules_go~0.41.0", + "rules_go~", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_java~7.4.0//java:extensions.bzl%toolchains": { + "@@rules_java~//java:extensions.bzl%toolchains": { "general": { - "bzlTransitiveDigest": "aBRZna7UIPTRv5GXYZ2u+AfFtxUOl9IjgmCeWzNSieQ=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "0N5b5J9fUzo0sgvH4F3kIEaeXunz4Wy2/UtSFV/eXUY=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "remotejdk21_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk21_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux//:jdk\",\n)\n" } }, "remotejdk17_linux_s390x_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_s390x_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_s390x//:jdk\",\n)\n" } }, "remotejdk17_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos//:jdk\",\n)\n" } }, "remotejdk21_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk21_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos_aarch64//:jdk\",\n)\n" } }, "remotejdk17_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_aarch64//:jdk\",\n)\n" } }, @@ -2507,7 +2449,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk21_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", "sha256": "e8260516de8b60661422a725f1df2c36ef888f6fb35393566b00e7325db3d04e", "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_aarch64", @@ -2518,10 +2459,9 @@ } }, "remotejdk17_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux//:jdk\",\n)\n" } }, @@ -2529,7 +2469,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "314b04568ec0ae9b36ba03c9cbd42adc9e1265f74678923b19297d66eb84dcca", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_aarch64", @@ -2543,7 +2482,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remote_java_tools_windows", "sha256": "fe2f88169696d6c6fc6e90ba61bb46be7d0ae3693cbafdf336041bf56679e8d1", "urls": [ "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_windows-v13.4.zip", @@ -2555,7 +2493,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "43408193ce2fa0862819495b5ae8541085b95660153f2adcf91a52d3a1710e83", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-win_x64", @@ -2566,10 +2503,9 @@ } }, "remotejdk11_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win//:jdk\",\n)\n" } }, @@ -2577,7 +2513,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "54174439f2b3fddd11f1048c397fe7bb45d4c9d66d452d6889b013d04d21c4de", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_aarch64", @@ -2591,7 +2526,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "b9482f2304a1a68a614dfacddcf29569a72f0fac32e6c74f83dc1b9a157b8340", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_x64", @@ -2602,18 +2536,16 @@ } }, "remotejdk11_linux_s390x_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_s390x_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:s390x\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_s390x//:jdk\",\n)\n" } }, "remotejdk11_linux_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux//:jdk\",\n)\n" } }, @@ -2621,7 +2553,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "bcaab11cfe586fae7583c6d9d311c64384354fb2638eb9a012eca4c3f1a1d9fd", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_x64", @@ -2635,7 +2566,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_win_arm64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "b8a28e6e767d90acf793ea6f5bed0bb595ba0ba5ebdf8b99f395266161e53ec2", "strip_prefix": "jdk-11.0.13+8", @@ -2648,7 +2578,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "640453e8afe8ffe0fb4dceb4535fb50db9c283c64665eebb0ba68b19e65f4b1f", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-macosx_x64", @@ -2662,7 +2591,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk21_macos", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", "sha256": "3ad8fe288eb57d975c2786ae453a036aa46e47ab2ac3d81538ebae2a54d3c025", "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-macosx_x64", @@ -2673,18 +2601,16 @@ } }, "remotejdk21_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk21_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_macos//:jdk\",\n)\n" } }, "remotejdk17_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_macos_aarch64//:jdk\",\n)\n" } }, @@ -2692,7 +2618,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "192f2afca57701de6ec496234f7e45d971bf623ff66b8ee4a5c81582054e5637", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_x64", @@ -2703,18 +2628,16 @@ } }, "remotejdk11_macos_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_macos_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos_aarch64//:jdk\",\n)\n" } }, "remotejdk11_linux_ppc64le_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_ppc64le_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_ppc64le//:jdk\",\n)\n" } }, @@ -2722,7 +2645,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk21_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", "sha256": "5ad730fbee6bb49bfff10bf39e84392e728d89103d3474a7e5def0fd134b300a", "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_x64", @@ -2736,7 +2658,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remote_java_tools_linux", "sha256": "ba10f09a138cf185d04cbc807d67a3da42ab13d618c5d1ce20d776e199c33a39", "urls": [ "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_linux-v13.4.zip", @@ -2748,7 +2669,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk21_win", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", "sha256": "f7cc15ca17295e69c907402dfe8db240db446e75d3b150da7bf67243cded93de", "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-win_x64", @@ -2762,7 +2682,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk21_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 21,\n)\n", "sha256": "ce7df1af5d44a9f455617c4b8891443fbe3e4b269c777d8b82ed66f77167cfe0", "strip_prefix": "zulu21.32.17-ca-jdk21.0.2-linux_aarch64", @@ -2773,10 +2692,9 @@ } }, "remotejdk11_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_linux_aarch64//:jdk\",\n)\n" } }, @@ -2784,7 +2702,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_s390x", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a58fc0361966af0a5d5a31a2d8a208e3c9bb0f54f345596fd80b99ea9a39788b", "strip_prefix": "jdk-11.0.15+10", @@ -2798,7 +2715,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "6531cef61e416d5a7b691555c8cf2bdff689201b8a001ff45ab6740062b44313", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-linux_aarch64", @@ -2809,10 +2725,9 @@ } }, "remotejdk17_win_arm64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_win_arm64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win_arm64//:jdk\",\n)\n" } }, @@ -2820,7 +2735,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_linux", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a34b404f87a08a61148b38e1416d837189e1df7a040d949e743633daf4695a3c", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-linux_x64", @@ -2831,18 +2745,16 @@ } }, "remotejdk11_macos_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_macos_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:macos\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_macos//:jdk\",\n)\n" } }, "remotejdk17_linux_ppc64le_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_ppc64le_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:ppc\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_linux_ppc64le//:jdk\",\n)\n" } }, @@ -2850,7 +2762,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_win_arm64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "6802c99eae0d788e21f52d03cab2e2b3bf42bc334ca03cbf19f71eb70ee19f85", "strip_prefix": "zulu17.44.53-ca-jdk17.0.8.1-win_aarch64", @@ -2864,7 +2775,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remote_java_tools_darwin_arm64", "sha256": "076a7e198ad077f8c7d997986ef5102427fae6bbfce7a7852d2e080ed8767528", "urls": [ "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_arm64-v13.4.zip", @@ -2876,7 +2786,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_ppc64le", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "00a4c07603d0218cd678461b5b3b7e25b3253102da4022d31fc35907f21a2efd", "strip_prefix": "jdk-17.0.8.1+1", @@ -2887,26 +2796,23 @@ } }, "remotejdk21_linux_aarch64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk21_linux_aarch64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:linux\", \"@platforms//cpu:aarch64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_linux_aarch64//:jdk\",\n)\n" } }, "remotejdk11_win_arm64_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_win_arm64_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_11\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"11\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:arm64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk11_win_arm64//:jdk\",\n)\n" } }, "local_jdk": { - "bzlFile": "@@rules_java~7.4.0//toolchains:local_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:local_java_repository.bzl", "ruleClassName": "_local_java_repository_rule", "attributes": { - "name": "rules_java~7.4.0~toolchains~local_jdk", "java_home": "", "version": "", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = {RUNTIME_VERSION},\n)\n" @@ -2916,7 +2822,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remote_java_tools_darwin_x86_64", "sha256": "4523aec4d09c587091a2dae6f5c9bc6922c220f3b6030e5aba9c8f015913cc65", "urls": [ "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools_darwin_x86_64-v13.4.zip", @@ -2928,7 +2833,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remote_java_tools", "sha256": "e025fd260ac39b47c111f5212d64ec0d00d85dec16e49368aae82fc626a940cf", "urls": [ "https://mirror.bazel.build/bazel_java_tools/releases/java/v13.4/java_tools-v13.4.zip", @@ -2940,7 +2844,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_linux_s390x", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 17,\n)\n", "sha256": "ffacba69c6843d7ca70d572489d6cc7ab7ae52c60f0852cedf4cf0d248b6fc37", "strip_prefix": "jdk-17.0.8.1+1", @@ -2951,10 +2854,9 @@ } }, "remotejdk17_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk17_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_17\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"17\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk17_win//:jdk\",\n)\n" } }, @@ -2962,7 +2864,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_linux_ppc64le", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "a8fba686f6eb8ae1d1a9566821dbd5a85a1108b96ad857fdbac5c1e4649fc56f", "strip_prefix": "jdk-11.0.15+10", @@ -2976,7 +2877,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk11_macos_aarch64", "build_file_content": "load(\"@rules_java//java:defs.bzl\", \"java_runtime\")\n\npackage(default_visibility = [\"//visibility:public\"])\n\nexports_files([\"WORKSPACE\", \"BUILD.bazel\"])\n\nfilegroup(\n name = \"jre\",\n srcs = glob(\n [\n \"jre/bin/**\",\n \"jre/lib/**\",\n ],\n allow_empty = True,\n # In some configurations, Java browser plugin is considered harmful and\n # common antivirus software blocks access to npjp2.dll interfering with Bazel,\n # so do not include it in JRE on Windows.\n exclude = [\"jre/bin/plugin2/**\"],\n ),\n)\n\nfilegroup(\n name = \"jdk-bin\",\n srcs = glob(\n [\"bin/**\"],\n # The JDK on Windows sometimes contains a directory called\n # \"%systemroot%\", which is not a valid label.\n exclude = [\"**/*%*/**\"],\n ),\n)\n\n# This folder holds security policies.\nfilegroup(\n name = \"jdk-conf\",\n srcs = glob(\n [\"conf/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-include\",\n srcs = glob(\n [\"include/**\"],\n allow_empty = True,\n ),\n)\n\nfilegroup(\n name = \"jdk-lib\",\n srcs = glob(\n [\"lib/**\", \"release\"],\n allow_empty = True,\n exclude = [\n \"lib/missioncontrol/**\",\n \"lib/visualvm/**\",\n ],\n ),\n)\n\njava_runtime(\n name = \"jdk\",\n srcs = [\n \":jdk-bin\",\n \":jdk-conf\",\n \":jdk-include\",\n \":jdk-lib\",\n \":jre\",\n ],\n # Provide the 'java` binary explicitly so that the correct path is used by\n # Bazel even when the host platform differs from the execution platform.\n # Exactly one of the two globs will be empty depending on the host platform.\n # When --incompatible_disallow_empty_glob is enabled, each individual empty\n # glob will fail without allow_empty = True, even if the overall result is\n # non-empty.\n java = glob([\"bin/java.exe\", \"bin/java\"], allow_empty = True)[0],\n version = 11,\n)\n", "sha256": "7632bc29f8a4b7d492b93f3bc75a7b61630894db85d136456035ab2a24d38885", "strip_prefix": "zulu11.66.15-ca-jdk11.0.20-macosx_aarch64", @@ -2987,42 +2887,41 @@ } }, "remotejdk21_win_toolchain_config_repo": { - "bzlFile": "@@rules_java~7.4.0//toolchains:remote_java_repository.bzl", + "bzlFile": "@@rules_java~//toolchains:remote_java_repository.bzl", "ruleClassName": "_toolchain_config", "attributes": { - "name": "rules_java~7.4.0~toolchains~remotejdk21_win_toolchain_config_repo", "build_file": "\nconfig_setting(\n name = \"prefix_version_setting\",\n values = {\"java_runtime_version\": \"remotejdk_21\"},\n visibility = [\"//visibility:private\"],\n)\nconfig_setting(\n name = \"version_setting\",\n values = {\"java_runtime_version\": \"21\"},\n visibility = [\"//visibility:private\"],\n)\nalias(\n name = \"version_or_prefix_version_setting\",\n actual = select({\n \":version_setting\": \":version_setting\",\n \"//conditions:default\": \":prefix_version_setting\",\n }),\n visibility = [\"//visibility:private\"],\n)\ntoolchain(\n name = \"toolchain\",\n target_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\ntoolchain(\n name = \"bootstrap_runtime_toolchain\",\n # These constraints are not required for correctness, but prevent fetches of remote JDK for\n # different architectures. As every Java compilation toolchain depends on a bootstrap runtime in\n # the same configuration, this constraint will not result in toolchain resolution failures.\n exec_compatible_with = [\"@platforms//os:windows\", \"@platforms//cpu:x86_64\"],\n target_settings = [\":version_or_prefix_version_setting\"],\n toolchain_type = \"@bazel_tools//tools/jdk:bootstrap_runtime_toolchain_type\",\n toolchain = \"@remotejdk21_win//:jdk\",\n)\n" } } }, "recordedRepoMappingEntries": [ [ - "rules_java~7.4.0", + "rules_java~", "bazel_tools", "bazel_tools" ], [ - "rules_java~7.4.0", + "rules_java~", "remote_java_tools", - "rules_java~7.4.0~toolchains~remote_java_tools" + "rules_java~~toolchains~remote_java_tools" ] ] } }, - "@@rules_jvm_external~6.0//:extensions.bzl%maven": { + "@@rules_jvm_external~//:extensions.bzl%maven": { "general": { - "bzlTransitiveDigest": "vOkppYc6wE/3x4HnEmuAd/USfcKbaNTBbUEl7bKmhsY=", - "accumulatedFileDigests": { - "@@//:maven_install.json": "4eb85f472e64836ef14d41495b0ff042e3b28a05f9afce2c8eb59e83395aaeac", - "@@rules_jvm_external~6.0//:rules_jvm_external_deps_install.json": "cafb5d2d8119391eb2b322ce3840d3352ea82d496bdb8cbd4b6779ec4d044dda" + "bzlTransitiveDigest": "zVuJoW6sZ5KaQSp6QvyXMxDQKo/Eo50uuF9LHuznV8Q=", + "recordedFileInputs": { + "@@rules_jvm_external~//rules_jvm_external_deps_install.json": "cafb5d2d8119391eb2b322ce3840d3352ea82d496bdb8cbd4b6779ec4d044dda", + "@@//maven_install.json": "4eb85f472e64836ef14d41495b0ff042e3b28a05f9afce2c8eb59e83395aaeac" }, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "com_google_guava_guava_32_1_2_jre": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_guava_guava_32_1_2_jre", "sha256": "bc65dea7cfd9e4dacf8419d8af0e741655857d27885bb35d943d7187fc3a8fce", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/guava/32.1.2-jre/guava-32.1.2-jre.jar" @@ -3034,7 +2933,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_netty_nio_client_2_20_128", "sha256": "d6117bf4c2f45c671e55ecdff60f364099ddc1cf9226c0c24601a7818b9a22ba", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/netty-nio-client/2.20.128/netty-nio-client-2.20.128.jar" @@ -3046,7 +2944,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_sdk_core_2_20_128", "sha256": "19fd1e07de476f6b6c8342e254bf9b7df723dee65ac34002547789ec070d6a99", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/sdk-core/2.20.128/sdk-core-2.20.128.jar" @@ -3058,7 +2955,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_endpoints_spi_2_20_128", "sha256": "0b98f5553c1116520ef9022cebbde1b4dd7963c1c0f23b34137b64ccf17d0ff2", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/endpoints-spi/2.20.128/endpoints-spi-2.20.128.jar" @@ -3067,10 +2963,9 @@ } }, "com_google_auto_value_auto_value": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_auto_value_auto_value", "generating_repository": "maven", "target_name": "com_google_auto_value_auto_value" } @@ -3079,7 +2974,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_gax_grpc_2_32_0", "sha256": "79e4c7910c74b3ca0e709665f36e061538f80d98b53e5168c301508d0159758d", "urls": [ "https://repo1.maven.org/maven2/com/google/api/gax-grpc/2.32.0/gax-grpc-2.32.0.jar" @@ -3088,19 +2982,17 @@ } }, "com_google_truth_truth": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_truth_truth", "generating_repository": "maven", "target_name": "com_google_truth_truth" } }, "io_netty_netty_resolver": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_resolver", "generating_repository": "maven", "target_name": "io_netty_netty_resolver" } @@ -3109,7 +3001,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_api_1_56_1", "sha256": "b090b1bb5a3b066f7f2ef14b9ba68e3304de80ba34f90414aed3b519c30999e8", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-api/1.56.1/grpc-api-1.56.1.jar" @@ -3121,7 +3012,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_reactivestreams_reactive_streams_1_0_3", "sha256": "1dee0481072d19c929b623e155e14d2f6085dc011529a0a0dbefc84cf571d865", "urls": [ "https://repo1.maven.org/maven2/org/reactivestreams/reactive-streams/1.0.3/reactive-streams-1.0.3.jar" @@ -3133,7 +3023,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_apache_commons_commons_lang3_3_12_0", "sha256": "d919d904486c037f8d193412da0c92e22a9fa24230b9d67a57855c5c31c7e94e", "urls": [ "https://repo1.maven.org/maven2/org/apache/commons/commons-lang3/3.12.0/commons-lang3-3.12.0.jar" @@ -3142,10 +3031,9 @@ } }, "com_google_flogger_flogger": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_flogger_flogger", "generating_repository": "maven", "target_name": "com_google_flogger_flogger" } @@ -3154,7 +3042,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec_http_4_1_94_Final", "sha256": "1ada4580f68cd17a534fb3c0337087073223a76cb77304dbe5a1b19df3d53c2f", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.94.Final/netty-codec-http-4.1.94.Final.jar" @@ -3166,7 +3053,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_fasterxml_jackson_core_jackson_core_2_15_2", "sha256": "303c99e82b1faa91a0bae5d8fbeb56f7e2adf9b526a900dd723bf140d62bd4b4", "urls": [ "https://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.15.2/jackson-core-2.15.2.jar" @@ -3178,7 +3064,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec_4_1_93_Final", "sha256": "990c378168dc6364c6ff569701f4f2f122fffe8998b3e189eba4c4d868ed1084", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec/4.1.93.Final/netty-codec-4.1.93.Final.jar" @@ -3190,7 +3075,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_code_gson_gson_2_10_1", "sha256": "4241c14a7727c34feea6507ec801318a3d4a90f070e4525681079fb94ee4c593", "urls": [ "https://repo1.maven.org/maven2/com/google/code/gson/gson/2.10.1/gson-2.10.1.jar" @@ -3202,7 +3086,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_grpc_proto_google_iam_v1_1_18_0", "sha256": "11ba274f3b23fae7985a51336ab45fcf24bf655604bdbfedc6d9701288fcc4cd", "urls": [ "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-iam-v1/1.18.0/proto-google-iam-v1-1.18.0.jar" @@ -3214,7 +3097,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_http_client_google_http_client_gson_1_43_3", "sha256": "e31a4edcb9c83954a2587e14fa2f3f8f4aad56152381b3321a3bd0bcae03fa26", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-gson/1.43.3/google-http-client-gson-1.43.3.jar" @@ -3226,7 +3108,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_protobuf_lite_1_56_1", "sha256": "5605030f1668edf93ade7f24b0bfe5ecf943774e02cf0ac5cac02387ac910185", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-protobuf-lite/1.56.1/grpc-protobuf-lite-1.56.1.jar" @@ -3238,7 +3119,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_apache_httpcomponents_httpcore_4_4_16", "sha256": "6c9b3dd142a09dc468e23ad39aad6f75a0f2b85125104469f026e52a474e464f", "urls": [ "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpcore/4.4.16/httpcore-4.4.16.jar" @@ -3250,7 +3130,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_flogger_flogger_0_8", "sha256": "bebe7cd82be6c8d5208d6e960cd4344ea10672132ef06f5d4c71a48ab442b963", "urls": [ "https://repo1.maven.org/maven2/com/google/flogger/flogger/0.8/flogger-0.8.jar" @@ -3262,7 +3141,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_grpc_gapic_google_cloud_storage_v2_2_26_1_alpha", "sha256": "4b1b414751ed08dfc9f5e7e93c3fa16b8c53de5d24bf2ded414240fa72842e09", "urls": [ "https://repo1.maven.org/maven2/com/google/api/grpc/gapic-google-cloud-storage-v2/2.26.1-alpha/gapic-google-cloud-storage-v2-2.26.1-alpha.jar" @@ -3274,7 +3152,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_handler_proxy_4_1_93_Final", "sha256": "2ac5f7fbefa0b73ef783889069344d5515505a14b2303be693c5002c486df2b4", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-handler-proxy/4.1.93.Final/netty-handler-proxy-4.1.93.Final.jar" @@ -3286,7 +3163,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_auth_2_20_128", "sha256": "aa12cf67a51d28a6f486e4818e5f0bd2c1398135df6705dd020af1f28a2bafec", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/auth/2.20.128/auth-2.20.128.jar" @@ -3295,10 +3171,9 @@ } }, "maven_jar_migrator": { - "bzlFile": "@@rules_jvm_external~6.0//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "coursier_fetch", "attributes": { - "name": "rules_jvm_external~6.0~maven~maven_jar_migrator", "user_provided_name": "maven_jar_migrator", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" @@ -3328,7 +3203,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_netty_shaded_1_56_1", "sha256": "b15257e1137d609a7e8eb9bf4f0cec06b78ee69c030282db0a66d17cc9c3eaf1", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-netty-shaded/1.56.1/grpc-netty-shaded-1.56.1.jar" @@ -3340,7 +3214,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_native_epoll_4_1_97_Final", "sha256": "418a0d0d66d2d52a63a0e2cd5377f8c3186db47c09e3b8af39a43fec39c077fe", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport-native-epoll/4.1.97.Final/netty-transport-native-epoll-4.1.97.Final.jar" @@ -3349,19 +3222,17 @@ } }, "com_google_protobuf_protobuf_java": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_protobuf_protobuf_java", "generating_repository": "maven", "target_name": "com_google_protobuf_protobuf_java" } }, "kotlin_rules_maven": { - "bzlFile": "@@rules_jvm_external~6.0//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "coursier_fetch", "attributes": { - "name": "rules_jvm_external~6.0~maven~kotlin_rules_maven", "user_provided_name": "kotlin_rules_maven", "repositories": [ "{ \"repo_url\": \"https://maven-central.storage.googleapis.com/repos/central/data/\" }", @@ -3407,10 +3278,9 @@ } }, "unpinned_maven": { - "bzlFile": "@@rules_jvm_external~6.0//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "coursier_fetch", "attributes": { - "name": "rules_jvm_external~6.0~maven~unpinned_maven", "user_provided_name": "maven", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" @@ -3479,19 +3349,17 @@ } }, "io_netty_netty_codec": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec", "generating_repository": "maven", "target_name": "io_netty_netty_codec" } }, "net_bytebuddy_byte_buddy": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~net_bytebuddy_byte_buddy", "generating_repository": "maven", "target_name": "net_bytebuddy_byte_buddy" } @@ -3500,7 +3368,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_gax_httpjson_2_32_0", "sha256": "5830038e076277d105cde00054c63926b98493d684634eb3c7f4318328d80ca0", "urls": [ "https://repo1.maven.org/maven2/com/google/api/gax-httpjson/2.32.0/gax-httpjson-2.32.0.jar" @@ -3512,7 +3379,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_protobuf_protobuf_java_util_3_23_2", "sha256": "644975b780d7e8de542dda16d4ceb157b40a52a8be5645221e9fd026ef204b13", "urls": [ "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java-util/3.23.2/protobuf-java-util-3.23.2.jar" @@ -3524,7 +3390,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_checkerframework_checker_compat_qual_2_5_3", "sha256": "d76b9afea61c7c082908023f0cbc1427fab9abd2df915c8b8a3e7a509bccbc6d", "urls": [ "https://repo1.maven.org/maven2/org/checkerframework/checker-compat-qual/2.5.3/checker-compat-qual-2.5.3.jar" @@ -3536,7 +3401,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_ow2_asm_asm_9_5", "sha256": "b62e84b5980729751b0458c534cf1366f727542bb8d158621335682a460f0353", "urls": [ "https://repo1.maven.org/maven2/org/ow2/asm/asm/9.5/asm-9.5.jar" @@ -3548,7 +3412,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_apache_client_2_20_128", "sha256": "b35142b110c70ba0fd79f6f3e7633701d98424bcecc70d92eb336cb830244a09", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/apache-client/2.20.128/apache-client-2.20.128.jar" @@ -3560,7 +3423,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_stub_1_56_1", "sha256": "64ffca5dde4565c4c0f876deea3d105341d45ce605b29053e79dc86a22f7953b", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-stub/1.56.1/grpc-stub-1.56.1.jar" @@ -3569,10 +3431,9 @@ } }, "org_codehaus_mojo_animal_sniffer_annotations": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_codehaus_mojo_animal_sniffer_annotations", "generating_repository": "maven", "target_name": "org_codehaus_mojo_animal_sniffer_annotations" } @@ -3581,7 +3442,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_guava_listenablefuture_9999_0_empty_to_avoid_conflict_with_guava", "sha256": "b372a037d4230aa57fbeffdef30fd6123f9c0c2db85d0aced00c91b974f33f99", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" @@ -3593,7 +3453,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_native_unix_common_4_1_97_Final", "sha256": "412fe140257c2dda5a5e15bee911298bd61928d03ee6be4db588e82c196c5dc6", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.97.Final/netty-transport-native-unix-common-4.1.97.Final.jar" @@ -3605,7 +3464,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_oauth_client_google_oauth_client_1_34_1", "sha256": "193edf97aefa28b93c5892bdc598bac34fa4c396588030084f290b1440e8b98a", "urls": [ "https://repo1.maven.org/maven2/com/google/oauth-client/google-oauth-client/1.34.1/google-oauth-client-1.34.1.jar" @@ -3614,10 +3472,9 @@ } }, "com_google_code_gson_gson": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_code_gson_gson", "generating_repository": "maven", "target_name": "com_google_code_gson_gson" } @@ -3626,7 +3483,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_cloud_google_cloud_core_grpc_2_22_0", "sha256": "18eeb382b6cf83bfebd49a1c785a2474bb5937aeed15326c4e6d5595416dadf3", "urls": [ "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core-grpc/2.22.0/google-cloud-core-grpc-2.22.0.jar" @@ -3638,7 +3494,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_cloud_google_cloud_storage_2_26_1", "sha256": "6a607268c51471280dc07176b46577951e0e198780a53c6a864fcb2a7acc9902", "urls": [ "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-storage/2.26.1/google-cloud-storage-2.26.1.jar" @@ -3650,7 +3505,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_http_client_spi_2_20_128", "sha256": "b09f1e0392975093ba0a2231e7057b673dacf05a798fe1b3f1446ba4f32e6a9b", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/http-client-spi/2.20.128/http-client-spi-2.20.128.jar" @@ -3662,7 +3516,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_utils_2_20_128", "sha256": "ba635695d0046fae35740e9e64da9f0e34dab7cbc9a64813ce9ab49ed989f948", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/utils/2.20.128/utils-2.20.128.jar" @@ -3674,7 +3527,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec_http_4_1_93_Final", "sha256": "dacf78ce78ab2d29570325db4cd2451ea589639807de95881a0fa7155a9e6b55", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec-http/4.1.93.Final/netty-codec-http-4.1.93.Final.jar" @@ -3686,7 +3538,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_resolver_4_1_94_Final", "sha256": "bd26e9bc5e94e2d3974a93fdf921658eff4f033bfd4c5208607760ab54298617", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-resolver/4.1.94.Final/netty-resolver-4.1.94.Final.jar" @@ -3698,7 +3549,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_threeten_threetenbp_1_6_8", "sha256": "e4b1eb3d90c38a54c7f3384fda957e0b5bf0b41b40672a44ae8b03cb6c87ce06", "urls": [ "https://repo1.maven.org/maven2/org/threeten/threetenbp/1.6.8/threetenbp-1.6.8.jar" @@ -3707,19 +3557,17 @@ } }, "io_grpc_grpc_protobuf_lite": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_protobuf_lite", "generating_repository": "maven", "target_name": "io_grpc_grpc_protobuf_lite" } }, "io_netty_netty_handler_proxy": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_handler_proxy", "generating_repository": "maven", "target_name": "io_netty_netty_handler_proxy" } @@ -3728,7 +3576,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_guava_guava_33_0_0_jre", "sha256": "f4d85c3e4d411694337cb873abea09b242b664bb013320be6105327c45991537", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/guava/33.0.0-jre/guava-33.0.0-jre.jar" @@ -3740,7 +3587,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_re2j_re2j_1_7", "sha256": "4f657af51ab8bb0909bcc3eb40862d26125af8cbcf92aaaba595fed77f947bc0", "urls": [ "https://repo1.maven.org/maven2/com/google/re2j/re2j/1.7/re2j-1.7.jar" @@ -3749,10 +3595,9 @@ } }, "org_ow2_asm_asm": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_ow2_asm_asm", "generating_repository": "maven", "target_name": "org_ow2_asm_asm" } @@ -3761,7 +3606,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_profiles_2_20_128", "sha256": "110a5a1bfa09b0be417d60bba97f9d8641d398ea36d72b942a97253066fd5fd0", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/profiles/2.20.128/profiles-2.20.128.jar" @@ -3773,7 +3617,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_auto_value_auto_value_annotations_1_10_2", "sha256": "3f3b7edfaf7fbbd88642f7bd5b09487b8dcf2b9e5f3a19f1eb7b3e53f20f14ba", "urls": [ "https://repo1.maven.org/maven2/com/google/auto/value/auto-value-annotations/1.10.2/auto-value-annotations-1.10.2.jar" @@ -3785,7 +3628,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~javax_annotation_javax_annotation_api_1_3_2", "sha256": "e04ba5195bcd555dc95650f7cc614d151e4bcd52d29a10b8aa2197f3ab89ab9b", "urls": [ "https://repo1.maven.org/maven2/javax/annotation/javax.annotation-api/1.3.2/javax.annotation-api-1.3.2.jar" @@ -3797,7 +3639,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_http_client_google_http_client_apache_v2_1_43_3", "sha256": "4cc8485bdda05607c7d8b95b130168ac82ad80bb3618c608fbf941047a96ac3b", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-apache-v2/1.43.3/google-http-client-apache-v2-1.43.3.jar" @@ -3809,7 +3650,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_client_google_api_client_2_2_0", "sha256": "58eca9fb0a869391689ffc828b3bd0b19ac76042ff9fab4881eddf7fde76903f", "urls": [ "https://repo1.maven.org/maven2/com/google/api-client/google-api-client/2.2.0/google-api-client-2.2.0.jar" @@ -3818,10 +3658,9 @@ } }, "rules_jvm_external_deps": { - "bzlFile": "@@rules_jvm_external~6.0//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "pinned_coursier_fetch", "attributes": { - "name": "rules_jvm_external~6.0~maven~rules_jvm_external_deps", "user_provided_name": "rules_jvm_external_deps", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" @@ -3840,7 +3679,7 @@ "fetch_sources": false, "fetch_javadoc": false, "generate_compat_repositories": false, - "maven_install_json": "@@rules_jvm_external~6.0//:rules_jvm_external_deps_install.json", + "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json", "override_targets": {}, "strict_visibility": false, "strict_visibility_value": [ @@ -3856,10 +3695,9 @@ } }, "net_java_dev_jna_jna": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~net_java_dev_jna_jna", "generating_repository": "maven", "target_name": "net_java_dev_jna_jna" } @@ -3868,7 +3706,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_crt_core_2_20_128", "sha256": "48d2b5c0102a234bf988da7e8ec5f36d51b41ae2b512df2cab29d99b6b7620eb", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/crt-core/2.20.128/crt-core-2.20.128.jar" @@ -3880,7 +3717,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_http_client_google_http_client_appengine_1_43_3", "sha256": "66ade3c0e73566ed231032a2bda9f2f8e50e74911f6720bf0ee5233f6e5e033e", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-appengine/1.43.3/google-http-client-appengine-1.43.3.jar" @@ -3892,7 +3728,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_auth_1_56_1", "sha256": "ac365e11532a4b779a2ac80ecc64dcbd3bafbdd666e08e22ffdb5c855069e3f9", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-auth/1.56.1/grpc-auth-1.56.1.jar" @@ -3901,10 +3736,9 @@ } }, "org_hamcrest_hamcrest_core": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_hamcrest_hamcrest_core", "generating_repository": "maven", "target_name": "org_hamcrest_hamcrest_core" } @@ -3913,7 +3747,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_buffer_4_1_97_Final", "sha256": "a4393f5b395486cc74d0325c9b41311abb9513ba0fd7ef8cf46e9345c3bffbea", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-buffer/4.1.97.Final/netty-buffer-4.1.97.Final.jar" @@ -3925,7 +3758,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_core_1_57_0", "sha256": "3bee48c73bc4c5b55bed79be0e484adf26ba56bebbe5798ddbf34714ef1e1cea", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-core/1.57.0/grpc-core-1.57.0.jar" @@ -3937,7 +3769,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~junit_junit_4_13_2", "sha256": "8e495b634469d64fb8acfa3495a065cbacc8a0fff55ce1e31007be4c16dc57d3", "urls": [ "https://repo1.maven.org/maven2/junit/junit/4.13.2/junit-4.13.2.jar" @@ -3949,7 +3780,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_truth_extensions_truth_java8_extension_1_1_5", "sha256": "9e3c437ef76c0028d1c87d9f81d599301459333cfb3b50e5bf815ed712745140", "urls": [ "https://repo1.maven.org/maven2/com/google/truth/extensions/truth-java8-extension/1.1.5/truth-java8-extension-1.1.5.jar" @@ -3961,7 +3791,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_grpc_proto_google_cloud_storage_v2_2_26_1_alpha", "sha256": "e1c33f066db9189f09d1b7ec698f939eb4591f937fcd1ca1cbd4f05f1eb0e25c", "urls": [ "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-cloud-storage-v2/2.26.1-alpha/proto-google-cloud-storage-v2-2.26.1-alpha.jar" @@ -3973,7 +3802,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_guava_guava_testlib_31_1_jre", "sha256": "aadc71b10d5c3ac474dd16be84cfb18d257e584d1e0a59f8cab64ef4376226ce", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/guava-testlib/31.1-jre/guava-testlib-31.1-jre.jar" @@ -3985,7 +3813,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_checkerframework_checker_qual_3_33_0", "sha256": "e316255bbfcd9fe50d165314b85abb2b33cb2a66a93c491db648e498a82c2de1", "urls": [ "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.33.0/checker-qual-3.33.0.jar" @@ -3997,7 +3824,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_hamcrest_hamcrest_core_1_3", "sha256": "66fdef91e9739348df7a096aa384a5685f4e875584cce89386a7a47251c4d8e9", "urls": [ "https://repo1.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar" @@ -4006,19 +3832,17 @@ } }, "com_google_j2objc_j2objc_annotations": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_j2objc_j2objc_annotations", "generating_repository": "maven", "target_name": "com_google_j2objc_j2objc_annotations" } }, "unpinned_rules_jvm_external_deps": { - "bzlFile": "@@rules_jvm_external~6.0//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "coursier_fetch", "attributes": { - "name": "rules_jvm_external~6.0~maven~unpinned_rules_jvm_external_deps", "user_provided_name": "rules_jvm_external_deps", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" @@ -4045,7 +3869,7 @@ "strict_visibility_value": [ "@@//visibility:private" ], - "maven_install_json": "@@rules_jvm_external~6.0//:rules_jvm_external_deps_install.json", + "maven_install_json": "@@rules_jvm_external~//:rules_jvm_external_deps_install.json", "resolve_timeout": 600, "use_starlark_android_rules": false, "aar_import_bzl_label": "@build_bazel_rules_android//android:rules.bzl", @@ -4057,7 +3881,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_rls_1_56_1", "sha256": "ff56fa9750087f9deea2d00e08f46c7a3fd40f1032c3f5b44a702c595ddb7f55", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-rls/1.56.1/grpc-rls-1.56.1.jar" @@ -4066,10 +3889,9 @@ } }, "io_grpc_grpc_stub": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_stub", "generating_repository": "maven", "target_name": "io_grpc_grpc_stub" } @@ -4078,7 +3900,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_classes_epoll_4_1_94_Final", "sha256": "9d5d51eb42081d6fc13f4dca6855cd30d098a5b1d0b06d5644a1342bd1e50a44", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.94.Final/netty-transport-classes-epoll-4.1.94.Final.jar" @@ -4090,7 +3911,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_auto_value_auto_value_1_10_4", "sha256": "f3c438d1f82904bbcb452084d488b660f3c7488e9274c3a58f049e121632d434", "urls": [ "https://repo1.maven.org/maven2/com/google/auto/value/auto-value/1.10.4/auto-value-1.10.4.jar" @@ -4102,7 +3922,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_alts_1_56_1", "sha256": "04317f8835b3a8736ba12a7a25e474430c7f2d8c0b7afc433c2abc4cb2f0d4e8", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-alts/1.56.1/grpc-alts-1.56.1.jar" @@ -4114,7 +3933,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_opencensus_opencensus_contrib_http_util_0_31_1", "sha256": "3ea995b55a4068be22989b70cc29a4d788c2d328d1d50613a7a9afd13fdd2d0a", "urls": [ "https://repo1.maven.org/maven2/io/opencensus/opencensus-contrib-http-util/0.31.1/opencensus-contrib-http-util-0.31.1.jar" @@ -4123,10 +3941,9 @@ } }, "com_google_flogger_flogger_system_backend": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_flogger_flogger_system_backend", "generating_repository": "maven", "target_name": "com_google_flogger_flogger_system_backend" } @@ -4135,7 +3952,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_auth_google_auth_library_oauth2_http_1_19_0", "sha256": "01bdf5c5cd85e10b794e401775d9909b56a38ffce313fbd39510a5d87ed56f58", "urls": [ "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-oauth2-http/1.19.0/google-auth-library-oauth2-http-1.19.0.jar" @@ -4147,7 +3963,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_truth_truth_1_1_5", "sha256": "7f6d50d6f43a102942ef2c5a05f37a84f77788bb448cf33cceebf86d34e575c0", "urls": [ "https://repo1.maven.org/maven2/com/google/truth/truth/1.1.5/truth-1.1.5.jar" @@ -4159,7 +3974,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_4_1_97_Final", "sha256": "197fd2d6c6b4afe677d9e95bf2e36b49a0bcabdfce0583683fb73f29a3f5a407", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport/4.1.97.Final/netty-transport-4.1.97.Final.jar" @@ -4171,7 +3985,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_cloud_google_cloud_core_http_2_22_0", "sha256": "eba963e2d7aee9cb7dd71872f634d4418c7dffc260f740431b9f577b09417c03", "urls": [ "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core-http/2.22.0/google-cloud-core-http-2.22.0.jar" @@ -4183,7 +3996,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_j2objc_j2objc_annotations_2_8", "sha256": "f02a95fa1a5e95edb3ed859fd0fb7df709d121a35290eff8b74dce2ab7f4d6ed", "urls": [ "https://repo1.maven.org/maven2/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar" @@ -4195,7 +4007,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_auth_google_auth_library_credentials_1_19_0", "sha256": "095984b0594888a47f311b3c9dcf6da9ed86feeea8f78140c55e14c27b0593e5", "urls": [ "https://repo1.maven.org/maven2/com/google/auth/google-auth-library-credentials/1.19.0/google-auth-library-credentials-1.19.0.jar" @@ -4207,7 +4018,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_xds_1_56_1", "sha256": "688950e2dc79c2b227fcad553f4e4c8faf8de324eeccb3a591ff679929bbfa24", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-xds/1.56.1/grpc-xds-1.56.1.jar" @@ -4219,7 +4029,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_code_findbugs_jsr305_3_0_2", "sha256": "766ad2a0783f2687962c8ad74ceecc38a28b9f72a2d085ee438b7813e928d0c7", "urls": [ "https://repo1.maven.org/maven2/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" @@ -4228,10 +4037,9 @@ } }, "io_grpc_grpc_api": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_api", "generating_repository": "maven", "target_name": "io_grpc_grpc_api" } @@ -4240,7 +4048,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_aws_core_2_20_128", "sha256": "105f5d4a204a6a759ab502922df4cd5aa2a6d1b0c5f53ce88713f60abd4650e9", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-core/2.20.128/aws-core-2.20.128.jar" @@ -4252,7 +4059,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_protobuf_1_57_0", "sha256": "49f986d4eab12610fdba4a6890fca52d5eb653598916fdb863a366d5e28eecf7", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-protobuf/1.57.0/grpc-protobuf-1.57.0.jar" @@ -4264,7 +4070,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_apis_google_api_services_storage_v1_rev20230617_2_0_0", "sha256": "43484b32b410b2b8ff32ac9ab1b89c039c727c2e37465e375ce2846d5a804645", "urls": [ "https://repo1.maven.org/maven2/com/google/apis/google-api-services-storage/v1-rev20230617-2.0.0/google-api-services-storage-v1-rev20230617-2.0.0.jar" @@ -4273,10 +4078,9 @@ } }, "com_google_guava_failureaccess": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_guava_failureaccess", "generating_repository": "maven", "target_name": "com_google_guava_failureaccess" } @@ -4285,7 +4089,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_googlejavaformat_google_java_format_1_17_0", "sha256": "631ba54c39f6c20df027dc1420736df2e5e43c581880efdd1e46ddb4ce050e3e", "urls": [ "https://repo1.maven.org/maven2/com/google/googlejavaformat/google-java-format/1.17.0/google-java-format-1.17.0.jar" @@ -4297,7 +4100,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_flogger_flogger_system_backend_0_8", "sha256": "eb4428e483c5332381778d78c6a19da63b4fef3fa7e40f62dadabea0d7600cb4", "urls": [ "https://repo1.maven.org/maven2/com/google/flogger/flogger-system-backend/0.8/flogger-system-backend-0.8.jar" @@ -4309,7 +4111,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_guava_failureaccess_1_0_2", "sha256": "8a8f81cf9b359e3f6dfa691a1e776985c061ef2f223c9b2c80753e1b458e8064", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.2/failureaccess-1.0.2.jar" @@ -4321,7 +4122,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_guava_failureaccess_1_0_1", "sha256": "a171ee4c734dd2da837e4b16be9df4661afab72a41adaf31eb84dfdaf936ca26", "urls": [ "https://repo1.maven.org/maven2/com/google/guava/failureaccess/1.0.1/failureaccess-1.0.1.jar" @@ -4333,7 +4133,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_opencensus_opencensus_api_0_31_1", "sha256": "f1474d47f4b6b001558ad27b952e35eda5cc7146788877fc52938c6eba24b382", "urls": [ "https://repo1.maven.org/maven2/io/opencensus/opencensus-api/0.31.1/opencensus-api-0.31.1.jar" @@ -4345,7 +4144,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_perfmark_perfmark_api_0_26_0", "sha256": "b7d23e93a34537ce332708269a0d1404788a5b5e1949e82f5535fce51b3ea95b", "urls": [ "https://repo1.maven.org/maven2/io/perfmark/perfmark-api/0.26.0/perfmark-api-0.26.0.jar" @@ -4357,7 +4155,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_resolver_4_1_97_Final", "sha256": "38a018c6d9fb2cb11b72881354782b45080bbd20b9a0ad6cde28b80d431ed0b1", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-resolver/4.1.97.Final/netty-resolver-4.1.97.Final.jar" @@ -4366,10 +4163,9 @@ } }, "com_google_android_annotations": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_android_annotations", "generating_repository": "maven", "target_name": "com_google_android_annotations" } @@ -4378,7 +4174,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_netty_1_57_0", "sha256": "81d43f2d4ed18fa341bd840a3735f1403a70074a046e157e27f679b721b4c9ad", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-netty/1.57.0/grpc-netty-1.57.0.jar" @@ -4387,10 +4182,9 @@ } }, "io_netty_netty_transport_native_unix_common": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_native_unix_common", "generating_repository": "maven", "target_name": "io_netty_netty_transport_native_unix_common" } @@ -4399,7 +4193,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_context_1_56_1", "sha256": "3d442ce08bfb1b487edf76d12e2dfd991c3877af32cf772a83c73d06f89743bc", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-context/1.56.1/grpc-context-1.56.1.jar" @@ -4408,10 +4201,9 @@ } }, "com_google_guava_guava_testlib": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_guava_guava_testlib", "generating_repository": "maven", "target_name": "com_google_guava_guava_testlib" } @@ -4420,7 +4212,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_objenesis_objenesis_3_3", "sha256": "02dfd0b0439a5591e35b708ed2f5474eb0948f53abf74637e959b8e4ef69bfeb", "urls": [ "https://repo1.maven.org/maven2/org/objenesis/objenesis/3.3/objenesis-3.3.jar" @@ -4429,10 +4220,9 @@ } }, "io_netty_netty_transport_classes_kqueue": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_classes_kqueue", "generating_repository": "maven", "target_name": "io_netty_netty_transport_classes_kqueue" } @@ -4441,7 +4231,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_protobuf_protobuf_java_3_25_2", "sha256": "cabe49981b86f5913b7fd130b4628e6ee11586e28ca069815d9744f929271902", "urls": [ "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.25.2/protobuf-java-3.25.2.jar" @@ -4453,7 +4242,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_apache_maven_maven_artifact_3_9_4", "sha256": "7dd352fd9f8ff86a1d0a7d89e6289d8d3cd346ac9b214ed85868d585be05ab78", "urls": [ "https://repo1.maven.org/maven2/org/apache/maven/maven-artifact/3.9.4/maven-artifact-3.9.4.jar" @@ -4462,19 +4250,17 @@ } }, "com_googlecode_java_diff_utils_diffutils": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_googlecode_java_diff_utils_diffutils", "generating_repository": "maven", "target_name": "com_googlecode_java_diff_utils_diffutils" } }, "io_netty_netty_common": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_common", "generating_repository": "maven", "target_name": "io_netty_netty_common" } @@ -4483,7 +4269,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_grpc_proto_google_common_protos_2_34_0", "sha256": "8d2d8ccae1c0fc89dc628ce07e21611c1200a8cd673e26c8b0f44599511b6e7e", "urls": [ "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.34.0/proto-google-common-protos-2.34.0.jar" @@ -4495,7 +4280,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_metrics_spi_2_20_128", "sha256": "5fcbfe4d10d0814ea1caa963d66129b1dfcf5e2f7c3a8298596676985234f94c", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/metrics-spi/2.20.128/metrics-spi-2.20.128.jar" @@ -4507,7 +4291,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_codehaus_mojo_animal_sniffer_annotations_1_23", "sha256": "9ffe526bf43a6348e9d8b33b9cd6f580a7f5eed0cf055913007eda263de974d0", "urls": [ "https://repo1.maven.org/maven2/org/codehaus/mojo/animal-sniffer-annotations/1.23/animal-sniffer-annotations-1.23.jar" @@ -4519,7 +4302,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_errorprone_error_prone_annotations_2_23_0", "sha256": "ec6f39f068b6ff9ac323c68e28b9299f8c0a80ca512dccb1d4a70f40ac3ec054", "urls": [ "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0.jar" @@ -4531,7 +4313,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_eventstream_eventstream_1_0_1", "sha256": "0c37d8e696117f02c302191b8110b0d0eb20fa412fce34c3a269ec73c16ce822", "urls": [ "https://repo1.maven.org/maven2/software/amazon/eventstream/eventstream/1.0.1/eventstream-1.0.1.jar" @@ -4540,10 +4321,9 @@ } }, "io_netty_netty_handler": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_handler", "generating_repository": "maven", "target_name": "io_netty_netty_handler" } @@ -4552,7 +4332,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~net_bytebuddy_byte_buddy_agent_1_14_10", "sha256": "67993a89d47ca58ff868802a4448ddd150e5fe4e5a5645ded990d7b4d557a6b9", "urls": [ "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy-agent/1.14.10/byte-buddy-agent-1.14.10.jar" @@ -4561,10 +4340,9 @@ } }, "com_google_auto_value_auto_value_annotations": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_auto_value_auto_value_annotations", "generating_repository": "maven", "target_name": "com_google_auto_value_auto_value_annotations" } @@ -4573,7 +4351,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_handler_4_1_93_Final", "sha256": "4e5f563ae14ed713381816d582f5fcfd0615aefb29203486cdfb782d8a00a02b", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-handler/4.1.93.Final/netty-handler-4.1.93.Final.jar" @@ -4585,7 +4362,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_json_utils_2_20_128", "sha256": "82a05550dcf9538d878d9d26e8c97913aa34600f7614cd7fd3b6e1f3f67c13cd", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/json-utils/2.20.128/json-utils-2.20.128.jar" @@ -4597,7 +4373,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec_http2_4_1_93_Final", "sha256": "d96cc09045a1341c6d47494352aa263b87b72fb1d2ea9eca161aa73820bfe8bb", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.93.Final/netty-codec-http2-4.1.93.Final.jar" @@ -4609,7 +4384,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_protobuf_1_56_1", "sha256": "46185731a718d723d853723610a77e9062da9a6fc8b4ff14f370ba10cf097893", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-protobuf/1.56.1/grpc-protobuf-1.56.1.jar" @@ -4621,7 +4395,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~net_java_dev_jna_jna_5_14_0", "sha256": "34ed1e1f27fa896bca50dbc4e99cf3732967cec387a7a0d5e3486c09673fe8c6", "urls": [ "https://repo1.maven.org/maven2/net/java/dev/jna/jna/5.14.0/jna-5.14.0.jar" @@ -4633,7 +4406,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_grpc_proto_google_common_protos_2_23_0", "sha256": "ff880ec7fae731bed60377871fa3138ad6ea6fd31d0c6055c2e70ea47917402b", "urls": [ "https://repo1.maven.org/maven2/com/google/api/grpc/proto-google-common-protos/2.23.0/proto-google-common-protos-2.23.0.jar" @@ -4642,28 +4414,25 @@ } }, "io_grpc_grpc_core": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_core", "generating_repository": "maven", "target_name": "io_grpc_grpc_core" } }, "net_bytebuddy_byte_buddy_agent": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~net_bytebuddy_byte_buddy_agent", "generating_repository": "maven", "target_name": "net_bytebuddy_byte_buddy_agent" } }, "org_mockito_mockito_core": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_mockito_mockito_core", "generating_repository": "maven", "target_name": "org_mockito_mockito_core" } @@ -4672,7 +4441,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_4_1_94_Final", "sha256": "a75afa84ca35a50225991b39e6b6278186e612f7a2a0c0e981de523aaac516a4", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport/4.1.94.Final/netty-transport-4.1.94.Final.jar" @@ -4684,7 +4452,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_common_4_1_94_Final", "sha256": "cb8d84a3e63aea90d0d7a333a02e50ac751d2b05db55745d981b5eff893f647b", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-common/4.1.94.Final/netty-common-4.1.94.Final.jar" @@ -4696,7 +4463,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_aws_xml_protocol_2_20_128", "sha256": "085f9e55c26daa7d38b17795d0e767e159da595892b95a60a6be4e76936ea68f", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-xml-protocol/2.20.128/aws-xml-protocol-2.20.128.jar" @@ -4708,7 +4474,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_s3_2_20_128", "sha256": "9b8f061683e06703d5728f22379c31d39bcb1bdcb418e38957cdea886c2aea00", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/s3/2.20.128/s3-2.20.128.jar" @@ -4717,19 +4482,17 @@ } }, "io_netty_netty_codec_socks": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec_socks", "generating_repository": "maven", "target_name": "io_netty_netty_codec_socks" } }, "io_netty_netty_buffer": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_buffer", "generating_repository": "maven", "target_name": "io_netty_netty_buffer" } @@ -4738,7 +4501,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec_http2_4_1_94_Final", "sha256": "8fbd2e95abec6155b60ed3c9c1600ed4e17ffe3f053cd5a40677d879c0af961f", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec-http2/4.1.94.Final/netty-codec-http2-4.1.94.Final.jar" @@ -4750,7 +4512,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_protocol_core_2_20_128", "sha256": "59107235409e9af0ec2f68aaad0d6cfe78b79e23600a59081a3f2af83e81c3c2", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/protocol-core/2.20.128/protocol-core-2.20.128.jar" @@ -4759,10 +4520,9 @@ } }, "io_grpc_grpc_netty": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_netty", "generating_repository": "maven", "target_name": "io_grpc_grpc_netty" } @@ -4771,7 +4531,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_arns_2_20_128", "sha256": "db6e5c582aaafcbe2e1804090505c6dbd76188b2a1661ecfd06afb7e949985b9", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/arns/2.20.128/arns-2.20.128.jar" @@ -4783,7 +4542,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_third_party_jackson_core_2_20_128", "sha256": "5487638bb3033b4de5f9cc04d97c4b5ec48533f2617803818e6263edc58b37cc", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/third-party-jackson-core/2.20.128/third-party-jackson-core-2.20.128.jar" @@ -4792,10 +4550,9 @@ } }, "org_checkerframework_checker_compat_qual": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_checkerframework_checker_compat_qual", "generating_repository": "maven", "target_name": "org_checkerframework_checker_compat_qual" } @@ -4804,7 +4561,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_apache_httpcomponents_httpclient_4_5_14", "sha256": "c8bc7e1c51a6d4ce72f40d2ebbabf1c4b68bfe76e732104b04381b493478e9d6", "urls": [ "https://repo1.maven.org/maven2/org/apache/httpcomponents/httpclient/4.5.14/httpclient-4.5.14.jar" @@ -4813,19 +4569,17 @@ } }, "io_netty_netty_codec_http2": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec_http2", "generating_repository": "maven", "target_name": "io_netty_netty_codec_http2" } }, "io_netty_netty_transport_classes_epoll": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_classes_epoll", "generating_repository": "maven", "target_name": "io_netty_netty_transport_classes_epoll" } @@ -4834,7 +4588,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_api_common_2_15_0", "sha256": "8c56f69021f1e6dc5bbf5597459220df176d78278456c5a80b47369c83af251b", "urls": [ "https://repo1.maven.org/maven2/com/google/api/api-common/2.15.0/api-common-2.15.0.jar" @@ -4846,7 +4599,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_core_1_56_1", "sha256": "fddeafc25019b7e5600028d6398e9ed7383056d9aecaf95aec5c39c5085a4830", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-core/1.56.1/grpc-core-1.56.1.jar" @@ -4858,7 +4610,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_services_1_56_1", "sha256": "0d14ece28e97b30aa9ef1b63782d48261dd63738ef1c5615afefb8b963c121c8", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-services/1.56.1/grpc-services-1.56.1.jar" @@ -4867,10 +4618,9 @@ } }, "io_perfmark_perfmark_api": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_perfmark_perfmark_api", "generating_repository": "maven", "target_name": "io_perfmark_perfmark_api" } @@ -4879,7 +4629,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_regions_2_20_128", "sha256": "79ac0d6a19daf4b5cb480a955bc36ed083e728fd2d0fb78efde2bcaaed0fce9f", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/regions/2.20.128/regions-2.20.128.jar" @@ -4891,7 +4640,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_grpc_grpc_google_cloud_storage_v2_2_26_1_alpha", "sha256": "c5fa3121300bf3558248792ca8279f13208b395f6ba5e004ae32fcb2964810bd", "urls": [ "https://repo1.maven.org/maven2/com/google/api/grpc/grpc-google-cloud-storage-v2/2.26.1-alpha/grpc-google-cloud-storage-v2-2.26.1-alpha.jar" @@ -4900,10 +4648,9 @@ } }, "io_grpc_grpc_context": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_context", "generating_repository": "maven", "target_name": "io_grpc_grpc_context" } @@ -4912,7 +4659,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_codehaus_plexus_plexus_utils_3_5_1", "sha256": "86e0255d4c879c61b4833ed7f13124e8bb679df47debb127326e7db7dd49a07b", "urls": [ "https://repo1.maven.org/maven2/org/codehaus/plexus/plexus-utils/3.5.1/plexus-utils-3.5.1.jar" @@ -4924,7 +4670,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_handler_4_1_94_Final", "sha256": "8e50719a9ab89e33ef85c5f36d780e0d7056b3f768b07d261d87baed7094eb3c", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-handler/4.1.94.Final/netty-handler-4.1.94.Final.jar" @@ -4936,7 +4681,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_http_client_google_http_client_1_43_3", "sha256": "60aca7428c5a1ff3655b70541a98ff3d70dded48ac1324dae1af39f1b61914af", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client/1.43.3/google-http-client-1.43.3.jar" @@ -4948,7 +4692,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_classes_epoll_4_1_97_Final", "sha256": "ee65fa17fe65f18fd22269f92bddad85bfb3a263cf65eba01e116a2f30b86ff5", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-epoll/4.1.97.Final/netty-transport-classes-epoll-4.1.97.Final.jar" @@ -4957,10 +4700,9 @@ } }, "com_google_code_findbugs_jsr305": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_code_findbugs_jsr305", "generating_repository": "maven", "target_name": "com_google_code_findbugs_jsr305" } @@ -4969,7 +4711,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_opencensus_opencensus_proto_0_2_0", "sha256": "0c192d451e9dd74e98721b27d02f0e2b6bca44b51563b5dabf2e211f7a3ebf13", "urls": [ "https://repo1.maven.org/maven2/io/opencensus/opencensus-proto/0.2.0/opencensus-proto-0.2.0.jar" @@ -4981,7 +4722,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_slf4j_slf4j_api_1_7_30", "sha256": "cdba07964d1bb40a0761485c6b1e8c2f8fd9eb1d19c53928ac0d7f9510105c57", "urls": [ "https://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.30/slf4j-api-1.7.30.jar" @@ -4990,10 +4730,9 @@ } }, "io_netty_netty_transport": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport", "generating_repository": "maven", "target_name": "io_netty_netty_transport" } @@ -5002,7 +4741,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~commons_logging_commons_logging_1_2", "sha256": "daddea1ea0be0f56978ab3006b8ac92834afeefbd9b7e4e6316fca57df0fa636", "urls": [ "https://repo1.maven.org/maven2/commons-logging/commons-logging/1.2/commons-logging-1.2.jar" @@ -5014,7 +4752,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_errorprone_error_prone_annotations_2_18_0", "sha256": "9e6814cb71816988a4fd1b07a993a8f21bb7058d522c162b1de849e19bea54ae", "urls": [ "https://repo1.maven.org/maven2/com/google/errorprone/error_prone_annotations/2.18.0/error_prone_annotations-2.18.0.jar" @@ -5026,7 +4763,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec_4_1_94_Final", "sha256": "91243776ad68b4d8e39eafb9ec115e1b8fa9aecd147b12ef15bb691639498328", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec/4.1.94.Final/netty-codec-4.1.94.Final.jar" @@ -5035,10 +4771,9 @@ } }, "com_google_guava_listenablefuture": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_guava_listenablefuture", "generating_repository": "maven", "target_name": "com_google_guava_listenablefuture" } @@ -5047,7 +4782,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_conscrypt_conscrypt_openjdk_uber_2_5_2", "sha256": "eaf537d98e033d0f0451cd1b8cc74e02d7b55ec882da63c88060d806ba89c348", "urls": [ "https://repo1.maven.org/maven2/org/conscrypt/conscrypt-openjdk-uber/2.5.2/conscrypt-openjdk-uber-2.5.2.jar" @@ -5056,19 +4790,17 @@ } }, "org_checkerframework_checker_qual": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_checkerframework_checker_qual", "generating_repository": "maven", "target_name": "org_checkerframework_checker_qual" } }, "com_google_errorprone_error_prone_annotations": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_errorprone_error_prone_annotations", "generating_repository": "maven", "target_name": "com_google_errorprone_error_prone_annotations" } @@ -5077,7 +4809,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_checkerframework_checker_qual_3_41_0", "sha256": "2f9f245bf68e4259d610894f2406dc1f6363dc639302bd566e8272e4f4541172", "urls": [ "https://repo1.maven.org/maven2/org/checkerframework/checker-qual/3.41.0/checker-qual-3.41.0.jar" @@ -5086,19 +4817,17 @@ } }, "com_google_protobuf_protobuf_javalite": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_protobuf_protobuf_javalite", "generating_repository": "maven", "target_name": "com_google_protobuf_protobuf_javalite" } }, "org_objenesis_objenesis": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_objenesis_objenesis", "generating_repository": "maven", "target_name": "org_objenesis_objenesis" } @@ -5107,7 +4836,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_protobuf_protobuf_java_3_23_2", "sha256": "18a057f5e0f828daa92b71c19df91f6bcc2aad067ca2cdd6b5698055ca7bcece", "urls": [ "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/3.23.2/protobuf-java-3.23.2.jar" @@ -5119,7 +4847,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_stub_1_57_0", "sha256": "6e6ee141539fa14d9fa479f7f511605544443c7e011e78e273cf9468aa183060", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-stub/1.57.0/grpc-stub-1.57.0.jar" @@ -5128,10 +4855,9 @@ } }, "io_netty_netty_transport_native_epoll": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_native_epoll", "generating_repository": "maven", "target_name": "io_netty_netty_transport_native_epoll" } @@ -5140,7 +4866,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_buffer_4_1_94_Final", "sha256": "8066ee7c49f9f29da96ee62f7cb13bee022cb4b68e51437b33da3b6d01398f13", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-buffer/4.1.94.Final/netty-buffer-4.1.94.Final.jar" @@ -5149,10 +4874,9 @@ } }, "maven": { - "bzlFile": "@@rules_jvm_external~6.0//:coursier.bzl", + "bzlFile": "@@rules_jvm_external~//:coursier.bzl", "ruleClassName": "pinned_coursier_fetch", "attributes": { - "name": "rules_jvm_external~6.0~maven~maven", "user_provided_name": "maven", "repositories": [ "{ \"repo_url\": \"https://repo1.maven.org/maven2\" }" @@ -5223,7 +4947,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_cloud_google_cloud_core_2_22_0", "sha256": "5bc01f00878cb5bf2dcd596cc577979357460f311807aee65aaa6837bdf0eef9", "urls": [ "https://repo1.maven.org/maven2/com/google/cloud/google-cloud-core/2.22.0/google-cloud-core-2.22.0.jar" @@ -5235,7 +4958,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_aws_query_protocol_2_20_128", "sha256": "dddab4ee63ad1bbc42bfcb3a9085917983ff4b5db71bc60b7ba6c5c17cbe5256", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/aws-query-protocol/2.20.128/aws-query-protocol-2.20.128.jar" @@ -5247,7 +4969,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_http_client_google_http_client_jackson2_1_43_3", "sha256": "8157f93ce7b51a013ea8c514413db6647056e39d7acb829bfc5da5b3bd25db3e", "urls": [ "https://repo1.maven.org/maven2/com/google/http-client/google-http-client-jackson2/1.43.3/google-http-client-jackson2-1.43.3.jar" @@ -5259,7 +4980,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_googleapis_1_56_1", "sha256": "39b880dc2da28695984bdb77c1fb052e2d3e446d1fbd902e00ea27bebf5f7860", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-googleapis/1.56.1/grpc-googleapis-1.56.1.jar" @@ -5271,7 +4991,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_gax_2_32_0", "sha256": "eedeceb93a8d92e3b5d9781c87db1deb3d72eb545ae4e27a18cddde4100a5173", "urls": [ "https://repo1.maven.org/maven2/com/google/api/gax/2.32.0/gax-2.32.0.jar" @@ -5283,7 +5002,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_googlecode_java_diff_utils_diffutils_1_3_0", "sha256": "61ba4dc49adca95243beaa0569adc2a23aedb5292ae78aa01186fa782ebdc5c2", "urls": [ "https://repo1.maven.org/maven2/com/googlecode/java-diff-utils/diffutils/1.3.0/diffutils-1.3.0.jar" @@ -5295,7 +5013,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_classes_kqueue_4_1_97_Final", "sha256": "964ef63eb24a5c979f0af473da13f9574497e11bd41543a66d10609d34013b9f", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport-classes-kqueue/4.1.97.Final/netty-transport-classes-kqueue-4.1.97.Final.jar" @@ -5307,7 +5024,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_grpclb_1_56_1", "sha256": "6ba786cc5271c7355cb0cdb57660d807cbf0f082b50edae15232e8c354228496", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-grpclb/1.56.1/grpc-grpclb-1.56.1.jar" @@ -5319,7 +5035,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec_socks_4_1_93_Final", "sha256": "0ea47b5ba23ca1da8eb9146c8fc755c1271414633b1e2be2ce1df764ba0fff2a", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-codec-socks/4.1.93.Final/netty-codec-socks-4.1.93.Final.jar" @@ -5331,7 +5046,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_context_1_57_0", "sha256": "953fcacd82f531e69b76e3834f5830bad4c22ae84144e058d71dc80a7430275d", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-context/1.57.0/grpc-context-1.57.0.jar" @@ -5340,10 +5054,9 @@ } }, "io_grpc_grpc_protobuf": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_protobuf", "generating_repository": "maven", "target_name": "io_grpc_grpc_protobuf" } @@ -5352,7 +5065,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_apache_tomcat_annotations_api_6_0_53", "sha256": "253829d3c12b7381d1044fc22c6436cff025fe0d459e4a329413e560a7d0dd13", "urls": [ "https://repo1.maven.org/maven2/org/apache/tomcat/annotations-api/6.0.53/annotations-api-6.0.53.jar" @@ -5364,7 +5076,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_api_1_57_0", "sha256": "8d2c384299f84ee8aa7f670f00e7cb26b87e231cf3091474307b32b76910f71c", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-api/1.57.0/grpc-api-1.57.0.jar" @@ -5373,19 +5084,17 @@ } }, "junit_junit": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~junit_junit", "generating_repository": "maven", "target_name": "junit_junit" } }, "org_apache_tomcat_annotations_api": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_apache_tomcat_annotations_api", "generating_repository": "maven", "target_name": "org_apache_tomcat_annotations_api" } @@ -5394,7 +5103,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_protobuf_protobuf_javalite_3_22_3", "sha256": "9d26bebd2607fd0553cedbfc3e4a3d3f06c6e7a207d2b74c87fa6181838ed1bf", "urls": [ "https://repo1.maven.org/maven2/com/google/protobuf/protobuf-javalite/3.22.3/protobuf-javalite-3.22.3.jar" @@ -5403,10 +5111,9 @@ } }, "io_netty_netty_codec_http": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_codec_http", "generating_repository": "maven", "target_name": "io_netty_netty_codec_http" } @@ -5415,7 +5122,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~net_bytebuddy_byte_buddy_1_14_10", "sha256": "30e6e0446437a67db37e2b7f7d33f50787ddfd970359319dfd05469daa2dcbce", "urls": [ "https://repo1.maven.org/maven2/net/bytebuddy/byte-buddy/1.14.10/byte-buddy-1.14.10.jar" @@ -5424,10 +5130,9 @@ } }, "com_google_truth_extensions_truth_java8_extension": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_truth_extensions_truth_java8_extension", "generating_repository": "maven", "target_name": "com_google_truth_extensions_truth_java8_extension" } @@ -5436,7 +5141,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_android_annotations_4_1_1_4", "sha256": "ba734e1e84c09d615af6a09d33034b4f0442f8772dec120efb376d86a565ae15", "urls": [ "https://repo1.maven.org/maven2/com/google/android/annotations/4.1.1.4/annotations-4.1.1.4.jar" @@ -5448,7 +5152,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~commons_codec_commons_codec_1_15", "sha256": "b3e9f6d63a790109bf0d056611fbed1cf69055826defeb9894a71369d246ed63", "urls": [ "https://repo1.maven.org/maven2/commons-codec/commons-codec/1.15/commons-codec-1.15.jar" @@ -5457,19 +5160,17 @@ } }, "com_google_api_grpc_proto_google_common_protos": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_api_grpc_proto_google_common_protos", "generating_repository": "maven", "target_name": "com_google_api_grpc_proto_google_common_protos" } }, "com_google_guava_guava": { - "bzlFile": "@@rules_jvm_external~6.0//private:compat_repository.bzl", + "bzlFile": "@@rules_jvm_external~//private:compat_repository.bzl", "ruleClassName": "compat_repository", "attributes": { - "name": "rules_jvm_external~6.0~maven~com_google_guava_guava", "generating_repository": "maven", "target_name": "com_google_guava_guava" } @@ -5478,7 +5179,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_common_4_1_97_Final", "sha256": "a8aca0c8e9347acc75c885ecc749195d9775369aa520b9276f2d1128210a6c17", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-common/4.1.97.Final/netty-common-4.1.97.Final.jar" @@ -5490,7 +5190,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_grpc_grpc_protobuf_lite_1_57_0", "sha256": "2c507c02d981b84a21763d44e09af4f279881dd3e25be3080f6361258607f198", "urls": [ "https://repo1.maven.org/maven2/io/grpc/grpc-protobuf-lite/1.57.0/grpc-protobuf-lite-1.57.0.jar" @@ -5502,7 +5201,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~software_amazon_awssdk_annotations_2_20_128", "sha256": "4eeddb1848a90c73b8ce85d7b556f0be36f0f97c780f1715b9cb59a93620eae2", "urls": [ "https://repo1.maven.org/maven2/software/amazon/awssdk/annotations/2.20.128/annotations-2.20.128.jar" @@ -5514,7 +5212,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~org_mockito_mockito_core_5_8_0", "sha256": "c320f662a03c2951edcc51a44b64d79a8e994373ff548453b5fdaf69debe4682", "urls": [ "https://repo1.maven.org/maven2/org/mockito/mockito-core/5.8.0/mockito-core-5.8.0.jar" @@ -5526,7 +5223,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_jvm_external~6.0~maven~io_netty_netty_transport_native_unix_common_4_1_94_Final", "sha256": "27d0dff1cd743190279becacfb372fe4d45b266edafad9f1c6c01b04d00280eb", "urls": [ "https://repo1.maven.org/maven2/io/netty/netty-transport-native-unix-common/4.1.94.Final/netty-transport-native-unix-common-4.1.94.Final.jar" @@ -5537,24 +5233,24 @@ }, "recordedRepoMappingEntries": [ [ - "rules_jvm_external~6.0", + "rules_jvm_external~", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_kotlin~1.9.0//src/main/starlark/core/repositories:bzlmod_setup.bzl%rules_kotlin_extensions": { + "@@rules_kotlin~//src/main/starlark/core/repositories:bzlmod_setup.bzl%rules_kotlin_extensions": { "general": { - "bzlTransitiveDigest": "i+Zxd+SgLbZqTLF+shombR5Pmc99aednkh48BQE7r3s=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "cpxTcL738gCjtgyCx1VmgcsVD8mtk0yaJLtWRwXBKJ8=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "rules_android": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_kotlin~1.9.0~rules_kotlin_extensions~rules_android", "sha256": "cd06d15dd8bb59926e4d65f9003bfc20f9da4b2519985c27e190cddc8b7a7806", "strip_prefix": "rules_android-0.1.1", "urls": [ @@ -5566,7 +5262,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_kotlin~1.9.0~rules_kotlin_extensions~com_github_pinterest_ktlint", "sha256": "2b3f6f674a944d25bb8d283c3539947bbe86074793012909a55de4b771f74bcc", "urls": [ "https://github.com/pinterest/ktlint/releases/download/0.49.1/ktlint" @@ -5578,17 +5273,15 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_kotlin~1.9.0~rules_kotlin_extensions~buildkite_config", "urls": [ "https://storage.googleapis.com/rbe-toolchain/bazel-configs/rbe-ubuntu1604/latest/rbe_default.tar" ] } }, "com_github_jetbrains_kotlin": { - "bzlFile": "@@rules_kotlin~1.9.0//src/main/starlark/core/repositories:compiler.bzl", + "bzlFile": "@@rules_kotlin~//src/main/starlark/core/repositories:compiler.bzl", "ruleClassName": "kotlin_compiler_repository", "attributes": { - "name": "rules_kotlin~1.9.0~rules_kotlin_extensions~com_github_jetbrains_kotlin", "urls": [ "https://github.com/JetBrains/kotlin/releases/download/v1.9.10/kotlin-compiler-1.9.10.zip" ], @@ -5597,10 +5290,9 @@ } }, "com_github_google_ksp": { - "bzlFile": "@@rules_kotlin~1.9.0//src/main/starlark/core/repositories:ksp.bzl", + "bzlFile": "@@rules_kotlin~//src/main/starlark/core/repositories:ksp.bzl", "ruleClassName": "ksp_compiler_plugin_repository", "attributes": { - "name": "rules_kotlin~1.9.0~rules_kotlin_extensions~com_github_google_ksp", "urls": [ "https://github.com/google/ksp/releases/download/1.9.10-1.0.13/artifacts.zip" ], @@ -5612,7 +5304,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_file", "attributes": { - "name": "rules_kotlin~1.9.0~rules_kotlin_extensions~kt_java_stub_template", "urls": [ "https://raw.githubusercontent.com/bazelbuild/bazel/6.2.1/src/main/java/com/google/devtools/build/lib/bazel/rules/java/java_stub_template.txt" ], @@ -5622,24 +5313,24 @@ }, "recordedRepoMappingEntries": [ [ - "rules_kotlin~1.9.0", + "rules_kotlin~", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_python~0.31.0//python/extensions:python.bzl%python": { + "@@rules_python~//python/extensions:python.bzl%python": { "general": { - "bzlTransitiveDigest": "nfcQ92K2B0JOoUwqlGTKoGF7+XoHjDW/y8t8LMG8TE4=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "iiPikoKvnpwOgbGu/g38NtUIUQuF7N9KqMl5LqIvWaQ=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "python_3_11_s390x-unknown-linux-gnu": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_11_s390x-unknown-linux-gnu", "sha256": "49520e3ff494708020f306e30b0964f079170be83e956be4504f850557378a22", "patches": [], "platform": "s390x-unknown-linux-gnu", @@ -5655,10 +5346,9 @@ } }, "python_3_11_host": { - "bzlFile": "@@rules_python~0.31.0//python/private:toolchains_repo.bzl", + "bzlFile": "@@rules_python~//python/private:toolchains_repo.bzl", "ruleClassName": "host_toolchain", "attributes": { - "name": "rules_python~0.31.0~python~python_3_11_host", "python_version": "3.11.7", "user_repository_name": "python_3_11", "platforms": [ @@ -5673,10 +5363,9 @@ } }, "python_3_11_aarch64-unknown-linux-gnu": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_11_aarch64-unknown-linux-gnu", "sha256": "b102eaf865eb715aa98a8a2ef19037b6cc3ae7dfd4a632802650f29de635aa13", "patches": [], "platform": "aarch64-unknown-linux-gnu", @@ -5692,10 +5381,9 @@ } }, "python_3_11_aarch64-apple-darwin": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_11_aarch64-apple-darwin", "sha256": "b042c966920cf8465385ca3522986b12d745151a72c060991088977ca36d3883", "patches": [], "platform": "aarch64-apple-darwin", @@ -5714,13 +5402,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_x86_64-unknown-linux-gnu_coverage", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"@python_3_12_x86_64-unknown-linux-gnu//:__subpackages__\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.31.0//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "fe558371c1bdf3b8fa03e097c523fb9645b8730399c14fe7721ee9c9e2a545d3", "type": "zip", @@ -5730,10 +5417,9 @@ } }, "pythons_hub": { - "bzlFile": "@@rules_python~0.31.0//python/private/bzlmod:pythons_hub.bzl", + "bzlFile": "@@rules_python~//python/private/bzlmod:pythons_hub.bzl", "ruleClassName": "hub_repo", "attributes": { - "name": "rules_python~0.31.0~python~pythons_hub", "default_python_version": "3.12", "toolchain_prefixes": [ "_0000_python_3_11_", @@ -5754,10 +5440,9 @@ } }, "python_3_12_x86_64-pc-windows-msvc": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_x86_64-pc-windows-msvc", "sha256": "fd5a9e0f41959d0341246d3643f2b8794f638adc0cec8dd5e1b6465198eae08a", "patches": [], "platform": "x86_64-pc-windows-msvc", @@ -5773,10 +5458,9 @@ } }, "python_3_12_x86_64-unknown-linux-gnu": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_x86_64-unknown-linux-gnu", "sha256": "74e330b8212ca22fd4d9a2003b9eec14892155566738febc8e5e572f267b9472", "patches": [], "platform": "x86_64-unknown-linux-gnu", @@ -5792,10 +5476,9 @@ } }, "python_3_11_x86_64-pc-windows-msvc": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_11_x86_64-pc-windows-msvc", "sha256": "67077e6fa918e4f4fd60ba169820b00be7c390c497bf9bc9cab2c255ea8e6f3e", "patches": [], "platform": "x86_64-pc-windows-msvc", @@ -5814,13 +5497,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_aarch64-unknown-linux-gnu_coverage", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"@python_3_12_aarch64-unknown-linux-gnu//:__subpackages__\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.31.0//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "3e3424c554391dc9ef4a92ad28665756566a28fecf47308f91841f6c49288e66", "type": "zip", @@ -5830,10 +5512,9 @@ } }, "python_3_12_aarch64-apple-darwin": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_aarch64-apple-darwin", "sha256": "f93f8375ca6ac0a35d58ff007043cbd3a88d9609113f1cb59cf7c8d215f064af", "patches": [], "platform": "aarch64-apple-darwin", @@ -5849,10 +5530,9 @@ } }, "python_3_12": { - "bzlFile": "@@rules_python~0.31.0//python/private:toolchains_repo.bzl", + "bzlFile": "@@rules_python~//python/private:toolchains_repo.bzl", "ruleClassName": "toolchain_aliases", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12", "python_version": "3.12.1", "user_repository_name": "python_3_12", "platforms": [ @@ -5867,10 +5547,9 @@ } }, "python_3_12_x86_64-apple-darwin": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_x86_64-apple-darwin", "sha256": "eca96158c1568dedd9a0b3425375637a83764d1fa74446438293089a8bfac1f8", "patches": [], "platform": "x86_64-apple-darwin", @@ -5886,10 +5565,9 @@ } }, "python_3_12_s390x-unknown-linux-gnu": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_s390x-unknown-linux-gnu", "sha256": "60631211c701f8d2c56e5dd7b154e68868128a019b9db1d53a264f56c0d4aee2", "patches": [], "platform": "s390x-unknown-linux-gnu", @@ -5905,10 +5583,9 @@ } }, "python_3_12_aarch64-unknown-linux-gnu": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_aarch64-unknown-linux-gnu", "sha256": "236533ef20e665007a111c2f36efb59c87ae195ad7dca223b6dc03fb07064f0b", "patches": [], "platform": "aarch64-unknown-linux-gnu", @@ -5924,10 +5601,9 @@ } }, "python_3_11": { - "bzlFile": "@@rules_python~0.31.0//python/private:toolchains_repo.bzl", + "bzlFile": "@@rules_python~//python/private:toolchains_repo.bzl", "ruleClassName": "toolchain_aliases", "attributes": { - "name": "rules_python~0.31.0~python~python_3_11", "python_version": "3.11.7", "user_repository_name": "python_3_11", "platforms": [ @@ -5942,10 +5618,9 @@ } }, "python_3_11_ppc64le-unknown-linux-gnu": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_11_ppc64le-unknown-linux-gnu", "sha256": "b44e1b74afe75c7b19143413632c4386708ae229117f8f950c2094e9681d34c7", "patches": [], "platform": "ppc64le-unknown-linux-gnu", @@ -5961,10 +5636,9 @@ } }, "python_3_11_x86_64-apple-darwin": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_11_x86_64-apple-darwin", "sha256": "a0e615eef1fafdc742da0008425a9030b7ea68a4ae4e73ac557ef27b112836d4", "patches": [], "platform": "x86_64-apple-darwin", @@ -5980,10 +5654,9 @@ } }, "python_versions": { - "bzlFile": "@@rules_python~0.31.0//python/private:toolchains_repo.bzl", + "bzlFile": "@@rules_python~//python/private:toolchains_repo.bzl", "ruleClassName": "multi_toolchain_aliases", "attributes": { - "name": "rules_python~0.31.0~python~python_versions", "python_versions": { "3.12": "python_3_12", "3.11": "python_3_11" @@ -5994,13 +5667,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_aarch64-apple-darwin_coverage", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"@python_3_12_aarch64-apple-darwin//:__subpackages__\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.31.0//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "23b27b8a698e749b61809fb637eb98ebf0e505710ec46a8aa6f1be7dc0dc43a6", "type": "zip", @@ -6010,10 +5682,9 @@ } }, "python_3_12_ppc64le-unknown-linux-gnu": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_ppc64le-unknown-linux-gnu", "sha256": "78051f0d1411ee62bc2af5edfccf6e8400ac4ef82887a2affc19a7ace6a05267", "patches": [], "platform": "ppc64le-unknown-linux-gnu", @@ -6029,10 +5700,9 @@ } }, "python_3_12_host": { - "bzlFile": "@@rules_python~0.31.0//python/private:toolchains_repo.bzl", + "bzlFile": "@@rules_python~//python/private:toolchains_repo.bzl", "ruleClassName": "host_toolchain", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_host", "python_version": "3.12.1", "user_repository_name": "python_3_12", "platforms": [ @@ -6050,13 +5720,12 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~python~python_3_12_x86_64-apple-darwin_coverage", "build_file_content": "\nfilegroup(\n name = \"coverage\",\n srcs = [\"coverage/__main__.py\"],\n data = glob([\"coverage/*.py\", \"coverage/**/*.py\", \"coverage/*.so\"]),\n visibility = [\"@python_3_12_x86_64-apple-darwin//:__subpackages__\"],\n)\n ", "patch_args": [ "-p1" ], "patches": [ - "@@rules_python~0.31.0//python/private:coverage.patch" + "@@rules_python~//python/private:coverage.patch" ], "sha256": "f68ef3660677e6624c8cace943e4765545f8191313a07288a53d3da188bd8581", "type": "zip", @@ -6066,10 +5735,9 @@ } }, "python_3_11_x86_64-unknown-linux-gnu": { - "bzlFile": "@@rules_python~0.31.0//python:repositories.bzl", + "bzlFile": "@@rules_python~//python:repositories.bzl", "ruleClassName": "python_repository", "attributes": { - "name": "rules_python~0.31.0~python~python_3_11_x86_64-unknown-linux-gnu", "sha256": "4a51ce60007a6facf64e5495f4cf322e311ba9f39a8cd3f3e4c026eae488e140", "patches": [], "platform": "x86_64-unknown-linux-gnu", @@ -6087,29 +5755,29 @@ }, "recordedRepoMappingEntries": [ [ - "rules_python~0.31.0", + "rules_python~", "bazel_skylib", - "bazel_skylib~1.5.0" + "bazel_skylib~" ], [ - "rules_python~0.31.0", + "rules_python~", "bazel_tools", "bazel_tools" ] ] } }, - "@@rules_python~0.31.0//python/private/bzlmod:internal_deps.bzl%internal_deps": { + "@@rules_python~//python/private/bzlmod:internal_deps.bzl%internal_deps": { "general": { - "bzlTransitiveDigest": "YM6cXp9AuQVARYWBY5VPn25r/wLyW6Lq09HCAiVNngE=", - "accumulatedFileDigests": {}, + "bzlTransitiveDigest": "7gPkjo3H+IUX8tPkLBs0bZkgYQjrgl/lYj7+eBvwSNU=", + "recordedFileInputs": {}, + "recordedDirentsInputs": {}, "envVariables": {}, "generatedRepoSpecs": { "pypi__wheel": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__wheel", "url": "https://files.pythonhosted.org/packages/b8/8b/31273bf66016be6ad22bb7345c37ff350276cfd46e389a0c2ac5da9d9073/wheel-0.41.2-py3-none-any.whl", "sha256": "75909db2664838d015e3d9139004ee16711748a52c8f336b52882266540215d8", "type": "zip", @@ -6120,7 +5788,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__click", "url": "https://files.pythonhosted.org/packages/00/2e/d53fa4befbf2cfa713304affc7ca780ce4fc1fd8710527771b58311a3229/click-8.1.7-py3-none-any.whl", "sha256": "ae74fb96c20a0277a1d615f1e4d73c8414f5a98db8b799a7931d1582f3390c28", "type": "zip", @@ -6131,7 +5798,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__importlib_metadata", "url": "https://files.pythonhosted.org/packages/cc/37/db7ba97e676af155f5fcb1a35466f446eadc9104e25b83366e8088c9c926/importlib_metadata-6.8.0-py3-none-any.whl", "sha256": "3ebb78df84a805d7698245025b975d9d67053cd94c79245ba4b3eb694abe68bb", "type": "zip", @@ -6142,7 +5808,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__pyproject_hooks", "url": "https://files.pythonhosted.org/packages/d5/ea/9ae603de7fbb3df820b23a70f6aff92bf8c7770043254ad8d2dc9d6bcba4/pyproject_hooks-1.0.0-py3-none-any.whl", "sha256": "283c11acd6b928d2f6a7c73fa0d01cb2bdc5f07c57a2eeb6e83d5e56b97976f8", "type": "zip", @@ -6153,7 +5818,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__pep517", "url": "https://files.pythonhosted.org/packages/ee/2f/ef63e64e9429111e73d3d6cbee80591672d16f2725e648ebc52096f3d323/pep517-0.13.0-py3-none-any.whl", "sha256": "4ba4446d80aed5b5eac6509ade100bff3e7943a8489de249654a5ae9b33ee35b", "type": "zip", @@ -6164,7 +5828,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__packaging", "url": "https://files.pythonhosted.org/packages/ab/c3/57f0601a2d4fe15de7a553c00adbc901425661bf048f2a22dfc500caf121/packaging-23.1-py3-none-any.whl", "sha256": "994793af429502c4ea2ebf6bf664629d07c1a9fe974af92966e4b8d2df7edc61", "type": "zip", @@ -6175,7 +5838,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__pip_tools", "url": "https://files.pythonhosted.org/packages/e8/df/47e6267c6b5cdae867adbdd84b437393e6202ce4322de0a5e0b92960e1d6/pip_tools-7.3.0-py3-none-any.whl", "sha256": "8717693288720a8c6ebd07149c93ab0be1fced0b5191df9e9decd3263e20d85e", "type": "zip", @@ -6186,7 +5848,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__setuptools", "url": "https://files.pythonhosted.org/packages/4f/ab/0bcfebdfc3bfa8554b2b2c97a555569c4c1ebc74ea288741ea8326c51906/setuptools-68.1.2-py3-none-any.whl", "sha256": "3d8083eed2d13afc9426f227b24fd1659489ec107c0e86cec2ffdde5c92e790b", "type": "zip", @@ -6197,7 +5858,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__zipp", "url": "https://files.pythonhosted.org/packages/8c/08/d3006317aefe25ea79d3b76c9650afabaf6d63d1c8443b236e7405447503/zipp-3.16.2-py3-none-any.whl", "sha256": "679e51dd4403591b2d6838a48de3d283f3d188412a9782faadf845f298736ba0", "type": "zip", @@ -6208,7 +5868,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__colorama", "url": "https://files.pythonhosted.org/packages/d1/d6/3965ed04c63042e047cb6a3e6ed1a63a35087b6a609aa3a15ed8ac56c221/colorama-0.4.6-py2.py3-none-any.whl", "sha256": "4f1d9991f5acc0ca119f9d443620b77f9d6b33703e51011c16baf57afb285fc6", "type": "zip", @@ -6219,7 +5878,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__build", "url": "https://files.pythonhosted.org/packages/58/91/17b00d5fac63d3dca605f1b8269ba3c65e98059e1fd99d00283e42a454f0/build-0.10.0-py3-none-any.whl", "sha256": "af266720050a66c893a6096a2f410989eeac74ff9a68ba194b3f6473e8e26171", "type": "zip", @@ -6227,17 +5885,14 @@ } }, "rules_python_internal": { - "bzlFile": "@@rules_python~0.31.0//python/private:internal_config_repo.bzl", + "bzlFile": "@@rules_python~//python/private:internal_config_repo.bzl", "ruleClassName": "internal_config_repo", - "attributes": { - "name": "rules_python~0.31.0~internal_deps~rules_python_internal" - } + "attributes": {} }, "pypi__pip": { "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__pip", "url": "https://files.pythonhosted.org/packages/50/c2/e06851e8cc28dcad7c155f4753da8833ac06a5c704c109313b8d5a62968a/pip-23.2.1-py3-none-any.whl", "sha256": "7ccf472345f20d35bdc9d1841ff5f313260c2c33fe417f48c30ac46cccabf5be", "type": "zip", @@ -6248,7 +5903,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__installer", "url": "https://files.pythonhosted.org/packages/e5/ca/1172b6638d52f2d6caa2dd262ec4c811ba59eee96d54a7701930726bce18/installer-0.7.0-py3-none-any.whl", "sha256": "05d1933f0a5ba7d8d6296bb6d5018e7c94fa473ceb10cf198a92ccea19c27b53", "type": "zip", @@ -6259,7 +5913,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__more_itertools", "url": "https://files.pythonhosted.org/packages/5a/cb/6dce742ea14e47d6f565589e859ad225f2a5de576d7696e0623b784e226b/more_itertools-10.1.0-py3-none-any.whl", "sha256": "64e0735fcfdc6f3464ea133afe8ea4483b1c5fe3a3d69852e6503b43a0b222e6", "type": "zip", @@ -6270,7 +5923,6 @@ "bzlFile": "@@bazel_tools//tools/build_defs/repo:http.bzl", "ruleClassName": "http_archive", "attributes": { - "name": "rules_python~0.31.0~internal_deps~pypi__tomli", "url": "https://files.pythonhosted.org/packages/97/75/10a9ebee3fd790d20926a90a2547f0bf78f371b2f13aa822c759680ca7b9/tomli-2.0.1-py3-none-any.whl", "sha256": "939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc", "type": "zip", @@ -6280,7 +5932,7 @@ }, "recordedRepoMappingEntries": [ [ - "rules_python~0.31.0", + "rules_python~", "bazel_tools", "bazel_tools" ] diff --git a/aspect/intellij_info_impl.bzl b/aspect/intellij_info_impl.bzl index 4cf0fa401a4..98983f87641 100644 --- a/aspect/intellij_info_impl.bzl +++ b/aspect/intellij_info_impl.bzl @@ -13,6 +13,11 @@ load( ":make_variables.bzl", "expand_make_variables", ) +load( + "@bazel_tools//tools/build_defs/cc:action_names.bzl", + "ACTION_NAMES", +) + # Defensive list of features that can appear in the C++ toolchain, but which we # definitely don't want to enable (when enabled, they'd contribute command line @@ -109,6 +114,11 @@ SRC_PY3ONLY = 5 ##### Helpers +def get_registry_flag(ctx, name): + """Registry flags are passed to aspects using defines. See CppAspectArgsProvider.""" + + return ctx.var.get(name) == "true" + def source_directory_tuple(resource_file): """Creates a tuple of (exec_path, root_exec_path_fragment, is_source, is_external).""" relative_path = str(android_common.resource_source_directory(resource_file)) @@ -505,56 +515,56 @@ def collect_c_toolchain_info(target, ctx, semantics, ide_info, ide_info_file, ou # cpp fragment to access bazel options cpp_fragment = ctx.fragments.cpp - # Enabled in Bazel 0.16 - if hasattr(cc_common, "get_memory_inefficient_command_line"): - # Enabled in Bazel 0.17 - if hasattr(cpp_fragment, "copts"): - copts = cpp_fragment.copts - cxxopts = cpp_fragment.cxxopts - conlyopts = cpp_fragment.conlyopts - else: - copts = [] - cxxopts = [] - conlyopts = [] - feature_configuration = cc_common.configure_features( - ctx = ctx, - cc_toolchain = cpp_toolchain, - requested_features = ctx.features, - unsupported_features = ctx.disabled_features + UNSUPPORTED_FEATURES, - ) - c_variables = cc_common.create_compile_variables( - feature_configuration = feature_configuration, - cc_toolchain = cpp_toolchain, - user_compile_flags = copts + conlyopts, - ) - cpp_variables = cc_common.create_compile_variables( - feature_configuration = feature_configuration, - cc_toolchain = cpp_toolchain, - user_compile_flags = copts + cxxopts, - ) - c_options = cc_common.get_memory_inefficient_command_line( + copts = cpp_fragment.copts + cxxopts = cpp_fragment.cxxopts + conlyopts = cpp_fragment.conlyopts + + feature_configuration = cc_common.configure_features( + ctx = ctx, + cc_toolchain = cpp_toolchain, + requested_features = ctx.features, + unsupported_features = ctx.disabled_features + UNSUPPORTED_FEATURES, + ) + c_variables = cc_common.create_compile_variables( + feature_configuration = feature_configuration, + cc_toolchain = cpp_toolchain, + user_compile_flags = copts + conlyopts, + ) + cpp_variables = cc_common.create_compile_variables( + feature_configuration = feature_configuration, + cc_toolchain = cpp_toolchain, + user_compile_flags = copts + cxxopts, + ) + c_options = cc_common.get_memory_inefficient_command_line( + feature_configuration = feature_configuration, + action_name = ACTION_NAMES.c_compile, + variables = c_variables, + ) + cpp_options = cc_common.get_memory_inefficient_command_line( + feature_configuration = feature_configuration, + action_name = ACTION_NAMES.cpp_compile, + variables = cpp_variables, + ) + + if (get_registry_flag(ctx, "_cpp_use_get_tool_for_action")): + c_compiler = cc_common.get_tool_for_action( feature_configuration = feature_configuration, - # TODO(#391): Use constants from action_names.bzl - action_name = "c-compile", - variables = c_variables, + action_name = ACTION_NAMES.c_compile, ) - cpp_options = cc_common.get_memory_inefficient_command_line( + cpp_compiler = cc_common.get_tool_for_action( feature_configuration = feature_configuration, - # TODO(#391): Use constants from action_names.bzl - action_name = "c++-compile", - variables = cpp_variables, + action_name = ACTION_NAMES.cpp_compile, ) else: - # See the plugin's BazelVersionChecker. We should have checked that we are Bazel 0.16+, - # so get_memory_inefficient_command_line should be available. - c_options = [] - cpp_options = [] + c_compiler = str(cpp_toolchain.compiler_executable) + cpp_compiler = str(cpp_toolchain.compiler_executable) c_toolchain_info = struct_omit_none( built_in_include_directory = [str(d) for d in cpp_toolchain.built_in_include_directories], c_option = c_options, - cpp_executable = str(cpp_toolchain.compiler_executable), cpp_option = cpp_options, + c_compiler = c_compiler, + cpp_compiler = cpp_compiler, target_name = cpp_toolchain.target_gnu_system_name, ) ide_info["c_toolchain_ide_info"] = c_toolchain_info diff --git a/aspect/testing/tests/src/com/google/idea/blaze/aspect/cpp/cctoolchain/CcToolchainTest.java b/aspect/testing/tests/src/com/google/idea/blaze/aspect/cpp/cctoolchain/CcToolchainTest.java index 2f4e19efe22..24045782d3f 100644 --- a/aspect/testing/tests/src/com/google/idea/blaze/aspect/cpp/cctoolchain/CcToolchainTest.java +++ b/aspect/testing/tests/src/com/google/idea/blaze/aspect/cpp/cctoolchain/CcToolchainTest.java @@ -40,7 +40,8 @@ public void testCcToolchain() throws Exception { for (TargetIdeInfo toolchain : toolchains) { CToolchainIdeInfo toolchainInfo = toolchain.getCToolchainIdeInfo(); assertThat(toolchainInfo.getBuiltInIncludeDirectoryList()).isNotEmpty(); - assertThat(toolchainInfo.getCppExecutable()).isNotEmpty(); + assertThat(toolchainInfo.getCCompiler()).isNotEmpty(); + assertThat(toolchainInfo.getCppCompiler()).isNotEmpty(); assertThat(toolchainInfo.getTargetName()).isNotEmpty(); assertThat(toolchainInfo.getCOptionList()).isNotEmpty(); assertThat(toolchainInfo.getCppOptionList()).isNotEmpty(); diff --git a/aswb/tests/integrationtests/com/google/idea/blaze/android/targetmapbuilder/NbTargetMapBuilderTest.java b/aswb/tests/integrationtests/com/google/idea/blaze/android/targetmapbuilder/NbTargetMapBuilderTest.java index 455b98db5fc..338544d00ad 100644 --- a/aswb/tests/integrationtests/com/google/idea/blaze/android/targetmapbuilder/NbTargetMapBuilderTest.java +++ b/aswb/tests/integrationtests/com/google/idea/blaze/android/targetmapbuilder/NbTargetMapBuilderTest.java @@ -65,7 +65,9 @@ public void testCcTargetMap() throws Exception { .setCToolchainInfo( CToolchainIdeInfo.builder() .setTargetName("arm-linux-androideabi") - .setCppExecutable( + .setCCompiler( + new ExecutionRootPath("bin/arm-linux-androideabi-gcc")) + .setCppCompiler( new ExecutionRootPath("bin/arm-linux-androideabi-gcc")) .addBuiltInIncludeDirectories( ImmutableList.of( @@ -79,7 +81,9 @@ public void testCcTargetMap() throws Exception { .setCToolchainInfo( CToolchainIdeInfo.builder() .setTargetName("aarch64-linux-android") - .setCppExecutable( + .setCCompiler( + new ExecutionRootPath("bin/aarch64-linux-android-gcc")) + .setCppCompiler( new ExecutionRootPath("bin/aarch64-linux-android-gcc")) .addBuiltInIncludeDirectories( ImmutableList.of( diff --git a/aswb/tests/utils/integration/com/google/idea/blaze/android/targetmapbuilder/NbCcToolchain.java b/aswb/tests/utils/integration/com/google/idea/blaze/android/targetmapbuilder/NbCcToolchain.java index 574e47f47d3..09003f55622 100644 --- a/aswb/tests/utils/integration/com/google/idea/blaze/android/targetmapbuilder/NbCcToolchain.java +++ b/aswb/tests/utils/integration/com/google/idea/blaze/android/targetmapbuilder/NbCcToolchain.java @@ -70,7 +70,8 @@ public NbCcToolchain cc_target_name(String targetName) { } public NbCcToolchain cpp_executable(String pathToExecutable) { - cToolchainIdeInfoBuilder.setCppExecutable(new ExecutionRootPath(pathToExecutable)); + cToolchainIdeInfoBuilder.setCCompiler(new ExecutionRootPath(pathToExecutable)); + cToolchainIdeInfoBuilder.setCppCompiler(new ExecutionRootPath(pathToExecutable)); return this; } diff --git a/base/src/com/google/idea/blaze/base/ideinfo/CToolchainIdeInfo.java b/base/src/com/google/idea/blaze/base/ideinfo/CToolchainIdeInfo.java index 05c6694e3a2..f2217101f3b 100644 --- a/base/src/com/google/idea/blaze/base/ideinfo/CToolchainIdeInfo.java +++ b/base/src/com/google/idea/blaze/base/ideinfo/CToolchainIdeInfo.java @@ -27,19 +27,22 @@ public final class CToolchainIdeInfo implements ProtoWrapper cCompilerOptions; private final ImmutableList cppCompilerOptions; private final ImmutableList builtInIncludeDirectories; - private final ExecutionRootPath cppExecutable; + private final ExecutionRootPath cCompiler; + private final ExecutionRootPath cppCompiler; private final String targetName; private CToolchainIdeInfo( ImmutableList cCompilerOptions, ImmutableList cppCompilerOptions, ImmutableList builtInIncludeDirectories, - ExecutionRootPath cppExecutable, + ExecutionRootPath cCompiler, + ExecutionRootPath cppCompiler, String targetName) { this.cCompilerOptions = cCompilerOptions; this.cppCompilerOptions = cppCompilerOptions; this.builtInIncludeDirectories = builtInIncludeDirectories; - this.cppExecutable = cppExecutable; + this.cCompiler = cCompiler; + this.cppCompiler = cppCompiler; this.targetName = targetName; } @@ -48,7 +51,8 @@ static CToolchainIdeInfo fromProto(IntellijIdeInfo.CToolchainIdeInfo proto) { ImmutableList.copyOf(proto.getCOptionList()), ImmutableList.copyOf(proto.getCppOptionList()), ProtoWrapper.map(proto.getBuiltInIncludeDirectoryList(), ExecutionRootPath::fromProto), - ExecutionRootPath.fromProto(proto.getCppExecutable()), + ExecutionRootPath.fromProto(proto.getCCompiler()), + ExecutionRootPath.fromProto(proto.getCppCompiler()), proto.getTargetName()); } @@ -58,12 +62,13 @@ public IntellijIdeInfo.CToolchainIdeInfo toProto() { .addAllCOption(cCompilerOptions) .addAllCppOption(cppCompilerOptions) .addAllBuiltInIncludeDirectory(ProtoWrapper.mapToProtos(builtInIncludeDirectories)) - .setCppExecutable(cppExecutable.toProto()) + .setCCompiler(cCompiler.toProto()) + .setCppCompiler(cppCompiler.toProto()) .setTargetName(targetName) .build(); } - public ImmutableList getcCompilerOptions() { + public ImmutableList getCCompilerOptions() { return cCompilerOptions; } @@ -75,8 +80,12 @@ public ImmutableList getBuiltInIncludeDirectories() { return builtInIncludeDirectories; } - public ExecutionRootPath getCppExecutable() { - return cppExecutable; + public ExecutionRootPath getCCompiler() { + return cCompiler; + } + + public ExecutionRootPath getCppCompiler() { + return cppCompiler; } public String getTargetName() { @@ -95,7 +104,8 @@ public static class Builder { private final ImmutableList.Builder builtInIncludeDirectories = ImmutableList.builder(); - ExecutionRootPath cppExecutable; + ExecutionRootPath cCompiler; + ExecutionRootPath cppCompiler; String targetName = ""; @@ -119,8 +129,21 @@ public Builder addBuiltInIncludeDirectories( } @CanIgnoreReturnValue - public Builder setCppExecutable(ExecutionRootPath cppExecutable) { - this.cppExecutable = cppExecutable; + public Builder setCCompiler(ExecutionRootPath cCompiler) { + this.cCompiler = cCompiler; + return this; + } + + @CanIgnoreReturnValue + public Builder setCppCompiler(ExecutionRootPath cppCompiler) { + this.cppCompiler = cppCompiler; + return this; + } + + @CanIgnoreReturnValue + public Builder setCCppCompiler(ExecutionRootPath compiler) { + setCCompiler(compiler); + setCppCompiler(compiler); return this; } @@ -135,7 +158,8 @@ public CToolchainIdeInfo build() { cCompilerOptions.build(), cppCompilerOptions.build(), builtInIncludeDirectories.build(), - cppExecutable, + cCompiler, + cppCompiler, targetName); } } @@ -145,7 +169,7 @@ public String toString() { return "CToolchainIdeInfo{" + "\n" + " cCompilerOptions=" - + getcCompilerOptions() + + getCCompilerOptions() + "\n" + " cppCompilerOptions=" + getCppCompilerOptions() @@ -153,8 +177,12 @@ public String toString() { + " builtInIncludeDirectories=" + getBuiltInIncludeDirectories() + "\n" - + " cppExecutable='" - + getCppExecutable() + + " cCompiler='" + + getCCompiler() + + '\'' + + "\n" + + " cppCompiler='" + + getCppCompiler() + '\'' + "\n" + " targetName='" @@ -173,20 +201,22 @@ public boolean equals(Object o) { return false; } CToolchainIdeInfo that = (CToolchainIdeInfo) o; - return Objects.equal(getcCompilerOptions(), that.getcCompilerOptions()) + return Objects.equal(getCCompilerOptions(), that.getCCompilerOptions()) && Objects.equal(getCppCompilerOptions(), that.getCppCompilerOptions()) && Objects.equal(getBuiltInIncludeDirectories(), that.getBuiltInIncludeDirectories()) - && Objects.equal(getCppExecutable(), that.getCppExecutable()) + && Objects.equal(getCCompiler(), that.getCCompiler()) + && Objects.equal(getCppCompiler(), that.getCppCompiler()) && Objects.equal(getTargetName(), that.getTargetName()); } @Override public int hashCode() { return Objects.hashCode( - getcCompilerOptions(), + getCCompilerOptions(), getCppCompilerOptions(), getBuiltInIncludeDirectories(), - getCppExecutable(), + getCCompiler(), + getCppCompiler(), getTargetName()); } } diff --git a/cpp/src/META-INF/blaze-cpp.xml b/cpp/src/META-INF/blaze-cpp.xml index 5aaa18b0f7d..47573b9dc41 100644 --- a/cpp/src/META-INF/blaze-cpp.xml +++ b/cpp/src/META-INF/blaze-cpp.xml @@ -37,6 +37,7 @@ + @@ -60,6 +61,7 @@ + getTargetToVersionMap(ImmutableMap toolchainLookupMap, ImmutableMap compilerSettings) { - ImmutableMap compilerVersionByPath = - compilerSettings.entrySet().stream().collect( - ImmutableMap.toImmutableMap( - e -> e.getKey().getCppExecutable(), - e -> e.getValue().getCompilerVersion())); - return toolchainLookupMap.entrySet().stream() - .map(e -> new AbstractMap.SimpleImmutableEntry<>( - e.getKey().getLabel().toString(), - compilerVersionByPath.get(e.getValue().getCppExecutable()))) - // In case of a broken compiler, the version string is null, but Collectors.toMap requires non-null value function. - .filter(e -> e.getValue() != null) - .collect(ImmutableMap.toImmutableMap(e -> e.getKey(), e -> e.getValue())); + // since the cpp and c compiler versions should be the same per toolchain, it is okay to only + // store one version per toolchain + final var compilerVersionByPath = new HashMap(); + compilerSettings.forEach((toolchain, settings) -> { + compilerVersionByPath.put(toolchain.getCppCompiler(), settings.getCompilerVersion()); + }); + + final var targetToVersionBuilder = new ImmutableMap.Builder(); + toolchainLookupMap.forEach((key, toolchain) -> { + final var version = compilerVersionByPath.get(toolchain.getCCompiler()) ; + + if (version != null) { + targetToVersionBuilder.put(key.getLabel().toString(), version); + } + }); + + return targetToVersionBuilder.build(); } private static Predicate getTargetFilter( diff --git a/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java b/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java index 0fa4f9b9bf2..529d271bfe6 100644 --- a/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java +++ b/cpp/src/com/google/idea/blaze/cpp/BlazeConfigurationToolchainResolver.java @@ -35,6 +35,7 @@ import com.google.idea.blaze.base.ideinfo.TargetIdeInfo; import com.google.idea.blaze.base.ideinfo.TargetKey; import com.google.idea.blaze.base.ideinfo.TargetMap; +import com.google.idea.blaze.base.model.primitives.ExecutionRootPath; import com.google.idea.blaze.base.model.primitives.LanguageClass; import com.google.idea.blaze.base.model.primitives.TargetExpression; import com.google.idea.blaze.base.scope.BlazeContext; @@ -48,6 +49,7 @@ import com.google.idea.blaze.cpp.XcodeCompilerSettingsProvider.XcodeCompilerSettingsException; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Pair; import com.intellij.pom.NavigatableAdapter; import java.io.File; import java.util.AbstractMap.SimpleImmutableEntry; @@ -210,6 +212,39 @@ static ImmutableMap buildCompilerSetti }); } + private static @Nullable File resolveCompilerExecutable( + BlazeContext context, + ExecutionRootPathResolver executionRootPathResolver, + ExecutionRootPath compilerPath + ) { + File compilerFile = executionRootPathResolver.resolveExecutionRootPath(compilerPath); + if (compilerFile == null) { + IssueOutput.error("Unable to find compiler executable: " + compilerPath).submit(context); + } + + return compilerFile; + } + + private static @Nullable String mergeCompilerVersions( + BlazeContext context, + @Nullable String cVersion, + @Nullable String cppVersion) { + if (cVersion == null) { + return cppVersion; + } + if (cppVersion == null) { + return cVersion; + } + if (cVersion.equals(cppVersion)) { + return cppVersion; + } + + IssueOutput.warn("C and Cpp compiler version mismatch. Defaulting to Cpp compiler version.") + .submit(context); + + return cppVersion; + } + private static ImmutableMap doBuildCompilerSettingsMap( BlazeContext context, Project project, @@ -224,20 +259,28 @@ private static ImmutableMap doBuildCom compilerSettingsFutures.add( submit( () -> { - File cppExecutable = - executionRootPathResolver.resolveExecutionRootPath( - toolchain.getCppExecutable()); - if (cppExecutable == null) { - IssueOutput.error( - "Unable to find compiler executable: " + toolchain.getCppExecutable()) - .submit(context); + File cCompiler = resolveCompilerExecutable(context, executionRootPathResolver, + toolchain.getCCompiler()); + if (cCompiler == null) { return null; } - String compilerVersion = - getCompilerVersion(project, context, executionRootPathResolver, xcodeCompilerSettings, cppExecutable); + File cppCompiler = resolveCompilerExecutable(context, executionRootPathResolver, + toolchain.getCppCompiler()); + if (cppCompiler == null) { + return null; + } + + String cCompilerVersion = getCompilerVersion(project, context, + executionRootPathResolver, xcodeCompilerSettings, cCompiler); + String cppCompilerVersion = getCompilerVersion(project, context, + executionRootPathResolver, xcodeCompilerSettings, cppCompiler); + + String compilerVersion = mergeCompilerVersions(context, cCompilerVersion, + cppCompilerVersion); if (compilerVersion == null) { return null; } + BlazeCompilerSettings oldSettings = oldCompilerSettings.get(toolchain); if (oldSettings != null && oldSettings.getCompilerVersion().equals(compilerVersion)) { @@ -245,15 +288,15 @@ private static ImmutableMap doBuildCom } BlazeCompilerSettings settings = createBlazeCompilerSettings( + context, project, toolchain, xcodeCompilerSettings, executionRootPathResolver.getExecutionRoot(), - cppExecutable, + cCompiler, + cppCompiler, compilerVersion); if (settings == null) { - IssueOutput.error("Unable to create compiler wrapper for: " + cppExecutable) - .submit(context); return null; } return new SimpleImmutableEntry<>(toolchain, settings); @@ -284,12 +327,12 @@ private static String getCompilerVersion( BlazeContext context, ExecutionRootPathResolver executionRootPathResolver, Optional xcodeCompilerSettings, - File cppExecutable) { + File executable) { File executionRoot = executionRootPathResolver.getExecutionRoot(); ImmutableMap compilerEnvFlags = XcodeCompilerSettingsProvider.getInstance(project).asEnvironmentVariables(xcodeCompilerSettings); try { return CompilerVersionChecker.getInstance() - .checkCompilerVersion(executionRoot, cppExecutable, compilerEnvFlags); + .checkCompilerVersion(executionRoot, executable, compilerEnvFlags); } catch (VersionCheckException e) { switch (e.kind) { case MISSING_EXEC_ROOT: @@ -314,7 +357,7 @@ public void navigate(boolean requestFocus) { String.format( "Unable to access compiler executable \"%s\".\n" + "Check if it is accessible from the cmdline.", - cppExecutable.getAbsolutePath())) + executable.getAbsolutePath())) .submit(context); return null; case GENERIC_FAILURE: @@ -322,7 +365,7 @@ public void navigate(boolean requestFocus) { String.format( "Unable to check compiler version for \"%s\".\n%s\n" + "Check if running the compiler with --version works on the cmdline.", - cppExecutable.getAbsolutePath(), e.getMessage())) + executable.getAbsolutePath(), e.getMessage())) .submit(context); return null; } @@ -332,22 +375,34 @@ public void navigate(boolean requestFocus) { @Nullable private static BlazeCompilerSettings createBlazeCompilerSettings( + BlazeContext context, Project project, CToolchainIdeInfo toolchainIdeInfo, Optional xcodeCompilerSettings, File executionRoot, - File cppExecutable, + File cCompiler, + File cppCompiler, String compilerVersion) { ImmutableMap compilerWrapperEnvVars = XcodeCompilerSettingsProvider.getInstance(project).asEnvironmentVariables(xcodeCompilerSettings); - File compilerWrapper = + File cCompilerWrapper = + CompilerWrapperProvider.getInstance() + .createCompilerExecutableWrapper(executionRoot, cCompiler, compilerWrapperEnvVars); + if (cCompilerWrapper == null) { + IssueOutput.error("Unable to create compiler wrapper for: " + cCompiler) + .submit(context); + return null; + } + File cppCompilerWrapper = CompilerWrapperProvider.getInstance() - .createCompilerExecutableWrapper(executionRoot, cppExecutable, compilerWrapperEnvVars); - if (compilerWrapper == null) { + .createCompilerExecutableWrapper(executionRoot, cppCompiler, compilerWrapperEnvVars); + if (cppCompilerWrapper == null) { + IssueOutput.error("Unable to create compiler wrapper for: " + cppCompiler) + .submit(context); return null; } ImmutableList.Builder cFlagsBuilder = ImmutableList.builder(); - cFlagsBuilder.addAll(toolchainIdeInfo.getcCompilerOptions()); + cFlagsBuilder.addAll(toolchainIdeInfo.getCCompilerOptions()); ImmutableList.Builder cppFlagsBuilder = ImmutableList.builder(); cppFlagsBuilder.addAll(toolchainIdeInfo.getCppCompilerOptions()); @@ -356,8 +411,8 @@ private static BlazeCompilerSettings createBlazeCompilerSettings( compilerEnv.putAll(compilerWrapperEnvVars); return new BlazeCompilerSettings( project, - compilerWrapper, - compilerWrapper, + cCompilerWrapper, + cppCompilerWrapper, cFlagsBuilder.build(), cppFlagsBuilder.build(), compilerVersion, diff --git a/cpp/src/com/google/idea/blaze/cpp/BlazeResolveConfigurationData.java b/cpp/src/com/google/idea/blaze/cpp/BlazeResolveConfigurationData.java index 820b9374b68..7f777913065 100644 --- a/cpp/src/com/google/idea/blaze/cpp/BlazeResolveConfigurationData.java +++ b/cpp/src/com/google/idea/blaze/cpp/BlazeResolveConfigurationData.java @@ -75,9 +75,8 @@ public boolean equals(Object other) { && this.localCopts.equals(otherData.localCopts) && this.transitiveDefines.equals(otherData.transitiveDefines) && this.toolchainIdeInfo.equals(otherData.toolchainIdeInfo) - && this.compilerSettings - .getCompilerVersion() - .equals(otherData.compilerSettings.getCompilerVersion()); + && this.compilerSettings.getCompilerVersion().equals( + otherData.compilerSettings.getCompilerVersion()); } @Override diff --git a/cpp/src/com/google/idea/blaze/cpp/CppAspectArgsProvider.java b/cpp/src/com/google/idea/blaze/cpp/CppAspectArgsProvider.java new file mode 100644 index 00000000000..7335e72b4d4 --- /dev/null +++ b/cpp/src/com/google/idea/blaze/cpp/CppAspectArgsProvider.java @@ -0,0 +1,54 @@ +/* + * Copyright 2024 The Bazel Authors. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.idea.blaze.cpp; + +import com.google.idea.blaze.base.command.BlazeCommandName; +import com.google.idea.blaze.base.command.BlazeInvocationContext; +import com.google.idea.blaze.base.command.BuildFlagsProvider; +import com.google.idea.blaze.base.projectview.ProjectViewSet; +import com.google.idea.blaze.base.scope.BlazeContext; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.registry.Registry; +import java.util.List; + +public class CppAspectArgsProvider implements BuildFlagsProvider { + private static final String REGISTRY_PREFIX = "bazel.cpp.aspect."; + private static final String CPP_USE_GET_TOOL_FOR_ACTION = "_cpp_use_get_tool_for_action"; + + @Override + public void addBuildFlags( + Project project, + ProjectViewSet projectViewSet, + BlazeCommandName command, + BlazeInvocationContext invocationContext, + List flags) { + // aspects are only used during sync + } + + @Override + public void addSyncFlags( + Project project, + ProjectViewSet projectViewSet, + BlazeCommandName command, + BlazeContext context, + BlazeInvocationContext invocationContext, + List flags) { + flags.add(String.format( + "--define=%s=%b", CPP_USE_GET_TOOL_FOR_ACTION, + Registry.is(REGISTRY_PREFIX + CPP_USE_GET_TOOL_FOR_ACTION) + )); + } +} diff --git a/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeConfigurationResolverTest.java b/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeConfigurationResolverTest.java index 881d75f82da..bc06f336214 100644 --- a/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeConfigurationResolverTest.java +++ b/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeConfigurationResolverTest.java @@ -292,7 +292,7 @@ public void testSingleSourceTargetWithSourceDependencies() { public void withCcToolchainSuite_testSingleSourceCcBinaryTarget() { ProjectView projectView = projectView(directories("foo/bar"), targets("//foo/bar:binary")); CToolchainIdeInfo.Builder cToolchainIdeInfoBuilder = - CToolchainIdeInfo.builder().setCppExecutable(new ExecutionRootPath("cc")); + CToolchainIdeInfo.builder().setCCppCompiler(new ExecutionRootPath("cc")); TargetIdeInfo ccTarget = createCcTarget( "//foo/bar:binary", @@ -315,7 +315,7 @@ public void withCcToolchainSuite_testSingleSourceCcBinaryTarget() { public void withCcToolchainSuite_testSingleSourceCcLibraryTarget() { ProjectView projectView = projectView(directories("foo/bar"), targets("//foo/bar:library")); CToolchainIdeInfo.Builder cToolchainIdeInfoBuilder = - CToolchainIdeInfo.builder().setCppExecutable(new ExecutionRootPath("cc")); + CToolchainIdeInfo.builder().setCCppCompiler(new ExecutionRootPath("cc")); TargetIdeInfo ccTarget = createCcTarget( "//foo/bar:library", @@ -343,10 +343,10 @@ public void withCcToolchainAlias_testSingleSourceTarget() { // identical, but we differentiate them here to verify that the CToolchainIdeInfo from // cc_toolchain_alias target is used to build the toolchainLookupMap. CToolchainIdeInfo.Builder cToolchainIdeInfoBuilderSuite = - CToolchainIdeInfo.builder().setCppExecutable(new ExecutionRootPath("cc")); + CToolchainIdeInfo.builder().setCCppCompiler(new ExecutionRootPath("cc")); CToolchainIdeInfo.Builder cToolchainIdeInfoBuilderAlias = CToolchainIdeInfo.builder() - .setCppExecutable(new ExecutionRootPath("cc")) + .setCCppCompiler(new ExecutionRootPath("cc")) .setTargetName("toolchain_alias"); TargetIdeInfo ccTarget = createCcTarget( @@ -379,7 +379,7 @@ public void withCcToolchainAlias_testSingleSourceTarget() { public void withCcToolchainAlias_testSingleSourceTarget_missingCcToolChainAliasTarget() { ProjectView projectView = projectView(directories("foo/bar"), targets("//foo/bar:library")); CToolchainIdeInfo.Builder cToolchainIdeInfoBuilder = - CToolchainIdeInfo.builder().setCppExecutable(new ExecutionRootPath("cc")); + CToolchainIdeInfo.builder().setCCppCompiler(new ExecutionRootPath("cc")); TargetIdeInfo ccTarget = createCcTarget( "//foo/bar:library", @@ -750,7 +750,7 @@ public void multipleToolchainsNoIssue() { CToolchainIdeInfo.Builder aarch32Toolchain = CToolchainIdeInfo.builder() .setTargetName("arm-linux-androideabi") - .setCppExecutable(new ExecutionRootPath("bin/arm-linux-androideabi-gcc")); + .setCCppCompiler(new ExecutionRootPath("bin/arm-linux-androideabi-gcc")); TargetIdeInfo.Builder aarch32ToolchainTarget = TargetIdeInfo.builder() .setLabel("//toolchains:armv7a") @@ -759,7 +759,7 @@ public void multipleToolchainsNoIssue() { CToolchainIdeInfo.Builder aarch64Toolchain = CToolchainIdeInfo.builder() .setTargetName("aarch64-linux-android") - .setCppExecutable(new ExecutionRootPath("bin/aarch64-linux-android-gcc")); + .setCCppCompiler(new ExecutionRootPath("bin/aarch64-linux-android-gcc")); TargetIdeInfo.Builder aarch64ToolchainTarget = TargetIdeInfo.builder() .setLabel("//toolchains:aarch64") @@ -891,7 +891,7 @@ private static TargetIdeInfo.Builder createCcToolchain() { .setKind(CppBlazeRules.RuleTypes.CC_TOOLCHAIN.getKind()) .setCToolchainInfo( CToolchainIdeInfo.builder() - .setCppExecutable(new ExecutionRootPath("cc")) + .setCCppCompiler(new ExecutionRootPath("cc")) .setTargetName("toolchain")); } diff --git a/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeResolveConfigurationEquivalenceTest.java b/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeResolveConfigurationEquivalenceTest.java index 83bef43a4f2..4786bfd374b 100644 --- a/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeResolveConfigurationEquivalenceTest.java +++ b/cpp/tests/unittests/com/google/idea/blaze/cpp/BlazeResolveConfigurationEquivalenceTest.java @@ -563,7 +563,7 @@ private static TargetIdeInfo.Builder createCcToolchain() { .setLabel("//:toolchain") .setKind(CppBlazeRules.RuleTypes.CC_TOOLCHAIN.getKind()) .setCToolchainInfo( - CToolchainIdeInfo.builder().setCppExecutable(new ExecutionRootPath("cc"))); + CToolchainIdeInfo.builder().setCCppCompiler(new ExecutionRootPath("cc"))); } private static ListSection directories(String... directories) { diff --git a/proto/intellij_ide_info.proto b/proto/intellij_ide_info.proto index 36efed728b3..ddec1667a33 100644 --- a/proto/intellij_ide_info.proto +++ b/proto/intellij_ide_info.proto @@ -177,8 +177,9 @@ message CToolchainIdeInfo { string target_name = 1; repeated string cpp_option = 2; repeated string c_option = 3; - string cpp_executable = 4; - repeated string built_in_include_directory = 5; + string c_compiler = 4; + string cpp_compiler = 5; + repeated string built_in_include_directory = 6; } message TestInfo { From 56fc6924c14bbaa4ce6e96061c67fe3c0a626692 Mon Sep 17 00:00:00 2001 From: Geetha Chandu Date: Thu, 13 Jun 2024 05:59:03 -0700 Subject: [PATCH 12/17] Add EP to extend external modules (#6467) Added an EP to give the feasibility to allow other modules. For example, when maven modules are added into project view bazel sync resets the view as they have different content root. An implementation could be added to allow maven modules to be shown in project tree view. --- base/src/META-INF/blaze-base.xml | 2 ++ .../projectstructure/ExternalModuleProvider.java | 14 ++++++++++++++ .../sync/projectstructure/ModuleEditorImpl.java | 6 ++++-- 3 files changed, 20 insertions(+), 2 deletions(-) create mode 100644 base/src/com/google/idea/blaze/base/sync/projectstructure/ExternalModuleProvider.java diff --git a/base/src/META-INF/blaze-base.xml b/base/src/META-INF/blaze-base.xml index 54b90dc0e9c..4864a1adc19 100644 --- a/base/src/META-INF/blaze-base.xml +++ b/base/src/META-INF/blaze-base.xml @@ -508,6 +508,8 @@ interface="com.google.idea.blaze.base.qsync.BlazeProjectListenerProvider"/> + diff --git a/base/src/com/google/idea/blaze/base/sync/projectstructure/ExternalModuleProvider.java b/base/src/com/google/idea/blaze/base/sync/projectstructure/ExternalModuleProvider.java new file mode 100644 index 00000000000..9f5cfcf2695 --- /dev/null +++ b/base/src/com/google/idea/blaze/base/sync/projectstructure/ExternalModuleProvider.java @@ -0,0 +1,14 @@ +package com.google.idea.blaze.base.sync.projectstructure; + +import com.intellij.openapi.extensions.ExtensionPointName; +import com.intellij.openapi.module.Module; + +/** + * An EP provider for external modules. + */ +public interface ExternalModuleProvider { + ExtensionPointName EP_NAME = + ExtensionPointName.create("com.google.idea.blaze.base.sync.projectstructure.ExternalModuleProvider"); + + boolean isOwnedByExternalPlugin(Module module); +} diff --git a/base/src/com/google/idea/blaze/base/sync/projectstructure/ModuleEditorImpl.java b/base/src/com/google/idea/blaze/base/sync/projectstructure/ModuleEditorImpl.java index a802b2380f4..628e8b606e1 100644 --- a/base/src/com/google/idea/blaze/base/sync/projectstructure/ModuleEditorImpl.java +++ b/base/src/com/google/idea/blaze/base/sync/projectstructure/ModuleEditorImpl.java @@ -39,6 +39,7 @@ import com.intellij.openapi.roots.impl.ModifiableModelCommitter; import com.intellij.openapi.vfs.VfsUtil; import com.intellij.openapi.vfs.VirtualFile; + import java.io.File; import java.io.IOException; import java.util.List; @@ -118,8 +119,9 @@ public Module findModule(String moduleName) { public void commitWithGc(BlazeContext context) { List orphanModules = Lists.newArrayList(); for (Module module : ModuleManager.getInstance(project).getModules()) { - if (!modules.containsKey(module.getName())) { - orphanModules.add(module); + if (!modules.containsKey(module.getName()) + && !ExternalModuleProvider.EP_NAME.getExtensionList().stream().anyMatch(n -> n.isOwnedByExternalPlugin(module))) { + orphanModules.add(module); } } if (orphanModules.size() > 0) { From ea890581a8d43cec098acaa73e9be9e12f645ea1 Mon Sep 17 00:00:00 2001 From: Mai Hussien Date: Wed, 12 Jun 2024 10:05:29 -0700 Subject: [PATCH 13/17] Internal change (cherry picked from commit 6c34ae52d94f4877985a23ae76468d7e090bb265) --- base/src/META-INF/blaze-base.xml | 4 +- .../CommandLineBlazeCommandRunner.java | 43 +++++++++++ .../idea/blaze/base/execution/BazelGuard.java | 34 +++++++++ .../execution/ExecutionDeniedException.java | 23 ++++++ .../base/execution/TrustedProjectGuard.java | 29 ++++++++ .../AutoImportProjectOpenProcessor.java | 14 ++-- .../project/DefaultBazelProjectCreator.java | 42 ----------- .../ExtendableBazelProjectCreator.java | 14 +++- .../project/TrustAwareProjectCreator.java | 71 +++++++++++++++++++ .../blaze/base/sync/ProjectStateSyncTask.java | 17 ++++- .../vcs/git/GitBlazeVcsHandlerProvider.java | 8 +++ .../base/wizard2/BlazeProjectCreator.java | 10 +-- .../ui/BlazeSelectWorkspaceControl.java | 6 +- 13 files changed, 252 insertions(+), 63 deletions(-) create mode 100644 base/src/com/google/idea/blaze/base/execution/BazelGuard.java create mode 100644 base/src/com/google/idea/blaze/base/execution/ExecutionDeniedException.java create mode 100644 base/src/com/google/idea/blaze/base/execution/TrustedProjectGuard.java delete mode 100644 base/src/com/google/idea/blaze/base/project/DefaultBazelProjectCreator.java create mode 100644 base/src/com/google/idea/blaze/base/project/TrustAwareProjectCreator.java diff --git a/base/src/META-INF/blaze-base.xml b/base/src/META-INF/blaze-base.xml index 4864a1adc19..4581fc10d64 100644 --- a/base/src/META-INF/blaze-base.xml +++ b/base/src/META-INF/blaze-base.xml @@ -325,7 +325,7 @@ + serviceImplementation="com.google.idea.blaze.base.project.TrustAwareProjectCreator"/> + @@ -678,6 +679,7 @@ + diff --git a/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java b/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java index ab34188afab..47f77bde9a5 100644 --- a/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java +++ b/base/src/com/google/idea/blaze/base/command/CommandLineBlazeCommandRunner.java @@ -28,13 +28,17 @@ import com.google.idea.blaze.base.command.buildresult.BuildResultHelperBep; import com.google.idea.blaze.base.command.buildresult.ParsedBepOutput; import com.google.idea.blaze.base.console.BlazeConsoleLineProcessorProvider; +import com.google.idea.blaze.base.execution.BazelGuard; +import com.google.idea.blaze.base.execution.ExecutionDeniedException; import com.google.idea.blaze.base.logging.utils.querysync.BuildDepsStatsScope; import com.google.idea.blaze.base.logging.utils.querysync.SyncQueryStatsScope; import com.google.idea.blaze.base.model.primitives.WorkspaceRoot; import com.google.idea.blaze.base.run.testlogs.BlazeTestResults; import com.google.idea.blaze.base.scope.BlazeContext; import com.google.idea.blaze.base.scope.output.SummaryOutput; +import com.google.idea.blaze.base.scope.output.IssueOutput; import com.google.idea.blaze.base.scope.scopes.SharedStringPoolScope; +import com.google.idea.blaze.base.settings.Blaze; import com.google.idea.blaze.base.sync.aspects.BlazeBuildOutputs; import com.google.idea.blaze.base.sync.aspects.BuildResult; import com.google.idea.blaze.base.sync.aspects.BuildResult.Status; @@ -65,6 +69,11 @@ public BlazeBuildOutputs run( BuildResultHelper buildResultHelper, BlazeContext context, Map envVars) { + try { + performGuardCheck(project, context); + } catch (ExecutionDeniedException e) { + return BlazeBuildOutputs.noOutputs(BuildResult.FATAL_ERROR); + } BuildResult buildResult = issueBuild(blazeCommandBuilder, WorkspaceRoot.fromProject(project), envVars, context); @@ -104,10 +113,17 @@ public BlazeTestResults runTest( BuildResultHelper buildResultHelper, BlazeContext context, Map envVars) { + try { + performGuardCheck(project, context); + } catch (ExecutionDeniedException e) { + return BlazeTestResults.NO_RESULTS; + } + // For tests, we have to pass the environment variables as `--test_env`, otherwise they don't get forwarded for (Map.Entry env: envVars.entrySet()) { blazeCommandBuilder.addBlazeFlags(BlazeFlags.TEST_ENV, String.format("%s=%s", env.getKey(), env.getValue())); } + BuildResult buildResult = issueBuild(blazeCommandBuilder, WorkspaceRoot.fromProject(project), envVars, context); if (buildResult.status == Status.FATAL_ERROR) { @@ -130,6 +146,8 @@ public InputStream runQuery( BuildResultHelper buildResultHelper, BlazeContext context) throws BuildException { + performGuardCheckAsBuildException(project, context); + try (Closer closer = Closer.create()) { Path tempFile = Files.createTempFile( @@ -176,6 +194,8 @@ public InputStream runBlazeInfo( BuildResultHelper buildResultHelper, BlazeContext context) throws BuildException { + performGuardCheckAsBuildException(project, context); + try (Closer closer = Closer.create()) { Path tmpFile = Files.createTempFile( @@ -227,4 +247,27 @@ public Optional getMaxCommandLineLength() { // so choose a value somewhere south of that, which seems to work. return Optional.of(130000); } + + private void performGuardCheck(Project project, BlazeContext context) + throws ExecutionDeniedException { + try { + BazelGuard.checkExtensionsIsExecutionAllowed(project); + } catch (ExecutionDeniedException e) { + IssueOutput.error( + "Can't invoke " + + Blaze.buildSystemName(project) + + " because the project is not trusted") + .submit(context); + throw e; + } + } + + private void performGuardCheckAsBuildException(Project project, BlazeContext context) + throws BuildException { + try { + performGuardCheck(project, context); + } catch (ExecutionDeniedException e) { + throw new BuildException(e); + } + } } diff --git a/base/src/com/google/idea/blaze/base/execution/BazelGuard.java b/base/src/com/google/idea/blaze/base/execution/BazelGuard.java new file mode 100644 index 00000000000..644dc490270 --- /dev/null +++ b/base/src/com/google/idea/blaze/base/execution/BazelGuard.java @@ -0,0 +1,34 @@ +/* + * Copyright 2024 The Bazel Authors. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.idea.blaze.base.execution; + +import com.intellij.openapi.extensions.ExtensionPointName; +import com.intellij.openapi.project.Project; + +/** Interface for checking if tools execution is allowed for the imported project. */ +public interface BazelGuard { + + ExtensionPointName EP_NAME = + ExtensionPointName.create("com.google.idea.blaze.BlazeGuard"); + + void checkIsExecutionAllowed(Project project) throws ExecutionDeniedException; + + static void checkExtensionsIsExecutionAllowed(Project project) throws ExecutionDeniedException { + for (var extension : EP_NAME.getExtensionList()) { + extension.checkIsExecutionAllowed(project); + } + } +} diff --git a/base/src/com/google/idea/blaze/base/execution/ExecutionDeniedException.java b/base/src/com/google/idea/blaze/base/execution/ExecutionDeniedException.java new file mode 100644 index 00000000000..2446941f9dc --- /dev/null +++ b/base/src/com/google/idea/blaze/base/execution/ExecutionDeniedException.java @@ -0,0 +1,23 @@ +/* + * Copyright 2024 The Bazel Authors. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.idea.blaze.base.execution; + +/** Exception thrown when tool execution is denied. */ +public class ExecutionDeniedException extends Exception { + public ExecutionDeniedException(String message) { + super(message); + } +} diff --git a/base/src/com/google/idea/blaze/base/execution/TrustedProjectGuard.java b/base/src/com/google/idea/blaze/base/execution/TrustedProjectGuard.java new file mode 100644 index 00000000000..b9b0afa0d61 --- /dev/null +++ b/base/src/com/google/idea/blaze/base/execution/TrustedProjectGuard.java @@ -0,0 +1,29 @@ +/* + * Copyright 2024 The Bazel Authors. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.idea.blaze.base.execution; + +import com.intellij.ide.impl.TrustedProjects; +import com.intellij.openapi.project.Project; + +/** A {@link BazelGuard} that only allows execution if the project is trusted. */ +public class TrustedProjectGuard implements BazelGuard { + @Override + public void checkIsExecutionAllowed(Project project) throws ExecutionDeniedException { + if (!TrustedProjects.isTrusted(project)) { + throw new ExecutionDeniedException("Execution is not allowed because project is not trusted"); + } + } +} diff --git a/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java b/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java index 0b4c693a30d..3edb2f17ced 100644 --- a/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java +++ b/base/src/com/google/idea/blaze/base/project/AutoImportProjectOpenProcessor.java @@ -36,6 +36,7 @@ import java.nio.file.Path; import java.nio.file.Paths; import java.util.Objects; +import java.util.Optional; import javax.swing.Icon; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NotNull; @@ -113,7 +114,9 @@ Project doOpenProject( } Project newProject = createProject(virtualFile); - Objects.requireNonNull(newProject); + if (newProject == null) { + return null; + } newProject.putUserData(PROJECT_AUTO_IMPORTED, true); @@ -170,12 +173,13 @@ private Project createProject(@NotNull VirtualFile virtualFile) { LOG.error("Failed to commit project import builder", e); } - Project newProject = builder.createProject(name, projectFilePath); - if (newProject == null) { - LOG.error("Failed to Bazel create project"); + Optional returnedValue = ExtendableBazelProjectCreator.getInstance() + .createProject(builder, name, projectFilePath); + if (returnedValue.isEmpty()) { return null; } - + + Project newProject = returnedValue.get(); newProject.save(); if (!builder.validate(null, newProject)) { diff --git a/base/src/com/google/idea/blaze/base/project/DefaultBazelProjectCreator.java b/base/src/com/google/idea/blaze/base/project/DefaultBazelProjectCreator.java deleted file mode 100644 index ffa0110974f..00000000000 --- a/base/src/com/google/idea/blaze/base/project/DefaultBazelProjectCreator.java +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Copyright 2024 The Bazel Authors. All rights reserved. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package com.google.idea.blaze.base.project; - -import com.intellij.ide.util.projectWizard.ProjectBuilder; -import com.intellij.openapi.project.Project; - -/** Default implementation of {@link ExtendableBazelProjectCreator}. */ -public class DefaultBazelProjectCreator implements ExtendableBazelProjectCreator { - - /** - * Creates a project with additional configuration. - * - * @param builder the project builder - * @param name the name of the project - * @param path the path to the project - * @return the created project - */ - @Override - public Project createProject(ProjectBuilder builder, String name, String path) { - return builder.createProject(name, path); - } - - /** Returns true if the project can be created. */ - @Override - public boolean canCreateProject() { - return true; - } -} diff --git a/base/src/com/google/idea/blaze/base/project/ExtendableBazelProjectCreator.java b/base/src/com/google/idea/blaze/base/project/ExtendableBazelProjectCreator.java index b1a24eb64b3..928fc796a40 100644 --- a/base/src/com/google/idea/blaze/base/project/ExtendableBazelProjectCreator.java +++ b/base/src/com/google/idea/blaze/base/project/ExtendableBazelProjectCreator.java @@ -15,8 +15,12 @@ */ package com.google.idea.blaze.base.project; +import com.google.idea.blaze.base.settings.BuildSystemName; import com.intellij.ide.util.projectWizard.ProjectBuilder; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.project.Project; +import java.util.Optional; +import javax.annotation.Nullable; /** Interface for creating a project with additional configuration. */ public interface ExtendableBazelProjectCreator { @@ -26,10 +30,14 @@ public interface ExtendableBazelProjectCreator { * @param builder the project builder * @param name the name of the project * @param path the path to the project - * @return the created project + * @return the created project, can be null if the project cannot be created */ - public Project createProject(ProjectBuilder builder, String name, String path); + public Optional createProject(ProjectBuilder builder, String name, String path); /** Returns true if the project can be created. */ - public boolean canCreateProject(); + public boolean canCreateProject(@Nullable BuildSystemName buildSystemName); + + static ExtendableBazelProjectCreator getInstance() { + return ApplicationManager.getApplication().getService(ExtendableBazelProjectCreator.class); + } } diff --git a/base/src/com/google/idea/blaze/base/project/TrustAwareProjectCreator.java b/base/src/com/google/idea/blaze/base/project/TrustAwareProjectCreator.java new file mode 100644 index 00000000000..f6faf0d277c --- /dev/null +++ b/base/src/com/google/idea/blaze/base/project/TrustAwareProjectCreator.java @@ -0,0 +1,71 @@ +/* + * Copyright 2024 The Bazel Authors. All rights reserved. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.idea.blaze.base.project; + +import com.google.idea.blaze.base.settings.BuildSystemName; +import com.intellij.ide.IdeBundle; +import com.intellij.ide.impl.TrustedProjects; +import com.intellij.ide.util.projectWizard.ProjectBuilder; +import com.intellij.openapi.application.ApplicationInfo; +import com.intellij.openapi.project.Project; +import com.intellij.openapi.ui.MessageDialogBuilder; +import java.util.Optional; +import javax.annotation.Nullable; + +/** Creates a project if the user has trusted the project. */ +public class TrustAwareProjectCreator implements ExtendableBazelProjectCreator { + + /** + * Creates a project if the user has trusted the project. + * + * @param builder the project builder + * @param name the name of the project + * @param path the path to the project + * @return the created project, null if the user did not trust the project + */ + @Override + public Optional createProject(ProjectBuilder builder, String name, String path) { + if (!canCreateProject(null)) { + return Optional.empty(); + } + + return Optional.of(builder.createProject(name, path)); + } + + /** Returns true if the user has trusted the project. */ + @Override + public boolean canCreateProject(@Nullable BuildSystemName buildSystemName) { + var trustText = IdeBundle.message("untrusted.project.dialog.trust.button"); + var dontOpenText = IdeBundle.message("untrusted.project.open.dialog.cancel.button"); + + var choice = + new MessageDialogBuilder.Message( + IdeBundle.message("untrusted.project.general.dialog.title"), + IdeBundle.message( + "untrusted.project.open.dialog.text", + ApplicationInfo.getInstance().getFullApplicationName())) + .buttons( + IdeBundle.message("untrusted.project.dialog.trust.button"), + IdeBundle.message("untrusted.project.open.dialog.cancel.button")) + .defaultButton(trustText) + .focusedButton(dontOpenText) + .asWarning() + .help(TrustedProjects.TRUSTED_PROJECTS_HELP_TOPIC) + .show(null, null); + + return trustText.equals(choice); + } +} diff --git a/base/src/com/google/idea/blaze/base/sync/ProjectStateSyncTask.java b/base/src/com/google/idea/blaze/base/sync/ProjectStateSyncTask.java index 8ebe813eb40..b62a8514e6f 100644 --- a/base/src/com/google/idea/blaze/base/sync/ProjectStateSyncTask.java +++ b/base/src/com/google/idea/blaze/base/sync/ProjectStateSyncTask.java @@ -21,6 +21,7 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.idea.blaze.base.async.FutureUtil; +import com.google.idea.blaze.base.async.FutureUtil.FutureResult; import com.google.idea.blaze.base.async.executor.BlazeExecutor; import com.google.idea.blaze.base.command.BlazeCommandName; import com.google.idea.blaze.base.command.BlazeFlags; @@ -28,6 +29,7 @@ import com.google.idea.blaze.base.command.info.BlazeInfo; import com.google.idea.blaze.base.command.info.BlazeInfoProvider; import com.google.idea.blaze.base.command.info.BlazeInfoRunner; +import com.google.idea.blaze.base.execution.ExecutionDeniedException; import com.google.idea.blaze.base.io.FileOperationProvider; import com.google.idea.blaze.base.model.BlazeVersionData; import com.google.idea.blaze.base.model.primitives.WorkspaceRoot; @@ -126,15 +128,24 @@ private SyncProjectState getProjectState(BlazeContext context, BlazeSyncParams p workingSetFuture = Futures.immediateFuture(null); } - BlazeInfo blazeInfo = + FutureResult blazeInfoResult = FutureUtil.waitForFuture(context, blazeInfoFuture) .timed(Blaze.buildSystemName(project) + "Info", EventType.BlazeInvocation) .withProgressMessage( String.format("Running %s info...", Blaze.buildSystemName(project))) .onError(String.format("Could not run %s info", Blaze.buildSystemName(project))) - .run() - .result(); + .run(); + + BlazeInfo blazeInfo = blazeInfoResult.result(); if (blazeInfo == null) { + Exception exception = blazeInfoResult.exception(); + if (exception != null) { + Throwable cause = exception.getCause(); + if (cause instanceof BuildException + && cause.getCause() instanceof ExecutionDeniedException) { + throw new SyncCanceledException(); + } + } throw new SyncFailedException(); } BlazeVersionData blazeVersionData = diff --git a/base/src/com/google/idea/blaze/base/vcs/git/GitBlazeVcsHandlerProvider.java b/base/src/com/google/idea/blaze/base/vcs/git/GitBlazeVcsHandlerProvider.java index 45e17b17ac2..7ccb6042930 100644 --- a/base/src/com/google/idea/blaze/base/vcs/git/GitBlazeVcsHandlerProvider.java +++ b/base/src/com/google/idea/blaze/base/vcs/git/GitBlazeVcsHandlerProvider.java @@ -20,6 +20,8 @@ import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListeningExecutorService; import com.google.idea.blaze.base.async.process.ExternalTask; +import com.google.idea.blaze.base.execution.BazelGuard; +import com.google.idea.blaze.base.execution.ExecutionDeniedException; import com.google.idea.blaze.base.io.FileOperationProvider; import com.google.idea.blaze.base.model.primitives.WorkspacePath; import com.google.idea.blaze.base.model.primitives.WorkspaceRoot; @@ -50,6 +52,12 @@ public String getVcsName() { @Override public boolean handlesProject(Project project, WorkspaceRoot workspaceRoot) { + try { + BazelGuard.checkExtensionsIsExecutionAllowed(project); + } catch (ExecutionDeniedException e) { + logger.warn("Git provider is not allowed because of", e); + return false; + } return Blaze.getBuildSystemName(project) == BuildSystemName.Bazel && isGitRepository(workspaceRoot) && tracksRemote(workspaceRoot); diff --git a/base/src/com/google/idea/blaze/base/wizard2/BlazeProjectCreator.java b/base/src/com/google/idea/blaze/base/wizard2/BlazeProjectCreator.java index e8136e18384..28549b0dc66 100644 --- a/base/src/com/google/idea/blaze/base/wizard2/BlazeProjectCreator.java +++ b/base/src/com/google/idea/blaze/base/wizard2/BlazeProjectCreator.java @@ -37,6 +37,7 @@ import java.io.IOException; import java.nio.file.Path; import java.nio.file.Paths; +import java.util.Optional; import javax.swing.SwingUtilities; import org.jetbrains.annotations.Nullable; import org.jetbrains.annotations.VisibleForTesting; @@ -105,14 +106,13 @@ public BlazeProjectCreator.CreatedProjectDescriptor createProject( FileUtil.ensureExists(ideaDir); } - Project newProject = - ApplicationManager.getApplication() - .getService(ExtendableBazelProjectCreator.class) + Optional returnedValue = + ExtendableBazelProjectCreator.getInstance() .createProject(projectBuilder, projectName, projectFilePath); - if (newProject == null) { + if (returnedValue.isEmpty()) { return null; } - + Project newProject = returnedValue.get(); if (!ApplicationManager.getApplication().isUnitTestMode()) { newProject.save(); } diff --git a/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeSelectWorkspaceControl.java b/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeSelectWorkspaceControl.java index 008669b5916..c4fd285a654 100644 --- a/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeSelectWorkspaceControl.java +++ b/base/src/com/google/idea/blaze/base/wizard2/ui/BlazeSelectWorkspaceControl.java @@ -26,7 +26,6 @@ import com.google.idea.blaze.base.wizard2.TopLevelSelectWorkspaceOption; import com.google.idea.blaze.base.wizard2.WorkspaceTypeList; import com.intellij.openapi.Disposable; -import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.options.CancelledConfigurationException; import com.intellij.openapi.options.ConfigurationException; import com.intellij.ui.IdeBorderFactory.PlainSmallWithoutIndent; @@ -155,9 +154,8 @@ public JComponent getUiComponent() { } public void validateAndUpdateBuilder() throws ConfigurationException { - if (!ApplicationManager.getApplication() - .getService(ExtendableBazelProjectCreator.class) - .canCreateProject()) { + if (!ExtendableBazelProjectCreator.getInstance() + .canCreateProject(getSelectedOption().getWorkspaceData().buildSystem())) { throw new CancelledConfigurationException(); } From d2d704b63eeaa62a9999603ff2aabd9c70602fd7 Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Mon, 17 Jun 2024 18:08:16 +0200 Subject: [PATCH 14/17] Explicitely run SyncStatusEditorTabTitleProvider in read mode (#6489) It is not executed in read mode by default since 242 https://github.com/JetBrains/intellij-community/commit/c92a99d43581659231d24b22f8c5ac04279c9c4d fixes #6473 --- .../syncstatus/SyncStatusEditorTabTitleProvider.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/base/src/com/google/idea/blaze/base/syncstatus/SyncStatusEditorTabTitleProvider.java b/base/src/com/google/idea/blaze/base/syncstatus/SyncStatusEditorTabTitleProvider.java index fb81b7d23e7..a80240845e2 100644 --- a/base/src/com/google/idea/blaze/base/syncstatus/SyncStatusEditorTabTitleProvider.java +++ b/base/src/com/google/idea/blaze/base/syncstatus/SyncStatusEditorTabTitleProvider.java @@ -18,10 +18,13 @@ import com.google.idea.blaze.base.settings.Blaze; import com.google.idea.blaze.base.settings.BlazeImportSettings; import com.google.idea.blaze.base.sync.autosync.ProjectTargetManager.SyncStatus; +import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.fileEditor.impl.EditorTabTitleProvider; import com.intellij.openapi.project.DumbAware; import com.intellij.openapi.project.Project; +import com.intellij.openapi.util.Computable; import com.intellij.openapi.vfs.VirtualFile; + import javax.annotation.Nullable; /** Changes the tab title for unsynced files. */ @@ -32,8 +35,10 @@ public String getEditorTabTitle(Project project, VirtualFile file) { if (Blaze.getProjectType(project).equals(BlazeImportSettings.ProjectType.UNKNOWN)) { return null; } - - SyncStatus status = SyncStatusContributor.getSyncStatus(project, file); + + SyncStatus status = ApplicationManager.getApplication() + .runReadAction((Computable) () -> SyncStatusContributor.getSyncStatus(project, file)); + if (status == null) { return null; } From 15cfacbbe129c02d37660e2686a6f004111a114f Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Mon, 17 Jun 2024 18:09:26 +0200 Subject: [PATCH 15/17] Bump JetBrains IDEs (#6485) --- WORKSPACE.bzlmod | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index ed39bfe8832..c27412d3436 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -96,9 +96,9 @@ http_archive( ) # The plugin api for intellij_ce_2024_2. This is required to build IJwB and run integration tests. -IC_242_SHA = "b193be0c0b377c20e102c208f5f48899162930d6d9ff54e1b95642c35f5ca32a" +IC_242_SHA = "d5161b400e087b4f3f6a8f8671d70252ccaf7766f5c1bdd5278be0394280badf" -IC_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIC/242.15523.18-EAP-SNAPSHOT/ideaIC-242.15523.18-EAP-SNAPSHOT.zip" +IC_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIC/242.16677.21-EAP-SNAPSHOT/ideaIC-242.16677.21-EAP-SNAPSHOT.zip" http_archive( name = "intellij_ce_2024_2", @@ -194,9 +194,9 @@ http_archive( url = IU_241_URL, ) -IU_242_SHA = "52a9b4d6b004099851b49a8a2c5210c2dc50fa992b0f7b515b3cd81514cd65ad" +IU_242_SHA = "4debaba946bf660e9ba35baeb6100c284738e627e3217f4bb67b1a993a116e07" -IU_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIU/242.15523.18-EAP-SNAPSHOT/ideaIU-242.15523.18-EAP-SNAPSHOT.zip" +IU_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/idea/ideaIU/242.16677.21-EAP-SNAPSHOT/ideaIU-242.16677.21-EAP-SNAPSHOT.zip" http_archive( name = "intellij_ue_2024_2", @@ -291,9 +291,9 @@ http_archive( url = CLION_241_URL, ) -# CLION_242_SHA = "23039b46c172d820a3764e16b2f2f88bf6a2859436ae8ccf6fe5d9c78689b068" +# CLION_242_SHA = "cd018a71bccd28512dc22d8b3824f68ec9450b37c9e87e6c8553d3292acf9d0e" -# CLION_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/clion/clion/242.14146.22-EAP-SNAPSHOT/clion-242.14146.22-EAP-SNAPSHOT.zip" +# CLION_242_URL = "https://www.jetbrains.com/intellij-repository/snapshots/com/jetbrains/intellij/clion/clion/242.16677.29-EAP-SNAPSHOT/clion-242.16677.29-EAP-SNAPSHOT.zip" # http_archive( # name = "clion_2024_2", @@ -321,9 +321,9 @@ http_archive( url = DEVKIT_233_URL, ) -DEVKIT_241_SHA = "2a0a945e977d8094a61fe16d805cafb3d8a39d939a0855b5edac695eb15505de" +DEVKIT_241_SHA = "9bed2a6b14ce6da433ad1a3d6d70018650f02e3638dbdc980aac3868a3ce8c38" -DEVKIT_241_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/241.17890.21/DevKit-241.17890.21.zip" +DEVKIT_241_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/241.18034.18/DevKit-241.18034.18.zip" http_archive( name = "devkit_2024_1", @@ -332,9 +332,9 @@ http_archive( url = DEVKIT_241_URL, ) -DEVKIT_242_SHA = "7e9f4cf4bee6f4e92d8dedae059ad7572d51953c1d7aebaf16d82316ab16b89b" +DEVKIT_242_SHA = "b035bc09ffeeec7947bddcd49ed0155ded86a384bc2aad92bd2ef3267b3c4680" -DEVKIT_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/242.14146.24/DevKit-242.14146.24.zip" +DEVKIT_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/DevKit/242.16677.21/DevKit-242.16677.21.zip" http_archive( name = "devkit_2024_2", @@ -436,9 +436,9 @@ http_archive( url = PYTHON_PLUGIN_233_URL, ) -PYTHON_PLUGIN_241_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/PythonCore/241.17890.1/PythonCore-241.17890.1.zip" +PYTHON_PLUGIN_241_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/PythonCore/241.18034.12/PythonCore-241.18034.12.zip" -PYTHON_PLUGIN_241_SHA = "193735e322d48fbfbfd200f5713c7d4c5daec94815efcfd112f9da9bbcf8d83c" +PYTHON_PLUGIN_241_SHA = "804f46ca05ff21855e70be6a868130cc60442be3298667d9dc0d6a56555df227" http_archive( name = "python_2024_1", @@ -460,9 +460,9 @@ filegroup( ) """ -PYTHON_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/PythonCore/242.15523.18/PythonCore-242.15523.18.zip" +PYTHON_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/PythonCore/242.16677.21/PythonCore-242.16677.21.zip" -PYTHON_PLUGIN_242_SHA = "e52984e3b601406f6fed7f177c1bcfd9d67951df928a2550257ad0b85ff5954d" +PYTHON_PLUGIN_242_SHA = "d1c26dcb847ca5f19f2cb640b5b98621fe46edf541c17ac5c3bc9e745ece6fc4" http_archive( name = "python_2024_2", @@ -577,9 +577,9 @@ java_import( ) """ -GO_PLUGIN_242_SHA = "8489d1398a2a52190719bb0de642bd4e126a254b5f897e9a6aa79381a83b84c9" +GO_PLUGIN_242_SHA = "3b00a055347ab6b05e42c5623e98e3feb6accbf9f87f9ec51b14568372395e2f" -GO_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.jetbrains.plugins.go/242.15523.18/org.jetbrains.plugins.go-242.15523.18.zip" +GO_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.jetbrains.plugins.go/242.16677.21/org.jetbrains.plugins.go-242.16677.21.zip" http_archive( name = "go_2024_2", @@ -709,9 +709,9 @@ http_archive( url = TOML_PLUGIN_241_URL, ) -TOML_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.toml.lang/242.15523.17/org.toml.lang-242.15523.17.zip" +TOML_PLUGIN_242_URL = "https://plugins.jetbrains.com/maven/com/jetbrains/plugins/org.toml.lang/242.16677.24/org.toml.lang-242.16677.24.zip" -TOML_PLUGIN_242_SHA = "2cf4e13c711298446297a43797a0e97a2a6da6ac604d356f0c4db2aa468d0a0b" +TOML_PLUGIN_242_SHA = "28ad9aa8b3e3e3d277fd58d1dc59c021cd08de4392899e479efa9e1f89a568b0" # TOML required by Python since 242.13688.18 http_archive( From f6bcaa972ef6bccea40c35b56b97ee9ab83ad003 Mon Sep 17 00:00:00 2001 From: Tomasz Pasternak Date: Tue, 18 Jun 2024 19:08:10 +0200 Subject: [PATCH 16/17] fix: Missing directories when view_project_root is on (#6493) fixes #6492 --- .../base/sync/projectview/ImportRoots.java | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/base/src/com/google/idea/blaze/base/sync/projectview/ImportRoots.java b/base/src/com/google/idea/blaze/base/sync/projectview/ImportRoots.java index 02b1416f280..2f2cba2ece6 100644 --- a/base/src/com/google/idea/blaze/base/sync/projectview/ImportRoots.java +++ b/base/src/com/google/idea/blaze/base/sync/projectview/ImportRoots.java @@ -42,12 +42,18 @@ import com.google.idea.common.experiments.BoolExperiment; import com.intellij.openapi.project.Project; import com.intellij.openapi.util.io.FileUtil; +import org.jetbrains.annotations.NotNull; +import java.io.File; +import java.io.FileFilter; import java.nio.file.FileSystems; import java.nio.file.Path; +import java.util.ArrayList; import java.util.Arrays; import java.util.Collection; -import java.util.Objects; +import java.util.LinkedList; +import java.util.List; +import java.util.Queue; import java.util.Set; import javax.annotation.Nullable; @@ -148,10 +154,7 @@ public ImportRoots build() { } if (viewProjectRoot) { - Arrays.stream(Objects.requireNonNull(workspaceRoot.directory().listFiles())) - .filter(f -> f.isDirectory() && rootDirectoriesBuilder.build().stream().noneMatch(r -> FileUtil.filesEqual(workspaceRoot.fileForPath(r), f))) - .map(workspaceRoot::workspacePathFor) - .forEach(excludeDirectoriesBuilder::add); + selectExcludes(rootDirectoriesBuilder.build()).forEach(excludeDirectoriesBuilder::add); } ImmutableSet minimalExcludes = @@ -176,6 +179,23 @@ public ImportRoots build() { return new ImportRoots(directories, targets); } + private @NotNull List selectExcludes(ImmutableCollection rootDirectories) { + Queue files = new LinkedList<>(Arrays.asList(workspaceRoot.directory().listFiles())); + var result = new ArrayList(); + while (!files.isEmpty()) { + File file = files.poll(); + if (rootDirectories.stream().anyMatch(d -> FileUtil.isAncestor(file, workspaceRoot.fileForPath(d), /*strict=*/ true))) { + var children = file.listFiles(File::isDirectory); + if (children != null) { + files.addAll(List.of(children)); + } + } else if (rootDirectories.stream().noneMatch(d -> FileUtil.filesEqual(file, workspaceRoot.fileForPath(d)))) { + result.add(file); + } + } + return result.stream().map(workspaceRoot::workspacePathFor).toList(); + } + private void excludeBuildSystemArtifacts() { for (String dir : BuildSystemProvider.getBuildSystemProvider(buildSystemName) From 5e6c041b8e4f6799303862e60af0bd0ce4b61b99 Mon Sep 17 00:00:00 2001 From: Mai Hussien <70515749+mai93@users.noreply.github.com> Date: Tue, 18 Jun 2024 10:13:01 -0700 Subject: [PATCH 17/17] Remove unused custom java 17 toolchain (#6491) * Update BUILD * Update WORKSPACE.bzlmod --- BUILD | 29 ----------------------------- WORKSPACE.bzlmod | 3 --- 2 files changed, 32 deletions(-) diff --git a/BUILD b/BUILD index a8a1c2dff59..f2b9ad89ad6 100644 --- a/BUILD +++ b/BUILD @@ -1,5 +1,3 @@ -load("@bazel_tools//tools/jdk:default_java_toolchain.bzl", "default_java_toolchain") - # # Description: Blaze plugin for various IntelliJ products. # @@ -99,30 +97,3 @@ test_suite( ], visibility = DEFAULT_TEST_VISIBILITY, ) - -default_java_toolchain( - name = "custom_java_17_toolchain", - configuration = dict(), - java_runtime = "@rules_java//toolchains:remotejdk_17", - package_configuration = [ - ":java_8", - ], - source_version = "17", - target_version = "17", -) - -# this associates a set of javac flags with a set of packages -java_package_configuration( - name = "java_8", - javacopts = ["-source 8 -target 8"], - packages = ["java_8_packages"], -) - -# this is a regular package_group, which is used to specify a set of packages to apply flags to -package_group( - name = "java_8_packages", - packages = [ - "//proto/...", - "//third_party/bazel/src/main/protobuf/...", - ], -) diff --git a/WORKSPACE.bzlmod b/WORKSPACE.bzlmod index c27412d3436..01922fe04c7 100644 --- a/WORKSPACE.bzlmod +++ b/WORKSPACE.bzlmod @@ -870,9 +870,6 @@ load("@io_grpc_grpc_java//:repositories.bzl", "grpc_java_repositories") grpc_java_repositories() -# Register custom java 17 toolchain -register_toolchains("//:custom_java_17_toolchain_definition") - # Dependency needed for Go test library http_archive( name = "bazel_gazelle",