Imported changes from initial AOSP commit

AOSP: 7048e6ff6c860de1f4ae0789b09ac81fa85e3845

# Conflicts:
#	base/src/META-INF/blaze-base.xml
#	querysync/javatests/com/google/idea/blaze/qsync/TestDataSyncRunner.java
#	shared/java/com/google/idea/blaze/common/Label.java

Author: LeFrosch

MODULE.bazel

@@ -96,9 +96,9 @@ maven.install(
         "com.google.code.findbugs:jsr305:3.0.2",
         "com.google.code.gson:gson:2.10.1",
         "com.google.errorprone:error_prone_annotations:2.20.0",
-        "com.google.guava:guava:33.0.0-jre",  # changed to jre
-        "com.google.truth:truth:1.1.5",
-        "com.google.truth.extensions:truth-java8-extension:1.1.5",
+        "com.google.guava:guava:33.3.1-jre",  # changed to jre
+        "com.google.truth:truth:1.4.4",
+        "com.google.truth.extensions:truth-java8-extension:1.4.4",
         "com.google.j2objc:j2objc-annotations:2.8",
         "com.google.guava:failureaccess:1.0.2",
     ],

aspect/BUILD

@@ -28,10 +28,22 @@ filegroup(
 # the aspect files that will be bundled with the final plugin zip
 filegroup(
     name = "aspect_files",
+    srcs = [
+        ":aspect_files_only",
+        ":aspect_tools",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+# Separate different targets as they are put into different directories
+filegroup(
+    name = "aspect_files_only",
     srcs = [
         "WORKSPACE",
         "artifacts.bzl",
+        "build_compose_dependencies.bzl",
         "build_dependencies.bzl",
+        "build_dependencies_deps.bzl",
         "fast_build_info_bundled.bzl",
         "flag_hack.bzl",
         "intellij_info.bzl",
@@ -40,6 +52,13 @@ filegroup(
         "java_classpath.bzl",
         "make_variables.bzl",
         ":BUILD.bazel",
+    ],
+    visibility = ["//visibility:public"],
+)
+
+filegroup(
+    name = "aspect_tools",
+    srcs = [
         "//aspect/tools:CreateAar",
         "//aspect/tools:JarFilter_deploy.jar",
         "//aspect/tools:PackageParser_deploy.jar",

aspect/build_compose_dependencies.bzl

@@ -0,0 +1,37 @@
+"""Aspects to build and collect project's compose dependencies."""
+
+load("//third_party/bazel_rules/rules_java/java:defs.bzl", "JavaInfo")
+
+ComposeDependenciesInfo = provider(
+    "The compose dependencies",
+    fields = {
+        "render_jars": "a list of render jars generated for project files and external dependencies",
+    },
+)
+
+def _package_compose_dependencies_impl(target, ctx):  # @unused
+    return [OutputGroupInfo(
+        render_jars = target[ComposeDependenciesInfo].render_jars.to_list(),
+    )]
+
+package_compose_dependencies = aspect(
+    implementation = _package_compose_dependencies_impl,
+    required_aspect_providers = [[ComposeDependenciesInfo]],
+)
+
+def _collect_compose_dependencies_impl(target, ctx):  # @unused
+    if JavaInfo not in target:
+        return [ComposeDependenciesInfo(
+            render_jars = depset(),
+        )]
+    return [
+        ComposeDependenciesInfo(
+            render_jars = depset([], transitive = [target[JavaInfo].transitive_runtime_jars]),
+        ),
+    ]
+
+collect_compose_dependencies = aspect(
+    implementation = _collect_compose_dependencies_impl,
+    provides = [ComposeDependenciesInfo],
+    attr_aspects = ["deps", "exports", "_android_sdk"],
+)