Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ common --java_runtime_version=graalvm_25
common --java_language_version=25

## Rust
startup --windows_enable_symlinks
build --enable_runfiles
build --compilation_mode=opt

Expand Down
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
8.2.1
9.0.0-pre.20251025.1
30 changes: 5 additions & 25 deletions MODULE.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ bazel_dep(

bazel_dep(name = "aspect_rules_js", version = "2.5.0")
bazel_dep(name = "aspect_rules_ts", version = "3.7.0")
bazel_dep(name = "rules_nodejs", version = "6.3.2")
bazel_dep(name = "aspect_bazel_lib", version = "2.14.0")
bazel_dep(name = "rules_nodejs", version = "6.6.0")
bazel_dep(name = "aspect_bazel_lib", version = "2.21.2")
bazel_dep(name = "bazel_skylib", version = "1.8.1")
bazel_dep(name = "platforms", version = "1.0.0")

## Node.js
node = use_extension("@rules_nodejs//nodejs:extensions.bzl", "node")
Expand Down Expand Up @@ -136,7 +137,7 @@ register_toolchains(
### JVM ###
###########

bazel_dep(name = "rules_java", version = "8.11.0")
bazel_dep(name = "rules_java", version = "8.16.1")
bazel_dep(name = "rules_graalvm", version = "0.11.2")

# The latest version of rules_graalvm does not support Java 24.
Expand Down Expand Up @@ -170,7 +171,7 @@ register_toolchains(
"@graalvm//:bootstrap_runtime_toolchain",
)

bazel_dep(name = "rules_jvm_external", version = "6.3")
bazel_dep(name = "rules_jvm_external", version = "6.7")

sbt_ext = use_extension("//toolchains/sbt:extensions.bzl", "sbt_ext")
use_repo(sbt_ext, "sbt_repo")
Expand Down Expand Up @@ -255,27 +256,6 @@ use_repo(
"unpinned_maven",
)

#############
### Scala ###
#############

### TODO: This setup is untested and probably does not work.

bazel_dep(name = "platforms", version = "1.0.0")
bazel_dep(name = "rules_scala", version = "7.0.0", repo_name = "io_bazel_rules_scala")

scala_config = use_extension(
"@io_bazel_rules_scala//scala/extensions:config.bzl",
"scala_config",
)
scala_config.settings(scala_version = "2.13.16")

scala_deps = use_extension(
"@io_bazel_rules_scala//scala/extensions:deps.bzl",
"scala_deps",
)
scala_deps.scala()

###################
### ENVIRONMENT ###
###################
Expand Down
2,196 changes: 171 additions & 2,025 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

24 changes: 0 additions & 24 deletions toolchains/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -1,27 +1,3 @@
## Discover dependencies via
## > bazel build <target> --extra_toolchains=//:plus_one_strict_deps_filter
load("@io_bazel_rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")

scala_toolchain(
name = "enso_toolchain_impl",
scalac_jvm_flags = [
"-Djava.security.manager=allow",
],
scalacopts = ["-Ywarn-unused"],
## Allows for easier discovery of missing dependencies
## dependency_mode = "plus-one",
## dependency_tracking_method = "ast",
## strict_deps_mode = "error",
visibility = ["//visibility:public"],
)

toolchain(
name = "enso_toolchain",
toolchain = "enso_toolchain_impl",
toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
visibility = ["//visibility:public"],
)

toolchain(
name = "windows_builtin_tar_toolchain",
exec_compatible_with = [
Expand Down
9 changes: 3 additions & 6 deletions toolchains/flatc/BUILD.bazel.tpl
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
load("@//toolchains/flatc:toolchain.bzl", "flatc_toolchain")
load("@platforms//host:constraints.bzl", "HOST_CONSTRAINTS")

flatc_toolchain(
name = "toolchain_impl",
Expand All @@ -11,10 +12,6 @@ toolchain(
toolchain_type = "@//toolchains/flatc:toolchain_type",
toolchain = ":toolchain_impl",
visibility = ["//visibility:public"],
exec_compatible_with = [
{exec_constraints},
],
target_compatible_with = [
{target_constraints},
],
exec_compatible_with = HOST_CONSTRAINTS,
target_compatible_with = HOST_CONSTRAINTS,
)
18 changes: 0 additions & 18 deletions toolchains/flatc/extensions.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -8,30 +8,12 @@ def _flatc_toolchain_repo_impl(rctx):
sha256 = rctx.attr.sha256,
)
flatc_binary = "flatc"
os_constraint = None
arch_constraint = None
if rctx.attr.os == "windows":
flatc_binary = "flatc.exe"

if rctx.attr.os == "macos":
os_constraint = '"@platforms//os:macos"'
elif rctx.attr.os == "linux":
os_constraint = '"@platforms//os:linux"'
elif rctx.attr.os == "windows":
os_constraint = '"@platforms//os:windows"'

if rctx.attr.arch == "aarch64":
arch_constraint = '"@platforms//cpu:aarch64"'
elif rctx.attr.arch == "x86_64":
arch_constraint = '"@platforms//cpu:x86_64"'

constraints = [os_constraint, arch_constraint]
constraints_str = ", ".join(constraints)
substitutions = {
"{flatc_binary}": str(rctx.path(flatc_binary)),
"{flatc_path}": str(rctx.path(flatc_binary).dirname),
"{exec_constraints}": constraints_str,
"{target_constraints}": constraints_str,
}
rctx.template(
"BUILD.bazel",
Expand Down
Loading