Merge branch 'master' into essential_analysis_endpoint

.bazelrc

@@ -1,5 +1,5 @@
-build --java_language_version=17 --java_runtime_version=17
-build --tool_java_language_version=17 --tool_java_runtime_version=17
+build --java_language_version=21 --java_runtime_version=21
+build --tool_java_language_version=21 --tool_java_runtime_version=21
 
 # Delete test data packages, needed for bazel integration tests. Update by running the following command:
 # bazel run @rules_bazel_integration_test//tools:update_deleted_packages

CHANGELOG

@@ -1,3 +1,7 @@
+v2025.01.07
+===========
+* Allow to boost .ijwb over BSP and .idea folder. #7201
+
 v2024.12.17
 ===========
 Fixes:

MODULE.bazel

@@ -51,7 +51,7 @@ use_repo(remote_android_extensions, "android_gmaven_r8", "android_tools")
 
 bazel_dep(
     name = "rules_bazel_integration_test",
-    version = "0.29.0",
+    version = "0.31.0",
     dev_dependency = True,
 )
 

WORKSPACE.bzlmod

@@ -3,7 +3,7 @@ workspace(name = "intellij_with_bazel")
 load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 
 # LICENSE: The Apache Software License, Version 2.0
-rules_scala_version = "8f255cd1fecfe4d43934b161b3edda58bdb2e8f4"
+rules_scala_version = "6c6ba4e31cb56c038fe9967efd222007d73fd5cf"
 
 load("@rules_java//java:rules_java_deps.bzl", "rules_java_dependencies")
 rules_java_dependencies()
