Merge branch 'master' into add-direct-hash-to-rule-hasher

cli/src/test/kotlin/com/bazel_diff/e2e/E2ETest.kt

@@ -6,7 +6,6 @@ import assertk.assertions.containsExactlyInAnyOrder
 import com.bazel_diff.cli.BazelDiff
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.rules.TemporaryFolder
@@ -191,8 +190,6 @@ class E2ETest {
         testFineGrainedHashBzlMod(listOf("--useCquery"), "@rules_jvm_external~~maven~maven", "/fixture/fine-grained-hash-bzlmod-cquery-test-impacted-targets.txt")
     }
 
-    // TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed
-    @Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010")
     @Test
     fun testUseCqueryWithExternalDependencyChange() {
         // The difference between these two snapshots is simply upgrading the Guava version for Android platform.
@@ -295,8 +292,6 @@ class E2ETest {
         assertThat(actual).isEqualTo(expected)
     }
 
-    // TODO: re-enable the test after https://github.com/bazelbuild/bazel/issues/21010 is fixed
-    @Ignore("cquery mode is broken with Bazel 7 because --transition=lite is crashes due to https://github.com/bazelbuild/bazel/issues/21010")
     @Test
     fun testUseCqueryWithAndroidCodeChange() {
         // The difference between these two snapshots is simply making a code change to Android-only source code.

cli/src/test/resources/fixture/cquery-test-android-code-change-android-impacted-targets.txt

@@ -1,2 +1,3 @@
-//src/main/java/com/integration:android
-//src/main/java/com/integration:guava-user
+@@//src/main/java/com/integration:android
+@@//src/main/java/com/integration:android_deployjars_internal_rule
+@@//src/main/java/com/integration:guava-user

cli/src/test/resources/fixture/cquery-test-guava-upgrade-android-impacted-targets.txt

@@ -1,7 +1,8 @@
 //external:bazel_diff_maven_android
-//src/main/java/com/integration:android
-//src/main/java/com/integration:guava-user
-@bazel_diff_maven_android//:com_google_errorprone_error_prone_annotations
-@bazel_diff_maven_android//:com_google_guava_guava
-@bazel_diff_maven_android//:com_google_j2objc_j2objc_annotations
-@bazel_diff_maven_android//:org_checkerframework_checker_qual
+@@//src/main/java/com/integration:android
+@@//src/main/java/com/integration:android_deployjars_internal_rule
+@@//src/main/java/com/integration:guava-user
+@@bazel_diff_maven_android//:com_google_errorprone_error_prone_annotations
+@@bazel_diff_maven_android//:com_google_guava_guava
+@@bazel_diff_maven_android//:com_google_j2objc_j2objc_annotations
+@@bazel_diff_maven_android//:org_checkerframework_checker_qual