[do not merge/review] BTAPI-based incremental compilation

.bazelci/presubmit.yml

@@ -37,11 +37,6 @@
   environment:
     ANDROID_NDK_HOME: /opt/android-ndk-r25b
 
-.ubuntu2204: &ubuntu2204
-  platform: ubuntu2204
-  environment:
-    ANDROID_NDK_HOME: /opt/android-ndk-r25b
-
 .macos: &macos
   platform: macos_arm64
   environment:
@@ -55,9 +50,9 @@
 # bazelci pipeline
 matrix:
   integration_shard_flags:
-    - [ "--test_tag_filters=shard_0", "--local_test_jobs=3" ]
-    - [ "--test_tag_filters=shard_1", "--local_test_jobs=3" ]
-    - [ "--test_tag_filters=shard_2", "--local_test_jobs=3" ]
+    - [ "--test_tag_filters=shard_0,-workspace", "--local_test_jobs=3" ]
+    - [ "--test_tag_filters=shard_1,-workspace", "--local_test_jobs=3" ]
+    - [ "--test_tag_filters=shard_2,-workspace", "--local_test_jobs=3" ]
   test_flags:
     - [ "--enable_bzlmod=true" ]
 validate_config: 1
@@ -74,10 +69,8 @@ tasks:
     <<: [ *ubuntu2404, *unittests ]
   ubuntu2404_integration_tests:
     <<: [ *ubuntu2404, *integration_tests ]
-  ubuntu2204_unittests:
-    <<: [ *ubuntu2204, *unittests ]
-  ubuntu2204_integration_tests:
-    <<: [ *ubuntu2204, *integration_tests ]
+  macos_integration_tests:
+    <<: [ *macos, *integration_tests ]
   windows_integration_tests:
     <<: [ *windows, *integration_tests_no_android ]
   windows_unittests:
@@ -107,3 +100,18 @@ tasks:
     test_flags:
       - "--test_tag_filters=ktlint"
       - "--test_output=errors"
+  ic_tests:
+    name: IC Tests
+    <<: *ubuntu2404
+    test_targets:
+      - //ic_tests:ic_tests_suite
+  macos_ic_tests:
+    name: IC Tests
+    <<: *macos
+    test_targets:
+      - //ic_tests:ic_tests_suite
+  windows_ic_tests:
+    name: IC Tests
+    <<: *windows
+    test_targets:
+      - //ic_tests:ic_tests_suite

.bazelrc

@@ -20,6 +20,9 @@ build:windows --cxxopt=/std:c++17
 build:windows --host_cxxopt=/std:c++17
 build:windows --cxxopt=/Zc:__cplusplus
 build:windows --host_cxxopt=/Zc:__cplusplus
+common:windows --repo_env=COURSIER_NO_TERM=true
+common:windows --repo_env=COURSIER_PROGRESS=false
+
 
 # Avoid
 # Exception in thread "main" java.io.IOException: Error getting terminal size: GetConsoleScreenBufferInfo error 6
@@ -36,5 +39,10 @@ query --deleted_packages=examples/android,examples/android/app,examples/android/
 common --incompatible_enable_proto_toolchain_resolution
 common --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc=true
 
+common --@rules_kotlin//kotlin/settings:experimental_incremental_compilation
+
+common --incompatible_enable_proto_toolchain_resolution
+common --@com_google_protobuf//bazel/toolchains:prefer_prebuilt_protoc=true
+
 # User-specific .bazelrc
 try-import %workspace%/user.bazelrc

BUILD

