diff --git a/MODULE.bazel b/MODULE.bazel index e6248ad..e7af449 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -8,7 +8,6 @@ bazel_dep(name = "platforms", version = "0.0.8") bazel_dep(name = "rules_java", version = "7.1.0") deps = use_extension("//:maven_deps.bzl", "deps") -use_repo(deps, "roborio_jre") bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1") @@ -18,8 +17,6 @@ REMOTE_JDK_REPOS = [ "roboriojdk_win", ] -print(REMOTE_JDK_REPOS) - [use_repo( deps, repo, diff --git a/generate/BUILD.bazel b/generate/BUILD.bazel index 37fe989..9b94164 100644 --- a/generate/BUILD.bazel +++ b/generate/BUILD.bazel @@ -1,18 +1,10 @@ load("@rules_python//python:defs.bzl", "py_binary") -#py_library( -# name = "get_toolchain_dependencies", -# srcs = ["get_toolchain_dependencies.py"], -# visibility = ["//visibility:public"], -# deps = ["@bzlmodrio-gentool//bazelrio_gentool"], -#) - py_binary( name = "generate", srcs = ["generate.py"], visibility = ["//visibility:public"], deps = [ - # ":get_toolchain_dependencies", "@bzlmodrio-gentool//bazelrio_gentool", ], ) @@ -22,7 +14,6 @@ py_binary( srcs = ["publish.py"], visibility = ["//visibility:public"], deps = [ - # ":get_toolchain_dependencies", "@bzlmodrio-gentool//bazelrio_gentool", ], ) diff --git a/generate/generate.py b/generate/generate.py index ffde1f6..8b04010 100644 --- a/generate/generate.py +++ b/generate/generate.py @@ -43,9 +43,6 @@ def main(): template_files, REPO_DIR, os.path.join(SCRIPT_DIR, "templates"), - # group=group, - # repos=repos, - # libraries=libraries, bazel_dependencies=get_bazel_dependencies(), mandatory_dependencies=mandatory_dependencies, ) diff --git a/maven_deps.bzl b/maven_deps.bzl index 0eb8d62..fbf2675 100644 --- a/maven_deps.bzl +++ b/maven_deps.bzl @@ -1,7 +1,3 @@ -load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_file") -load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe") - -# load("@bazel_tools//tools/jdk:remote_java_repository.bzl", "remote_java_repository") load("@rules_java//toolchains:remote_java_repository.bzl", "remote_java_repository") def __setup_jdk_dependencies(mctx): @@ -41,14 +37,6 @@ def __setup_jdk_dependencies(mctx): strip_prefix = "jdk-17.0.4.1+1", ) - maybe( - http_file, - "roborio_jre", - url = "https://github.com/wpilibsuite/frc-openjdk-roborio/releases/download/v2023-17.0.5u7-1/frc2023-openjdk-17-jre_17.0.5u7-1_cortexa9-vfpv3.ipk", - sha256 = "d9003bcdaa8da0d4e1631f0dc6172495a93894d48c68b7f6cefbf4a05a0a67f2", - downloaded_file_path = "roborio_jre", - ) - def setup_legacy_setup_jdk_dependencies(): __setup_jdk_dependencies(None)