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

remove cruft from WORKSPACE and reorganize MODULE.bazel (#4360)

Browse Source
This commit is contained in:
admin
2025-08-26 06:59:20 -07:00
committed by GitHub
parent 18d69c5eeb
commit 1f4822775b
4 changed files with 119 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MODULE.bazel
+113 -107
View File
@@ -1,7 +1,20 @@
bazel_dep(name = "apple_support", repo_name = "build_bazel_apple_support", version = "1.21.1") module(name = "net_eagle0")
# Version constants
SCALA_VERSION = "2.13.16"
NETTY_VERSION = "4.1.110.Final"
SCALAPB_VERSION = "1.0.0-alpha.1"
AWS_SDK_VERSION = "2.28.1"
# #
# Scala support # Core Build Tools
#
bazel_dep(name = "bazel_skylib", version = "1.8.1")
bazel_dep(name = "rules_pkg", version = "1.1.0")
#
# Language Support - Scala
# #
bazel_dep(name = "rules_scala", version = "7.0.0") bazel_dep(name = "rules_scala", version = "7.0.0")
@@ -10,62 +23,40 @@ scala_config = use_extension(
"@rules_scala//scala/extensions:config.bzl", "@rules_scala//scala/extensions:config.bzl",
"scala_config", "scala_config",
) )
scala_config.settings(scala_version = SCALA_VERSION)
scala_config.settings(scala_version = "2.13.16")
scala_deps = use_extension( scala_deps = use_extension(
"@rules_scala//scala/extensions:deps.bzl", "@rules_scala//scala/extensions:deps.bzl",
"scala_deps", "scala_deps",
) )
scala_deps.scala() scala_deps.scala()
scala_deps.scalatest() scala_deps.scalatest()
scala_deps.scala_proto() scala_deps.scala_proto()
register_toolchains(
"//tools:unused_dependency_checker_error_and_opts_toolchain",
"@rules_scala//testing:scalatest_toolchain",
)
# #
# bazel-toolchain # Language Support - C++
# #
bazel_dep(name = "toolchains_llvm", version = "1.4.0") bazel_dep(name = "toolchains_llvm", version = "1.4.0")
# Configure and register the toolchain.
llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm") llvm = use_extension("@toolchains_llvm//toolchain/extensions:llvm.bzl", "llvm")
llvm.toolchain( llvm.toolchain(
name = "llvm_toolchain", name = "llvm_toolchain",
llvm_version = "20.1.2", llvm_version = "20.1.2",
) )
use_repo(llvm, "llvm_toolchain") use_repo(llvm, "llvm_toolchain")
# Set dev_dependency so we can turn this off for swift MacOS builds #
register_toolchains( # Language Support - Go
"@llvm_toolchain//:all", #
dev_dependency = True,
)
bazel_dep(name = "rules_pkg", version = "1.1.0")
bazel_dep(name = "bazel_skylib", version = "1.8.1")
bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "29.2")
bazel_dep(name = "grpc", version = "1.71.0")
bazel_dep(name = "grpc-java", version = "1.71.0")
bazel_dep(name = "googletest", version = "1.17.0")
bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.56.1") bazel_dep(name = "rules_go", repo_name = "io_bazel_rules_go", version = "0.56.1")
bazel_dep(name = "gazelle", repo_name = "bazel_gazelle", version = "0.45.0") bazel_dep(name = "gazelle", repo_name = "bazel_gazelle", version = "0.45.0")
go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk") go_sdk = use_extension("@io_bazel_rules_go//go:extensions.bzl", "go_sdk")
go_sdk.download(version = "1.23.3") go_sdk.download(version = "1.23.3")
go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps") go_deps = use_extension("@bazel_gazelle//:extensions.bzl", "go_deps")
go_deps.from_file(go_mod = "//:go.mod") go_deps.from_file(go_mod = "//:go.mod")
use_repo( use_repo(
@@ -79,64 +70,90 @@ use_repo(
"com_github_google_go_cmp", "com_github_google_go_cmp",
) )
#go_sdk.nogo(
# nogo = "//:my_nogo",
#)
# #
# rules_jvm_external # Platform Support - Apple/iOS
# #
scala_version = "2.13.16" bazel_dep(name = "apple_support", repo_name = "build_bazel_apple_support", version = "1.21.1")
bazel_dep(name = "rules_apple", repo_name = "build_bazel_rules_apple", version = "3.16.1")
bazel_dep(name = "rules_swift", repo_name = "build_bazel_rules_swift", version = "2.3.1")
bazel_dep( #
name = "rules_jvm_external", # Protocol Buffers & RPC
version = "6.3", #
)
bazel_dep(name = "protobuf", repo_name = "com_google_protobuf", version = "29.2")
bazel_dep(name = "grpc", version = "1.71.0")
bazel_dep(name = "grpc-java", version = "1.71.0")
bazel_dep(name = "flatbuffers", version = "25.2.10")
#
# Testing
#
bazel_dep(name = "googletest", version = "1.17.0")
#
# Java/Scala Dependencies
#
bazel_dep(name = "rules_jvm_external", version = "6.3")
maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven") maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
maven.install( maven.install(
artifacts = [ artifacts = [
"org.scala-lang:scala-library:%s" % scala_version, # Netty
"io.netty:netty-codec:4.1.110.Final", "io.netty:netty-codec:%s" % NETTY_VERSION,
"io.netty:netty-codec-http:4.1.110.Final", "io.netty:netty-codec-http:%s" % NETTY_VERSION,
"io.netty:netty-codec-socks:4.1.110.Final", "io.netty:netty-codec-socks:%s" % NETTY_VERSION,
"io.netty:netty-codec-http2:4.1.110.Final", "io.netty:netty-codec-http2:%s" % NETTY_VERSION,
"io.netty:netty-handler:4.1.110.Final", "io.netty:netty-handler:%s" % NETTY_VERSION,
"io.netty:netty-buffer:4.1.110.Final", "io.netty:netty-buffer:%s" % NETTY_VERSION,
"io.netty:netty-transport:4.1.110.Final", "io.netty:netty-transport:%s" % NETTY_VERSION,
"io.netty:netty-resolver:4.1.110.Final", "io.netty:netty-resolver:%s" % NETTY_VERSION,
"io.netty:netty-common:4.1.110.Final", "io.netty:netty-common:%s" % NETTY_VERSION,
"io.netty:netty-handler-proxy:4.1.110.Final", "io.netty:netty-handler-proxy:%s" % NETTY_VERSION,
"com.thesamet.scalapb:lenses_2.13:1.0.0-alpha.1",
"com.thesamet.scalapb:scalapb-json4s_2.13:1.0.0-alpha.1", # ScalaPB
"com.thesamet.scalapb:scalapb-runtime_2.13:1.0.0-alpha.1", "com.thesamet.scalapb:lenses_2.13:%s" % SCALAPB_VERSION,
"com.thesamet.scalapb:scalapb-runtime-grpc_2.13:1.0.0-alpha.1", "com.thesamet.scalapb:scalapb-json4s_2.13:%s" % SCALAPB_VERSION,
"com.thesamet.scalapb:compilerplugin_2.13:1.0.0-alpha.1", "com.thesamet.scalapb:scalapb-runtime_2.13:%s" % SCALAPB_VERSION,
"com.thesamet.scalapb:scalapb-runtime-grpc_2.13:%s" % SCALAPB_VERSION,
"com.thesamet.scalapb:compilerplugin_2.13:%s" % SCALAPB_VERSION,
"com.thesamet.scalapb:protoc-bridge_2.13:0.9.9", "com.thesamet.scalapb:protoc-bridge_2.13:0.9.9",
# JSON
"org.json4s:json4s-ast_2.13:4.0.7", "org.json4s:json4s-ast_2.13:4.0.7",
"org.json4s:json4s-core_2.13:4.0.7", "org.json4s:json4s-core_2.13:4.0.7",
"org.json4s:json4s-native_2.13:4.0.7", "org.json4s:json4s-native_2.13:4.0.7",
# Testing
"org.scalamock:scalamock_2.13:6.0.0", "org.scalamock:scalamock_2.13:6.0.0",
"software.amazon.awssdk:s3-transfer-manager:2.28.1",
"software.amazon.awssdk:s3:2.28.1", # AWS SDK
"software.amazon.awssdk:regions:2.28.1", "software.amazon.awssdk:s3-transfer-manager:%s" % AWS_SDK_VERSION,
"software.amazon.awssdk:aws-core:2.28.1", "software.amazon.awssdk:s3:%s" % AWS_SDK_VERSION,
"software.amazon.awssdk:sdk-core:2.28.1", "software.amazon.awssdk:regions:%s" % AWS_SDK_VERSION,
"org.slf4j:slf4j-api:2.0.16", "software.amazon.awssdk:aws-core:%s" % AWS_SDK_VERSION,
"org.slf4j:slf4j-simple:2.0.16", "software.amazon.awssdk:sdk-core:%s" % AWS_SDK_VERSION,
#"software.amazon.awssdk:sns:2.28.1", "software.amazon.awssdk:utils:%s" % AWS_SDK_VERSION,
"software.amazon.awssdk:utils:2.28.1", "software.amazon.awssdk:http-client-spi:%s" % AWS_SDK_VERSION,
"software.amazon.awssdk:http-client-spi:2.28.1",
"org.reactivestreams:reactive-streams:1.0.4", # AWS Lambda
"com.amazonaws:aws-lambda-java-core:1.2.3", "com.amazonaws:aws-lambda-java-core:1.2.3",
"com.amazonaws:aws-lambda-java-events:3.13.0", "com.amazonaws:aws-lambda-java-events:3.13.0",
# Logging
"org.slf4j:slf4j-api:2.0.16",
"org.slf4j:slf4j-simple:2.0.16",
# Other
"org.reactivestreams:reactive-streams:1.0.4",
"javax.xml.bind:jaxb-api:2.3.1", "javax.xml.bind:jaxb-api:2.3.1",
], ],
duplicate_version_warning = "error", duplicate_version_warning = "error",
fail_if_repin_required = True, fail_if_repin_required = True,
lock_file = "//:maven_install.json", # lock_file = "//:maven_install.json",
repositories = [ repositories = [
"https://repo1.maven.org/maven2", "https://repo1.maven.org/maven2",
], ],
@@ -145,58 +162,47 @@ maven.install(
use_repo(maven, "maven", "unpinned_maven") use_repo(maven, "maven", "unpinned_maven")
# #
# rules_apple # External Libraries
# #
bazel_dep(
name = "rules_apple",
repo_name = "build_bazel_rules_apple",
version = "3.16.1",
)
bazel_dep(
name = "rules_swift",
repo_name = "build_bazel_rules_swift",
version = "2.3.1",
)
#
# Unbazelified imports
#
http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive") http_archive = use_repo_rule("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
# # GTL (for parallel_hashmap)
# flatbuffers GTL_VERSION = "1.2.0"
# GTL_SHA = "1969c45dd76eac0dd87e9e2b65cffe358617f4fe1bcd203f72f427742537913a"
bazel_dep(name = "flatbuffers", version = "25.2.10")
#
# gtl (for parallel_hashmap)
#
gtl_version = "1.2.0"
gtl_sha = "1969c45dd76eac0dd87e9e2b65cffe358617f4fe1bcd203f72f427742537913a"
http_archive( http_archive(
name = "gtl", name = "gtl",
build_file = "@//external:BUILD.gtl", build_file = "@//external:BUILD.gtl",
sha256 = gtl_sha, sha256 = GTL_SHA,
strip_prefix = "gtl-%s" % gtl_version, strip_prefix = "gtl-%s" % GTL_VERSION,
url = "https://github.com/greg7mdp/gtl/archive/refs/tags/v%s.zip" % gtl_version, url = "https://github.com/greg7mdp/gtl/archive/refs/tags/v%s.zip" % GTL_VERSION,
) )
# # Unity GoDice Plugin
# Plugins for the native code for interacting with GoDice UNITY_GODICE_COMMIT = "18d6823991592e4d45fcc0f22692db849dea9063"
# UNITY_GODICE_SHA = "04e6ae4155965aab3372592e04061eba1256bb6ea7ccffd0d83f27574e5b3349"
unity_godice_commit = "18d6823991592e4d45fcc0f22692db849dea9063"
unity_godice_sha = "04e6ae4155965aab3372592e04061eba1256bb6ea7ccffd0d83f27574e5b3349"
http_archive( http_archive(
name = "net_eagle0_unity_godice", name = "net_eagle0_unity_godice",
sha256 = unity_godice_sha, sha256 = UNITY_GODICE_SHA,
strip_prefix = "godice-framework-%s" % unity_godice_commit, strip_prefix = "godice-framework-%s" % UNITY_GODICE_COMMIT,
urls = [ urls = [
"https://github.com/nolen777/godice-framework/archive/%s.zip" % unity_godice_commit, "https://github.com/nolen777/godice-framework/archive/%s.zip" % UNITY_GODICE_COMMIT,
], ],
) )
#
# Toolchain Registration
#
register_toolchains(
"//tools:unused_dependency_checker_error_and_opts_toolchain",
"@rules_scala//testing:scalatest_toolchain",
)
# Set dev_dependency so we can turn this off for swift MacOS builds
register_toolchains(
"@llvm_toolchain//:all",
dev_dependency = True,
)
MODULE.bazel.lock
Generated
+3 -3
View File
@@ -1265,7 +1265,7 @@
"@@rules_scala~//scala/extensions:config.bzl%scala_config": { "@@rules_scala~//scala/extensions:config.bzl%scala_config": {
"general": { "general": {
"bzlTransitiveDigest": "TYEDBdoN7s4wE8er7JwzFt7+3iw57BHsTSLyWmxbgZo=", "bzlTransitiveDigest": "TYEDBdoN7s4wE8er7JwzFt7+3iw57BHsTSLyWmxbgZo=",
"usagesDigest": "0vjuUHyDlTJdFxMcWpJHhl10FwoAAgGGpZKyUV9NiGI=", "usagesDigest": "OkrNNMZt+eU1JnoWW+bmuQbIeXJeFIEY6T9ivP/iNVc=",
"recordedFileInputs": {}, "recordedFileInputs": {},
"recordedDirentsInputs": {}, "recordedDirentsInputs": {},
"envVariables": { "envVariables": {
@@ -1291,7 +1291,7 @@
"@@rules_scala~//scala/extensions:deps.bzl%scala_deps": { "@@rules_scala~//scala/extensions:deps.bzl%scala_deps": {
"general": { "general": {
"bzlTransitiveDigest": "aQWZ20GOW0DP3zHiRvT7LxxVMewcf19hw78i2LtnoHQ=", "bzlTransitiveDigest": "aQWZ20GOW0DP3zHiRvT7LxxVMewcf19hw78i2LtnoHQ=",
"usagesDigest": "6QHHHVz+Tql2vcG26XvkwGE3HYdzTylBmH1GPeoeVaQ=", "usagesDigest": "pjWuVKMiOuJt2ASpLtxMo0Iwn6uRSLS1AsTpaBNMCBY=",
"recordedFileInputs": {}, "recordedFileInputs": {},
"recordedDirentsInputs": {}, "recordedDirentsInputs": {},
"envVariables": {}, "envVariables": {},
@@ -4488,7 +4488,7 @@
"@@toolchains_llvm~//toolchain/extensions:llvm.bzl%llvm": { "@@toolchains_llvm~//toolchain/extensions:llvm.bzl%llvm": {
"general": { "general": {
"bzlTransitiveDigest": "afRF0aFOIUrkYl3o040WQ606ep1qciEXzjnAxT3Kek8=", "bzlTransitiveDigest": "afRF0aFOIUrkYl3o040WQ606ep1qciEXzjnAxT3Kek8=",
"usagesDigest": "wl2njI0HdPm89XuKGMWIa1gyCAQ5gvOs+ksjFd4QbZs=", "usagesDigest": "sYVuhiCAQehFTnGTv0bNtTBR4WorebpWBNxF0mRusyw=",
"recordedFileInputs": {}, "recordedFileInputs": {},
"recordedDirentsInputs": {}, "recordedDirentsInputs": {},
"envVariables": {}, "envVariables": {},
WORKSPACE
+2 -3
View File
@@ -1,3 +1,2 @@
workspace(name = "net_eagle0") # This file marks the root of the Bazel workspace.
# See MODULE.bazel for external dependencies and setup.
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
maven_install.json
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL", "__AUTOGENERATED_FILE_DO_NOT_MODIFY_THIS_FILE_MANUALLY": "THERE_IS_NO_DATA_ONLY_ZUUL",
"__INPUT_ARTIFACTS_HASH": -690832229, "__INPUT_ARTIFACTS_HASH": 796050561,
"__RESOLVED_ARTIFACTS_HASH": 1915812668, "__RESOLVED_ARTIFACTS_HASH": 1915812668,
"conflict_resolution": { "conflict_resolution": {
"com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2", "com.google.guava:failureaccess:1.0.1": "com.google.guava:failureaccess:1.0.2",