Skip to content

Commit

Permalink
Merge pull request #2 from michalbogacz/bazel7
Browse files Browse the repository at this point in the history
Update bazel version to 7
  • Loading branch information
michalbogacz authored Sep 24, 2024
2 parents 07f90a6 + b0282e5 commit c392b18
Show file tree
Hide file tree
Showing 7 changed files with 868 additions and 38 deletions.
15 changes: 14 additions & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
@@ -1 +1,14 @@
build --java_language_version=17
build --java_language_version=17
build --java_runtime_version=17
build --tool_java_runtime_version=17
build --tool_java_language_version=17

test --java_language_version=17
test --java_runtime_version=17
test --tool_java_runtime_version=17
test --tool_java_language_version=17

run --java_language_version=17
run --java_runtime_version=17
run --tool_java_runtime_version=17
run --tool_java_language_version=17
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.5.0
7.3.1
Empty file added BUILD
Empty file.
20 changes: 20 additions & 0 deletions MODULE.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
###############################################################################
# Bazel now uses Bzlmod by default to manage external dependencies.
# Please consider migrating your external dependencies from WORKSPACE to MODULE.bazel.
#
# For more details, please check https://github.com/bazelbuild/bazel/issues/18958
###############################################################################
bazel_dep(name = "bazel_skylib", version = "1.7.1")
bazel_dep(name = "rules_jvm_external", version = "6.4")

maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
maven.install(
artifacts = [
"org.scala-lang.modules:scala-xml_2.13:1.3.1",
],
repositories = [
"https://repo1.maven.org/maven2",
],
lock_file = "//:maven_install.json",
)
use_repo(maven, "maven")
334 changes: 334 additions & 0 deletions MODULE.bazel.lock

Large diffs are not rendered by default.

36 changes: 0 additions & 36 deletions WORKSPACE → WORKSPACE.bazel
Original file line number Diff line number Diff line change
@@ -1,15 +1,5 @@
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
http_archive(
name = "bazel_skylib",
sha256 = "9f38886a40548c6e96c106b752f242130ee11aaa068a56ba7e56f4511f33e4f2",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.6.1/bazel-skylib-1.6.1.tar.gz",
],
)

load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
bazel_skylib_workspace()
http_archive(
name = "io_bazel_rules_scala",
sha256 = "e734eef95cf26c0171566bdc24d83bd82bdaf8ca7873bec6ce9b0d524bdaf05d",
Expand Down Expand Up @@ -49,29 +39,3 @@ scala_register_toolchains()
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
scalatest_repositories()
scalatest_toolchain()

RULES_JVM_EXTERNAL_TAG = "6.1"
RULES_JVM_EXTERNAL_SHA = "08ea921df02ffe9924123b0686dc04fd0ff875710bfadb7ad42badb931b0fd50"

http_archive(
name = "rules_jvm_external",
strip_prefix = "rules_jvm_external-%s" % RULES_JVM_EXTERNAL_TAG,
sha256 = RULES_JVM_EXTERNAL_SHA,
url = "https://github.com/bazelbuild/rules_jvm_external/releases/download/%s/rules_jvm_external-%s.tar.gz" % (RULES_JVM_EXTERNAL_TAG, RULES_JVM_EXTERNAL_TAG)
)

load("@rules_jvm_external//:repositories.bzl", "rules_jvm_external_deps")
rules_jvm_external_deps()

load("@rules_jvm_external//:setup.bzl", "rules_jvm_external_setup")
rules_jvm_external_setup()

load("@rules_jvm_external//:defs.bzl", "maven_install")
maven_install(
artifacts = [
"org.scala-lang.modules:scala-xml_2.13:1.3.1",
],
repositories = [
"https://repo1.maven.org/maven2",
],
)
Loading

0 comments on commit c392b18

Please sign in to comment.