Cherry-Pick changes from AOSP

.bazelci/aspect.yml

@@ -1,50 +1,6 @@
 ---
 tasks:
-  Aspect-internal-stable:
-    name: Aspect Tests for IJ Internal Stable
-    platform: ubuntu2204
-    build_flags:
-      - --define=ij_product=intellij-latest
-    build_targets:
-      - //aspect:aspect_files
-    test_flags:
-      - --define=ij_product=intellij-latest
-      - --test_output=errors
-      - --notrim_test_configuration
-    test_targets:
-      - //aspect/testing/...
-    skip_use_bazel_version_for_test: true
-  Aspect-internal-beta:
-    name: Aspect Tests for IJ Internal Beta
-    platform: ubuntu2204
-    build_flags:
-      - --define=ij_product=intellij-beta
-    build_targets:
-      - //aspect:aspect_files
-    test_flags:
-      - --define=ij_product=intellij-beta
-      - --test_output=errors
-      - --notrim_test_configuration
-    test_targets:
-      - //aspect/testing/...
-    skip_use_bazel_version_for_test: true
-  Aspect-internal-under-dev:
-    name: Aspect Tests for IJ Internal Under Development
-    platform: ubuntu2204
-    build_flags:
-      - --define=ij_product=intellij-under-dev
-    build_targets:
-      - //aspect:aspect_files
-    test_flags:
-      - --define=ij_product=intellij-under-dev
-      - --test_output=errors
-      - --notrim_test_configuration
-    test_targets:
-      - //aspect/testing/...
-    soft_fail:
-      - exit_status: 1
-    skip_use_bazel_version_for_test: true
-  Aspect-oss-oldest-stable:
+  Aspect-OSS-oldest-stable:
     name: Aspect Tests for IJ OSS Oldest Stable
     platform: ubuntu2204
     build_flags:
@@ -58,7 +14,7 @@ tasks:
     test_targets:
       - //aspect/testing/...
     skip_use_bazel_version_for_test: true
-  Aspect-oss-latest-stable:
+  Aspect-OSS-latest-stable:
     name: Aspect Tests for IJ OSS Latest Stable
     platform: ubuntu2204
     build_flags:
@@ -72,7 +28,7 @@ tasks:
     test_targets:
       - //aspect/testing/...
     skip_use_bazel_version_for_test: true
-  Aspect-oss-under-dev:
+  Aspect-OSS-under-dev:
     name: Aspect Tests for IJ OSS Under Development
     platform: ubuntu2204
     build_flags:

.bazelci/intellij-ue.yml

@@ -47,4 +47,15 @@ tasks:
       - //ijwb/...
     soft_fail:
       - exit_status: 1
-
+  Querysync:
+    name: Querysync Library
+    platform: ubuntu2204
+    build_flags:
+      - --define=ij_product=intellij-ue-oss-under-dev
+    build_targets:
+      - //querysync/...
+    test_flags:
+      - --define=ij_product=intellij-ue-oss-under-dev
+      - --test_output=errors
+    test_targets:
+      - //querysync/...

MODULE.bazel

@@ -96,11 +96,12 @@ 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",
+        "org.hamcrest:hamcrest-core:3.0",
     ],
     fail_if_repin_required = True,
     generate_compat_repositories = True,
@@ -130,6 +131,7 @@ use_repo(
     objenesis = "org_objenesis_objenesis",
     truth = "com_google_truth_truth",
     truth8 = "com_google_truth_extensions_truth_java8_extension",
+    hamcrest = "org_hamcrest_hamcrest_core",
 )
 
 bazel_dep(name = "rules_go", version = "0.50.1", repo_name = "io_bazel_rules_go")

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