@@ -62,7 +62,8 @@ release_archive(
     name = "rules_kotlin_release",
     src_map = {
         "BUILD.release.bazel": "BUILD.bazel",
-        "MODULE.release.bazel": "MODULE.bazel",
+        "MODULE.bazel": "MODULE.bazel",
+        "kotlin_rules_maven_install.json": "kotlin_rules_maven_install.json",
     },
     deps = [
         "//kotlin:pkg",

CHANGELOG.md

@@ -2,6 +2,7 @@
 
 |  Date                   | News  | 
 | :----------- | -------- |
+| Feb 17, 2026 | Breaking changes in rules_kotlin 2.x: dropped Kotlin compiler `<2.0` support; `kt_kotlinc_options` no longer exposes `api_version`/`language_version` (toolchain-owned) or `x_use_k2` (K2 is toolchain-managed); renamed options `x_optin` -> `opt_in` and `x_jsr_305` -> `x_jsr305`; lambda/SAM defaults now follow Kotlin defaults (`indy` for Kotlin 2.x). |
 | May 26, 2022  | Released version [v1.6.0-RC-2](https://github.com/bazelbuild/rules_kotlin/releases/tag/v1.6.0-RC-2). |
 | April 27, 2022  | Released version [1.6.0-RC1](https://github.com/bazelbuild/rules_kotlin/releases/tag/1.6.0-RC-1). |
 | Feb 2, 2022  | Released version [1.5.0](https://github.com/bazelbuild/rules_kotlin/releases/tag/v1.5.0). |

MODULE.bazel

@@ -5,105 +5,146 @@ module(
     repo_name = "rules_kotlin",
 )
 
-proto_version = "4.33.4"
+# =============================================================================
+# Variables
+# =============================================================================
 
-proto_version_parts = proto_version.split(".")
+kotlin_version = "2.3.20-RC"
 
-proto_module_version = ".".join(proto_version_parts[-2:])  # Last 2 parts
+# =============================================================================
+# Production Dependencies
+# =============================================================================
 
-bazel_dep(name = "protobuf", version = proto_module_version, repo_name = "com_google_protobuf")
-bazel_dep(name = "rules_cc", version = "0.0.16")
-bazel_dep(name = "platforms", version = "0.0.11")
-bazel_dep(name = "bazel_skylib", version = "1.8.2")
-bazel_dep(name = "rules_java", version = "8.9.0")
-bazel_dep(name = "rules_python", version = "0.23.1")
+bazel_dep(name = "bazel_lib", version = "3.1.0")
+bazel_dep(name = "bazel_skylib", version = "1.9.0")
+bazel_dep(name = "bazel_features", version = "1.39.0")
+bazel_dep(name = "platforms", version = "1.0.0")
+bazel_dep(name = "rules_cc", version = "0.2.14")
+bazel_dep(name = "rules_java", version = "9.3.0")
+bazel_dep(name = "bazel_worker_api", version = "0.0.9")
+bazel_dep(name = "bazel_worker_java", version = "0.0.9")
+bazel_dep(name = "protobuf", version = "33.4", repo_name = "com_google_protobuf")
 bazel_dep(name = "rules_android", version = "0.7.1")
 
-remote_android_extensions = use_extension(
-    "@rules_android//bzlmod_extensions:android_extensions.bzl",
-    "remote_android_tools_extensions",
-)
-use_repo(remote_android_extensions, "android_tools")
+# =============================================================================
+# Dev Dependencies
+# =============================================================================
 
-android_sdk_repository_extension = use_extension("@rules_android//rules/android_sdk_repository:rule.bzl", "android_sdk_repository_extension")
-use_repo(android_sdk_repository_extension, "androidsdk")
+bazel_dep(name = "rules_python", version = "1.7.0", dev_dependency = True)
+bazel_dep(name = "rules_shell", version = "0.6.1", dev_dependency = True)
+bazel_dep(name = "buildifier_prebuilt", version = "8.2.1.1", dev_dependency = True)
 
-register_toolchains("@androidsdk//:all")
+# Testing
+bazel_dep(name = "rules_testing", version = "0.9.0", dev_dependency = True)
+bazel_dep(name = "rules_bazel_integration_test", version = "0.35.0", dev_dependency = True)
 
-bazel_dep(name = "bazel_features", version = "1.39.0")
-bazel_dep(name = "bazel_lib", version = "3.1.0")
-bazel_dep(name = "rules_shell", version = "0.4.1")
-bazel_dep(name = "bazel_worker_api", version = "0.0.10")
-bazel_dep(name = "bazel_worker_java", version = "0.0.10")
+# CI and release
+bazel_dep(name = "bazel_ci_rules", version = "1.0.0", dev_dependency = True)
+
+# Not dev_dependency because packager.bzl loads it at top-level of BUILD files
+bazel_dep(name = "rules_pkg", version = "1.0.1")
 
-# TODO[https://github.com/bazelbuild/rules_kotlin/issues/1395]: Update when fixed version is available.
-bazel_dep(name = "buildifier_prebuilt", version = "8.2.1", dev_dependency = True)
+# Documentation
+bazel_dep(name = "stardoc", version = "0.8.0", dev_dependency = True, repo_name = "io_bazel_stardoc")
+
+# Utilities
+bazel_dep(name = "rules_jvm_external", version = "6.10")
 
+# =============================================================================
+# Extensions
+# =============================================================================
+
+# Java toolchains
 rules_java_toolchains = use_extension("@rules_java//java:extensions.bzl", "toolchains")
 use_repo(rules_java_toolchains, "remote_java_tools")
 
+# Kotlin extensions
 rules_kotlin_extensions = use_extension("//src/main/starlark/core/repositories:bzlmod_setup.bzl", "rules_kotlin_extensions")
 use_repo(
     rules_kotlin_extensions,
-    "com_github_google_ksp",
     "com_github_jetbrains_kotlin",
-    "com_github_jetbrains_kotlin_git",
     "com_github_pinterest_ktlint",
-    "kotlin_build_tools_impl",
-    "kotlinx_coroutines_core_jvm",
-    "kotlinx_serialization_core_jvm",
-    "kotlinx_serialization_json",
-    "kotlinx_serialization_json_jvm",
 )
 
-register_toolchains("//src/main/starlark/core/compile/cli")
-
-register_toolchains("//kotlin/internal:default_toolchain")
-
-# Development dependencies
-# TODO(bencodes) A bunch of these dependencies need to be marked as dev_dependencies but before we can do that
-# we need to sort out a few cases around how these rules are consumed in various ways.
-
-bazel_dep(name = "rules_jvm_external", version = "6.10")
-bazel_dep(name = "bazel_ci_rules", version = "1.0.0")
-
-rbe_preconfig = use_repo_rule("@bazel_ci_rules//:rbe_repo.bzl", "rbe_preconfig")
+# Android SDK (dev)
+remote_android_extensions = use_extension(
+    "@rules_android//bzlmod_extensions:android_extensions.bzl",
+    "remote_android_tools_extensions",
+    dev_dependency = True,
+)
+use_repo(remote_android_extensions, "android_tools")
 
-rbe_preconfig(
-    name = "buildkite_config",
-    toolchain = "ubuntu2204",
+android_sdk_repository_extension = use_extension(
+    "@rules_android//rules/android_sdk_repository:rule.bzl",
+    "android_sdk_repository_extension",
+    dev_dependency = True,
 )
+use_repo(android_sdk_repository_extension, "androidsdk")
 
+# Maven (dev)
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
     name = "kotlin_rules_maven",
     artifacts = [
+        "com.google.auto.service:auto-service-annotations:1.1.1",
+        "com.google.auto.service:auto-service:1.1.1",
+        "com.google.auto.value:auto-value-annotations:1.11.0",
+        "com.google.auto.value:auto-value:1.11.0",
         "com.google.code.findbugs:jsr305:3.0.2",
         "com.google.code.gson:gson:2.10.1",
+        "com.google.dagger:dagger-compiler:2.57.2",
+        "com.google.dagger:dagger-producers:2.57.2",
+        "com.google.dagger:dagger:2.57.2",
         "com.google.errorprone:error_prone_annotations:2.23.0",
-        "junit:junit:4.13-beta-3",
-        "com.google.protobuf:protobuf-java:{}".format(proto_version),
-        "com.google.protobuf:protobuf-java-util:{}".format(proto_version),
         "com.google.guava:guava:33.0.0-jre",
+        "com.google.protobuf:protobuf-java-util:4.33.4",
+        "com.google.protobuf:protobuf-java:4.33.4",
         "com.google.truth:truth:0.45",
-        "com.google.auto.service:auto-service:1.1.1",
-        "com.google.auto.service:auto-service-annotations:1.1.1",
-        "com.google.auto.value:auto-value:1.11.0",
-        "com.google.auto.value:auto-value-annotations:1.11.0",
-        "com.google.dagger:dagger:2.57.2",
-        "com.google.dagger:dagger-compiler:2.57.2",
-        "com.google.dagger:dagger-producers:2.57.2",
-        "org.jetbrains.kotlin:kotlin-metadata-jvm:2.3.0",
+        "com.squareup.moshi:moshi-kotlin-codegen:1.15.2",
+        "com.squareup.moshi:moshi-kotlin:1.15.2",
+        "com.squareup.moshi:moshi:1.15.2",
+        "dev.zacsweers.autoservice:auto-service-ksp:jar:1.2.0",
         "javax.annotation:javax.annotation-api:1.3.2",
         "javax.inject:javax.inject:1",
+        "junit:junit:4.13-beta-3",
         "org.apache.commons:commons-compress:1.26.2",
-        "org.pantsbuild:jarjar:1.7.2",
-        "dev.zacsweers.autoservice:auto-service-ksp:jar:1.2.0",
-        "com.squareup.moshi:moshi:1.15.2",
-        "com.squareup.moshi:moshi-kotlin:1.15.2",
-        "com.squareup.moshi:moshi-kotlin-codegen:1.15.2",
         "org.codehaus.plexus:plexus-utils:3.0.24",
-        "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2",
+        # JetBrains annotations
+        "org.jetbrains:annotations:13.0",
+        # Kotlin stdlib and runtime dependencies
+        "org.jetbrains.kotlin:kotlin-stdlib:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-reflect:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-test:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-script-runtime:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-daemon-client:{}".format(kotlin_version),
+        # Kotlin compiler dependencies
+        "org.jetbrains.kotlin:kotlin-compiler:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-annotation-processing:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:jvm-abi-gen:{}".format(kotlin_version),
+        # Kotlin compiler plugins
+        "org.jetbrains.kotlin:kotlin-allopen-compiler-plugin:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-noarg-compiler-plugin:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-sam-with-receiver-compiler-plugin:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-serialization-compiler-plugin:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-parcelize-compiler:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-parcelize-runtime:{}".format(kotlin_version),
+        # Kotlin embeddable variants
+        "org.jetbrains.kotlin:kotlin-compiler-embeddable:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-annotation-processing-embeddable:{}".format(kotlin_version),
+        # Kotlin build tools (already present)
+        "org.jetbrains.kotlin:kotlin-build-tools-api:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-build-tools-impl:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-metadata-jvm:{}".format(kotlin_version),
+        "org.jetbrains.kotlin:kotlin-compiler-arguments-description:{}".format(kotlin_version),
+        # KSP (Kotlin Symbol Processing)
+        "com.google.devtools.ksp:symbol-processing-api:2.3.4",
+        "com.google.devtools.ksp:symbol-processing-common-deps:2.3.4",
+        "com.google.devtools.ksp:symbol-processing-aa-embeddable:2.3.4",
+        # kotlinx libraries
+        "org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.10.2",
+        "org.jetbrains.kotlinx:kotlinx-serialization-core-jvm:1.8.1",
+        "org.jetbrains.kotlinx:kotlinx-serialization-json-jvm:1.8.1",
+        "com.eed3si9n.jarjarabrams:jarjar-abrams-assembly_2.13:1.14.1",
     ],
     fail_if_repin_required = True,
     fetch_sources = True,
@@ -141,12 +182,7 @@ maven.override(
 )
 use_repo(maven, "kotlin_rules_maven", "unpinned_kotlin_rules_maven")
 
-bazel_dep(name = "rules_pkg", version = "1.0.1")
-
-bazel_dep(name = "stardoc", version = "0.8.1", dev_dependency = True, repo_name = "io_bazel_stardoc")
-bazel_dep(name = "rules_testing", version = "0.9.0", dev_dependency = True)
-bazel_dep(name = "rules_bazel_integration_test", version = "0.37.1", dev_dependency = True)
-
+# Bazel integration test binaries (dev)
 bazel_binaries = use_extension("@rules_bazel_integration_test//:extensions.bzl", "bazel_binaries", dev_dependency = True)
 bazel_binaries.download(version = "7.x")
 bazel_binaries.download(version = "8.x")
@@ -159,3 +195,30 @@ use_repo(
     "build_bazel_bazel_7_x",
     "build_bazel_bazel_8_x",
 )
+
+# RBE preconfig (dev)
+rbe_preconfig = use_repo_rule(
+    "@bazel_ci_rules//:rbe_repo.bzl",
+    "rbe_preconfig",
+)
+
+rbe_preconfig(
+    name = "buildkite_config",
+    dev_dependency = True,
+    toolchain = "ubuntu2204",
+)
+
+# =============================================================================
+# Toolchain Registrations
+# =============================================================================
+
+# Production toolchains
+register_toolchains("//kotlin/internal:default_toolchain")
+
+# Compile CLI toolchain (needed for ksp2 and other internal targets)
+register_toolchains("//src/main/starlark/core/compile/cli")
+
+register_toolchains(
+    "@androidsdk//:all",
+    dev_dependency = True,
+)