Skip to content

Commit 944b15a

Browse files
authored
Bump bazel version to 8.4.2 (#1382)
* Bump bazel version to 8.4.2 * Fix bazel_features cycle? * Fix RBE * Restore WORKSPACE
1 parent f58613c commit 944b15a

File tree

6 files changed

+18
-6
lines changed

6 files changed

+18
-6
lines changed

.bazelci/presubmit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ matrix:
1313
# - macos
1414
# - windows re-enable when rules_bazel_integration_test can support custom test runner on windows.
1515
test_flags:
16-
- ["--enable_bzlmod=true"]
16+
- []
1717
validate_config: 1
18-
bazel: 7.6.1
18+
bazel: 8.4.2
1919
buildifier:
2020
version: 8.2.0
2121
# no lint warnings for the moment. They are basically a smoke alarm in hell.
@@ -37,7 +37,7 @@ tasks:
3737
test_flags: ${{ integration_shard_flags }}
3838
test_targets:
3939
- //examples:all
40-
rbe_ubuntu1604:
40+
rbe_ubuntu2404:
4141
test_targets:
4242
- "--"
4343
- "//src/test/kotlin/io/bazel/kotlin/builder:builder_tests"

.bazelversion

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
7.6.1
1+
8.4.2

docs/kotlin.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -419,7 +419,7 @@ Define kotlin compiler options.
419419
| <a id="kt_kotlinc_options-x_enable_incremental_compilation"></a>x_enable_incremental_compilation | Enable incremental compilation | Boolean | optional | `False` |
420420
| <a id="kt_kotlinc_options-x_explicit_api_mode"></a>x_explicit_api_mode | Enable explicit API mode for Kotlin libraries. | String | optional | `"off"` |
421421
| <a id="kt_kotlinc_options-x_inline_classes"></a>x_inline_classes | Enable experimental inline classes | Boolean | optional | `False` |
422-
| <a id="kt_kotlinc_options-x_jdk_release"></a>x_jdk_release | Compile against the specified JDK API version, similarly to javac's '-release'. This requires JDK 9 or newer. The supported versions depend on the JDK used; for JDK 17+, the supported versions are 1.8 and 9–21. This also sets the value of '-jvm-target' to be equal to the selected JDK version. | String | optional | `""` |
422+
| <a id="kt_kotlinc_options-x_jdk_release"></a>x_jdk_release | Compile against the specified JDK API version, similarly to javac's '-release'. This requires JDK 9 or newer. The supported versions depend on the JDK used; for JDK 17+, the supported versions are 1.8 and 9–21. This also sets the value of '-jvm-target' to be equal to the selected JDK version. | String | optional | `""` |
423423
| <a id="kt_kotlinc_options-x_jspecify_annotations"></a>x_jspecify_annotations | Controls how JSpecify annotations are treated. Options are 'default', 'ignore', 'warn', and 'strict'. | String | optional | `""` |
424424
| <a id="kt_kotlinc_options-x_jsr_305"></a>x_jsr_305 | Specifies how to handle JSR-305 annotations in Kotlin code. Options are 'default', 'ignore', 'warn', and 'strict'. | String | optional | `""` |
425425
| <a id="kt_kotlinc_options-x_jvm_default"></a>x_jvm_default | Specifies that a JVM default method should be generated for non-abstract Kotlin interface member. | String | optional | `"off"` |
@@ -609,7 +609,7 @@ Call this in the WORKSPACE file to setup the Kotlin rules.
609609
<pre>
610610
load("@rules_kotlin//kotlin:repositories.doc.bzl", "versions")
611611

612-
versions.use_repository(<a href="#versions.use_repository-name">name</a>, <a href="#versions.use_repository-version">version</a>, <a href="#versions.use_repository-rule">rule</a>, <a href="#versions.use_repository-kwargs">kwargs</a>)
612+
versions.use_repository(<a href="#versions.use_repository-name">name</a>, <a href="#versions.use_repository-version">version</a>, <a href="#versions.use_repository-rule">rule</a>, <a href="#versions.use_repository-kwargs">**kwargs</a>)
613613
</pre>
614614

615615

examples/multiplex/MODULE.bazel

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ module(name = "multiplex-example")
33
bazel_dep(name = "rules_java", version = "8.9.0")
44
bazel_dep(name = "rules_kotlin", version = "1.9.5")
55
bazel_dep(name = "rules_jvm_external", version = "6.6")
6+
bazel_dep(name = "bazel_features", version = "1.25.0")
67

78
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
89
maven.install(

examples/multiplex/WORKSPACE

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,17 @@ http_archive(
2121
urls = [url.format(version = versions.BAZEL_SKYLIB.version) for url in versions.BAZEL_SKYLIB.url_templates],
2222
)
2323

24+
http_archive(
25+
name = "bazel_features",
26+
sha256 = versions.BAZEL_FEATURES.sha256,
27+
strip_prefix = versions.BAZEL_FEATURES.strip_prefix_template.format(version = versions.BAZEL_FEATURES.version),
28+
urls = [url.format(version = versions.BAZEL_FEATURES.version) for url in versions.BAZEL_FEATURES.url_templates],
29+
)
30+
31+
load("@bazel_features//:deps.bzl", "bazel_features_deps")
32+
33+
bazel_features_deps()
34+
2435
kotlin_repositories()
2536

2637
##### rules_java setup for rules_android #####

examples/multiplex/WORKSPACE.bzlmod

Whitespace-only changes.

0 commit comments

Comments
 (0)