admin/eagle0
1
0
Fork 0
mirror of https://github.com/nolen777/eagle0.git synced 2026-07-28 20:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update rules_scala to 7.0.0 and move to bzlmod (#4358)

Browse Source 
* just the basics

* try this

* update one dep and replace remaining io_bazel_rules_scala

* cleanup

* unused deps

* cleanup

* moar
This commit is contained in:
admin
2025-08-26 06:39:22 -07:00
committed by GitHub
parent 1adbe00baf
commit 18d69c5eeb
7 changed files with 3127 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MODULE.bazel
+31 -2
View File
@@ -1,5 +1,34 @@
bazel_dep(name = "apple_support", repo_name = "build_bazel_apple_support", version = "1.21.1")
#
# Scala support
#
bazel_dep(name = "rules_scala", version = "7.0.0")
scala_config = use_extension(
"@rules_scala//scala/extensions:config.bzl",
"scala_config",
)
scala_config.settings(scala_version = "2.13.16")
scala_deps = use_extension(
"@rules_scala//scala/extensions:deps.bzl",
"scala_deps",
)
scala_deps.scala()
scala_deps.scalatest()
scala_deps.scala_proto()
register_toolchains(
"//tools:unused_dependency_checker_error_and_opts_toolchain",
"@rules_scala//testing:scalatest_toolchain",
)
#
# bazel-toolchain
#
@@ -58,7 +87,7 @@ use_repo(
# rules_jvm_external
#
scala_version = "2.13.14"
scala_version = "2.13.16"
bazel_dep(
name = "rules_jvm_external",
@@ -85,7 +114,7 @@ maven.install(
"com.thesamet.scalapb:scalapb-runtime_2.13:1.0.0-alpha.1",
"com.thesamet.scalapb:scalapb-runtime-grpc_2.13:1.0.0-alpha.1",
"com.thesamet.scalapb:compilerplugin_2.13:1.0.0-alpha.1",
"com.thesamet.scalapb:protoc-bridge_2.13:0.9.8",
"com.thesamet.scalapb:protoc-bridge_2.13:0.9.9",
"org.json4s:json4s-ast_2.13:4.0.7",
"org.json4s:json4s-core_2.13:4.0.7",
"org.json4s:json4s-native_2.13:4.0.7",
MODULE.bazel.lock
Generated
+3074
View File
File diff suppressed because it is too large Load Diff
WORKSPACE
-56
View File
@@ -1,59 +1,3 @@
workspace(name = "net_eagle0")
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
#
# Scala support
#
scala_version = "2.13.14"
#rules_scala_version = "6.6.0"
#rules_scala_sha = "e734eef95cf26c0171566bdc24d83bd82bdaf8ca7873bec6ce9b0d524bdaf05d"
#http_archive(
# name = "rules_scala",
# sha256 = rules_scala_sha,
# strip_prefix = "rules_scala-%s" % rules_scala_version,
# url = "https://github.com/bazelbuild/rules_scala/releases/download/v%s/rules_scala-v%s.tar.gz" % (rules_scala_version, rules_scala_version),
#)
# Using a commit from master to get 2.13.14 support. Restore the commented-out lines above with a new
# release version when one is cut.
rules_scala_commit = "e53a43bf48f10a5906b3e91c21798281cec1b334"
rules_scala_sha = "b4fd903724d084d9d9f45e17fc22391bda745bf0574f8934d38a9c1c2fc18834"
http_archive(
name = "io_bazel_rules_scala",
sha256 = rules_scala_sha,
strip_prefix = "rules_scala-%s" % rules_scala_commit,
url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip" % rules_scala_commit,
)
# Alias for forward compatibility - new name points to the same repository
http_archive(
name = "rules_scala",
sha256 = rules_scala_sha,
strip_prefix = "rules_scala-%s" % rules_scala_commit,
url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip" % rules_scala_commit,
)
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
scala_config(scala_version = scala_version)
load("//tools:toolchains.bzl", "scala_register_toolchains")
scala_register_toolchains()
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
scala_repositories()
load("@io_bazel_rules_scala//testing:scalatest.bzl", "scalatest_repositories", "scalatest_toolchain")
scalatest_repositories()
scalatest_toolchain()
maven_install.json
+7 -8
View File
@@ -1,7 +1,7 @@
{
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": 644967262,
"__RESOLVED_ARTIFACTS_HASH": -595552834,
"__INPUT_ARTIFACTS_HASH": -690832229,
"__RESOLVED_ARTIFACTS_HASH": 1915812668,
"conflict_resolution": {
"com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2",
"io.netty:netty-buffer:4.1.110.Final": "io.netty:netty-buffer:4.1.112.Final",
@@ -14,8 +14,7 @@
"io.netty:netty-transport-native-unix-common:4.1.110.Final": "io.netty:netty-transport-native-unix-common:4.1.112.Final",
"io.netty:netty-transport:4.1.110.Final": "io.netty:netty-transport:4.1.112.Final",
"io.opencensus:opencensus-api:0.31.0": "io.opencensus:opencensus-api:0.31.1",
"org.checkerframework:checker-qual:3.12.0": "org.checkerframework:checker-qual:3.43.0",
"org.scala-lang:scala-library:2.13.14": "org.scala-lang:scala-library:2.13.15"
"org.checkerframework:checker-qual:3.12.0": "org.checkerframework:checker-qual:3.43.0"
},
"artifacts": {
"com.amazonaws:aws-lambda-java-core": {
@@ -182,9 +181,9 @@
},
"com.thesamet.scalapb:protoc-bridge_2.13": {
"shasums": {
"jar": "0b3827da2cd9bca867d6963c2a821e7eaff41f5ac3babf671c4c00408bd14a9b"
"jar": "d3b70d7ef67e9186d25b10898b115d27bf2ccf53e9f3d136404420d2ec52ed66"
},
"version": "0.9.8"
"version": "0.9.9"
},
"com.thesamet.scalapb:protoc-gen_2.13": {
"shasums": {
@@ -517,9 +516,9 @@
},
"org.scala-lang:scala-library": {
"shasums": {
"jar": "8e4dbc3becf70d59c787118f6ad06fab6790136a0699cd6412bc9da3d336944e"
"jar": "1ebb2b6f9e4eb4022497c19b1e1e825019c08514f962aaac197145f88ed730f1"
},
"version": "2.13.15"
"version": "2.13.16"
},
"org.scala-lang:scala-reflect": {
"shasums": {
src/main/scala/net/eagle0/eagle/BUILD.bazel
+1 -1
View File
@@ -17,7 +17,7 @@ scala_binary(
"//src/main/scala/net/eagle0/eagle/service:games_manager",
"//src/main/scala/net/eagle0/eagle/service:server_setup_helpers",
"//src/main/scala/net/eagle0/eagle/shardok_interface:battle_update_receiver",
"@maven//:com_thesamet_scalapb_scalapb_runtime_2_13",
# "@maven//:com_thesamet_scalapb_scalapb_runtime_2_13",
],
)
src/test/scala/net/eagle0/eagle/library/actions/impl/command/BUILD.bazel
-2
View File
@@ -848,8 +848,6 @@ scala_test(
"//src/main/scala/net/eagle0/eagle/model/action_result/types:rest_result_type",
"//src/main/scala/net/eagle0/eagle/model/state/hero",
"//src/main/scala/net/eagle0/eagle/model/state/hero/concrete",
"//src/main/scala/net/eagle0/eagle/model/state/province",
"//src/main/scala/net/eagle0/eagle/model/state/province/concrete",
],
)
tools/BUILD.bazel
+14 -28
View File
@@ -1,36 +1,22 @@
load("@io_bazel_rules_scala//scala:providers.bzl", "declare_deps_provider")
load("@io_bazel_rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")
load("@io_bazel_rules_scala//scala_proto:scala_proto_toolchain.bzl", "scala_proto_deps_toolchain", "scala_proto_toolchain")
load("@rules_scala//scala:providers.bzl", "declare_deps_provider")
load("@rules_scala//scala:scala_toolchain.bzl", "scala_toolchain")
load("@rules_scala//scala_proto:scala_proto_toolchain.bzl", "scalapb_toolchain")
scala_proto_deps_toolchain(
name = "custom_scalapb_deps_toolchain_impl",
dep_providers = [
":custom_grpc_deps",
":custom_compile_deps",
":custom_worker_deps",
scalapb_toolchain(
name = "custom_scalapb_toolchain_impl",
opts = [
"grpc",
"flat_package",
"java_conversions",
"single_line_to_proto_string",
],
visibility = ["//visibility:public"],
)
toolchain(
name = "custom_scalapb_deps_toolchain",
toolchain = ":custom_scalapb_deps_toolchain_impl",
toolchain_type = "@io_bazel_rules_scala//scala_proto:deps_toolchain_type",
visibility = ["//visibility:public"],
)
scala_proto_toolchain(
name = "custom_scalapb_toolchain_impl",
visibility = ["//visibility:public"],
with_flat_package = False,
with_grpc = True,
with_single_line_to_string = False,
)
toolchain(
name = "custom_scalapb_toolchain",
toolchain = ":custom_scalapb_toolchain_impl",
toolchain_type = "@io_bazel_rules_scala//scala_proto:toolchain_type",
toolchain_type = "@rules_scala//scala_proto:toolchain_type",
)
scala_toolchain(
@@ -45,8 +31,8 @@ scala_toolchain(
"-Wunused:locals",
# "-Xsource:3",
"-Werror",
# Treat all warnings as errors inside src, silence warnings elsewhere (ie third party deps)
"-Wconf:src=external/rules_scala/.*:silent,src=external/protobuf~/.*:silent,src=external/io_bazel_rules_scala/.*:silent",
# Treat all warnings as errors inside src, silence warnings elsewhere (ie third party deps and rules_scala)
"-Wconf:src=external/rules_scala~/.*:silent,src=external/protobuf~/.*:silent",
],
unused_dependency_checker_mode = "error",
visibility = ["//visibility:public"],
@@ -55,7 +41,7 @@ scala_toolchain(
toolchain(
name = "unused_dependency_checker_error_and_opts_toolchain",
toolchain = ":unused_dependency_checker_error_and_opts_toolchain_impl",
toolchain_type = "@io_bazel_rules_scala//scala:toolchain_type",
toolchain_type = "@rules_scala//scala:toolchain_type",
visibility = ["//visibility:public"],
)