@@ -12,7 +12,7 @@ protobuf_deps()
 
 http_archive(
     name = "io_bazel_rules_scala",
-    sha256 = "14797e907c5614387452c42412d755ad7e343ea12540a53da1430be3301c8b4b",
+    sha256 = "3aad1238ba84d53f1f9471452580835ff0f3e8b6f03567e9e17017e8cc8e3894",
     strip_prefix = "rules_scala-%s" % rules_scala_version,
     type = "zip",
     url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip" % rules_scala_version,

aspect/build_dependencies.bzl

@@ -11,7 +11,7 @@ load(
     _ide_kotlin_not_validated = "IDE_KOTLIN",
 )
 
-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"
+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, j2kt_native_import"
 
 PROTO_RULE_KINDS = [
     "java_proto_library",

clwb/test_defs.bzl

@@ -59,7 +59,7 @@ def clwb_integration_test(name, project, srcs, deps = []):
     for version in bazel_binaries.versions.all:
         bazel_integration_test(
             name = integration_test_utils.bazel_integration_test_name(name, version),
-            tags = [],
+            tags = ["exclusive"],
             bazel_version = version,
             test_runner = ":" + runner,
             workspace_path = "tests/projects/" + project,

kotlin/src/com/google/idea/blaze/kotlin/KotlinBlazeRules.java

@@ -38,9 +38,11 @@ public enum RuleTypes {
     KT_JVM_LIBRARY_HELPER("kt_jvm_library_helper", LanguageClass.KOTLIN, RuleType.LIBRARY),
     // bazel only kotlin rules:
     KT_JVM_LIBRARY("kt_jvm_library", LanguageClass.KOTLIN, RuleType.LIBRARY),
+    KT_NATIVE_LIBRARY("kt_native_library", LanguageClass.KOTLIN, RuleType.LIBRARY),
     KT_JVM_BINARY("kt_jvm_binary", LanguageClass.KOTLIN, RuleType.BINARY),
     KT_JVM_TEST("kt_jvm_test", LanguageClass.KOTLIN, RuleType.TEST),
     KT_JVM_IMPORT("kt_jvm_import", LanguageClass.KOTLIN, RuleType.UNKNOWN),
+    J2KT_NATIVE_IMPORT("j2kt_native_import", LanguageClass.KOTLIN, RuleType.UNKNOWN),
     KOTLIN_STDLIB("kotlin_stdlib", LanguageClass.KOTLIN, RuleType.UNKNOWN);
 
     private final String name;
@@ -70,6 +72,7 @@ public Function<TargetIdeInfo, Kind> getTargetKindHeuristics() {
     return proto ->
         proto.getKindString().startsWith("kt_jvm_")
                 || proto.getKindString().startsWith("kt_android_")
+                || proto.getKindString().startsWith("kt_native_")
             ? Kind.Provider.create(proto.getKindString(), LanguageClass.KOTLIN, RuleType.UNKNOWN)
             : null;
   }

querysync/javatests/com/google/idea/blaze/qsync/query/QuerySpecTest.java

@@ -98,7 +98,7 @@ public void testGetQueryExpression_experimental_includes_and_excludes() {
     assertThat(qs.getQueryExpression())
       .hasValue(
         "let base = //some/included/path/...:* + //another/included/path/...:* - //some/included/path/excluded/...:* - //another/included/path/excluded/...:*\n" +
-        " in let known = kind(\"source file|android_library|android_binary|android_local_test|android_instrumentation_test|kt_android_library_helper|java_library|java_binary|kt_jvm_library|kt_jvm_binary|kt_jvm_library_helper|java_test|java_proto_library|java_lite_proto_library|java_mutable_proto_library|_java_grpc_library|_kotlin_library|_java_lite_grpc_library|_iml_module_|cc_library|cc_binary|cc_shared_library|cc_test|proto_library|py_library|py_binary|py_test\", $base) \n" +
+        " in let known = kind(\"source file|android_library|android_binary|android_local_test|android_instrumentation_test|kt_android_library_helper|java_library|java_binary|kt_jvm_library|kt_jvm_binary|kt_jvm_library_helper|kt_native_library|java_test|java_proto_library|java_lite_proto_library|java_mutable_proto_library|_java_grpc_library|_kotlin_library|_java_lite_grpc_library|_iml_module_|cc_library|cc_binary|cc_shared_library|cc_test|proto_library|py_library|py_binary|py_test\", $base) \n" +
         " in let unknown = $base except $known \n" +
         " in $known union ($base intersect allpaths($known, $unknown)) \n");
   }

shared/java/com/google/idea/blaze/common/RuleKinds.java

@@ -30,6 +30,7 @@ private RuleKinds() {}
           "kt_jvm_library",
           "kt_jvm_binary",
           "kt_jvm_library_helper",
+          "kt_native_library",
           "java_test",
           "java_proto_library",
           "java_lite_proto_library",

shared/java/com/google/idea/blaze/common/artifact/BuildArtifactCacheDirectory.java

@@ -404,7 +404,11 @@ private FileTime readAccessTime(Path entry) throws IOException {
   @Override
   public void clean(long maxTargetSizeBytes, Duration minKeepDuration) throws BuildException {
     // Ensure that no artifacts are added or read from the cache while we're cleaning:
-    long stamp = lock.writeLock();
+    long stamp = lock.tryWriteLock();
+    if (stamp == 0) {
+      logger.warning("Failed to clean the build cache at " + cacheDir + " Failed to obtain the write lock");
+      return; // Just exit. WE will clean the cache next time.
+    }
     try {
       needClean = false;
       clean(maxTargetSizeBytes, Instant.now().minus(minKeepDuration));
@@ -467,7 +471,11 @@ void clean(long maxTargetSize, Instant minAgeToDelete) throws IOException {
 
   public void purge() throws BuildException {
     // Ensure that no artifacts are added or read from the cache while we're cleaning:
-    long stamp = lock.writeLock();
+    long stamp = lock.tryWriteLock();
+    if (stamp == 0) {
+      // TODO: b/373957467 - Report this error to the user properly.
+      throw new BuildException("Failed to purge the build artifact cache. Cannot obtain the write lock.");
+    }
     try {
       MoreFiles.deleteDirectoryContents(cacheDir);
     } catch (IOException e) {