Auto Update to '2025.0.0-beta-5'

MODULE.bazel

@@ -1,17 +1,17 @@
 module(
     name = "bzlmodrio-choreolib",
-    version = "2025.0.0-beta-3",
-    compatibility_level = 2024,
+    version = "2025.0.0-beta-5",
+    compatibility_level = 2025,
 )
 
 bazel_dep(name = "platforms", version = "0.0.9")
 bazel_dep(name = "rules_cc", version = "0.0.9")
 bazel_dep(name = "rules_java", version = "7.6.5")
 bazel_dep(name = "rules_jvm_external", version = "6.1")
 bazel_dep(name = "rules_bzlmodrio_toolchains", version = "2024-1.bcr1")
-bazel_dep(name = "bzlmodrio-allwpilib", version = "2024.1.1")
+bazel_dep(name = "bzlmodrio-allwpilib", version = "2025.1.1-beta-1")
 bazel_dep(name = "bzlmodrio-opencv", version = "2024.4.8.0-4.bcr1")
-bazel_dep(name = "bzlmodrio-ni", version = "2024.2.1.bcr1")
+bazel_dep(name = "bzlmodrio-ni", version = "2025.0.0")
 
 maven = use_extension("@rules_jvm_external//:extensions.bzl", "maven")
 maven.install(
@@ -32,23 +32,18 @@ use_repo(
 setup_bzlmodrio_choreolib_cpp_dependencies = use_extension("//:maven_cpp_deps.bzl", "setup_bzlmodrio_choreolib_cpp_dependencies")
 use_repo(
     setup_bzlmodrio_choreolib_cpp_dependencies,
-    "bazelrio_choreo-cli_linux-x86_64",
-    "bazelrio_choreo-cli_macos-aarch64",
-    "bazelrio_choreo-cli_macos-x86_64",
-    "bazelrio_choreo-cli_windows-aarch64.exe",
-    "bazelrio_choreo-cli_windows-x86_64.exe",
     "bazelrio_choreo_choreolib-cpp_headers",
     "bazelrio_choreo_choreolib-cpp_linuxarm32",
     "bazelrio_choreo_choreolib-cpp_linuxarm64",
     "bazelrio_choreo_choreolib-cpp_linuxathena",
     "bazelrio_choreo_choreolib-cpp_linuxx86-64",
     "bazelrio_choreo_choreolib-cpp_osxuniversal",
     "bazelrio_choreo_choreolib-cpp_windowsx86-64",
-    "bazelrio_choreo_linux-x86_64",
-    "bazelrio_choreo_macos-aarch64",
-    "bazelrio_choreo_macos-x86_64",
-    "bazelrio_choreo_windows-aarch64.exe",
-    "bazelrio_choreo_windows-x86_64.exe",
+    "bazelrio_choreo_linux-x86_64-standalone",
+    "bazelrio_choreo_macos-aarch64-standalone",
+    "bazelrio_choreo_macos-x86_64-standalone",
+    "bazelrio_choreo_windows-aarch64-standalone",
+    "bazelrio_choreo_windows-x86_64-standalone",
 )
 
 setup_bzlmodrio_choreolib_java_dependencies = use_extension("//:maven_java_deps.bzl", "setup_bzlmodrio_choreolib_java_dependencies")

generate/generate.py

@@ -43,18 +43,22 @@ def main():
     )
     generate_meta_deps(output_dir, group, force_tests=args.force_tests)
 
-    for exe_tool in group.single_file_binaries:
-        template_base = os.path.join(
-            TEMPLATE_BASE_DIR, "library_wrapper", "libraries", "single_file_binary"
-        )
-        lib_dir = os.path.join(output_dir, "tools", exe_tool.tool_name)
-        # test_dir = os.path.join(base_output_directory, "..", "tests", "tools", exe_tool.artifact_name)
+    for exe_tool in group.bundled_executable_tools:
+        for child_tool in exe_tool.children_tools:
+            template_base = os.path.join(
+                TEMPLATE_BASE_DIR,
+                "library_wrapper",
+                "libraries",
+                "bundled_executable_tools",
+            )
+            lib_dir = os.path.join(output_dir, "tools", child_tool)
 
-        # Write BUILD file
-        template_file = os.path.join(template_base, "BUILD.bazel.jinja2")
-        output_file = os.path.join(lib_dir, "BUILD")
-        print(template_file, output_file)
-        render_template(template_file, output_file, target=exe_tool)
+            # Write BUILD file
+            template_file = os.path.join(template_base, "BUILD.bazel.jinja2")
+            output_file = os.path.join(lib_dir, "BUILD")
+            render_template(
+                template_file, output_file, target=exe_tool, child_tool=child_tool
+            )
 
     manual_cleanup(REPO_DIR)
 

generate/get_choreolib_dependencies.py

@@ -16,18 +16,19 @@ def _executable_tool(
     lower_target_name=False,
 ):
     native_platforms = [
-        "Linux-x86_64",
-        "macOS-aarch64",
-        "macOS-x86_64",
-        "Windows-aarch64.exe",
-        "Windows-x86_64.exe",
+        "Linux-x86_64-standalone",
+        "macOS-aarch64-standalone",
+        "macOS-x86_64-standalone",
+        "Windows-aarch64-standalone",
+        "Windows-x86_64-standalone",
     ]
 
-    maven_dep.create_single_file_binary(
+    maven_dep.create_bundled_executable_tools(
         url_base="https://github.com/SleipnirGroup/Choreo/releases/download",
         tool_name=tool_name,
         resources=native_platforms,
         version=maven_dep.version,
+        children_tools=["choreo", "choreo-cli"],
         fail_on_hash_miss=True,
     )
 
@@ -36,9 +37,9 @@ def get_choreolib_dependencies(
     use_local_allwpilib=False,
     use_local_opencv=False,
     use_local_ni=True,
-    allwpilib_version_override="2024.1.1",
+    allwpilib_version_override="2025.1.1-beta-1",
     opencv_version_override="2024.4.8.0-4.bcr1",
-    ni_version_override="2024.2.1.bcr1",
+    ni_version_override="2025.0.0",
 ):
     SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
 
@@ -100,7 +101,6 @@ def get_choreolib_dependencies(
         ],
     )
 
-    _executable_tool(group, tool_name="Choreo-CLI", lower_target_name=True)
     _executable_tool(group, tool_name="Choreo", lower_target_name=True)
 
     return group

generate/vendor_dep.json

@@ -1,18 +1,19 @@
 {
     "fileName": "ChoreoLib2025Beta.json",
     "name": "ChoreoLib",
-    "version": "2025.0.0-beta-3",
+    "version": "2025.0.0-beta-5",
     "uuid": "b5e23f0a-dac9-4ad2-8dd6-02767c520aca",
-    "frcYear": "2024",
+    "frcYear": "2025",
     "mavenUrls": [
-        "https://SleipnirGroup.github.io/ChoreoLib/dep"
+        "https://SleipnirGroup.github.io/ChoreoLib/dep",
+        "https://repo1.maven.org/maven2"
     ],
     "jsonUrl": "https://SleipnirGroup.github.io/ChoreoLib/dep/ChoreoLib2025Beta.json",
     "javaDependencies": [
         {
             "groupId": "choreo",
             "artifactId": "ChoreoLib-java",
-            "version": "2025.0.0-beta-3"
+            "version": "2025.0.0-beta-5"
         },
         {
             "groupId": "com.google.code.gson",
@@ -25,7 +26,7 @@
         {
             "groupId": "choreo",
             "artifactId": "ChoreoLib-cpp",
-            "version": "2025.0.0-beta-3",
+            "version": "2025.0.0-beta-5",
             "libName": "ChoreoLib",
             "headerClassifier": "headers",
             "sharedLibrary": false,

libraries/tools/Choreo-CLI/BUILD → libraries/tools/choreo-cli/BUILD

@@ -1,8 +1,8 @@
 alias(
-    name = "Choreo-CLI",
+    name = "choreo-cli",
     actual = select({
-        "@rules_bzlmodrio_toolchains//conditions:linux_x86_64": "@bazelrio_choreo-cli_linux-x86_64//file:downloaded",
-        "@rules_bzlmodrio_toolchains//conditions:osx": "@bazelrio_choreo-cli_macos-x86_64//file:downloaded",
-        "@rules_bzlmodrio_toolchains//conditions:windows": "@bazelrio_choreo-cli_windows-x86_64.exe//file:downloaded",
+        "@rules_bzlmodrio_toolchains//conditions:linux_x86_64": "@bazelrio_choreo_linux-x86_64-standalone//:choreo-cli",
+        "@rules_bzlmodrio_toolchains//conditions:osx": "@bazelrio_choreo_macos-x86_64-standalone//:choreo-cli",
+        "@rules_bzlmodrio_toolchains//conditions:windows": "@bazelrio_choreo_windows-x86_64-standalone//:choreo-cli.exe",
     }),
 )

libraries/tools/Choreo/BUILD → libraries/tools/choreo/BUILD

@@ -1,8 +1,8 @@
 alias(
-    name = "Choreo",
+    name = "choreo",
     actual = select({
-        "@rules_bzlmodrio_toolchains//conditions:linux_x86_64": "@bazelrio_choreo_linux-x86_64//file:downloaded",
-        "@rules_bzlmodrio_toolchains//conditions:osx": "@bazelrio_choreo_macos-x86_64//file:downloaded",
-        "@rules_bzlmodrio_toolchains//conditions:windows": "@bazelrio_choreo_windows-x86_64.exe//file:downloaded",
+        "@rules_bzlmodrio_toolchains//conditions:linux_x86_64": "@bazelrio_choreo_linux-x86_64-standalone//:choreo",
+        "@rules_bzlmodrio_toolchains//conditions:osx": "@bazelrio_choreo_macos-x86_64-standalone//:choreo",
+        "@rules_bzlmodrio_toolchains//conditions:windows": "@bazelrio_choreo_windows-x86_64-standalone//:choreo.exe",
     }),
 )

private/non_bzlmod_dependencies/download_dependencies.bzl

@@ -36,8 +36,8 @@ def download_dependencies():
     # bzlmodrio-allwpilib
     http_archive(
         name = "bzlmodrio-allwpilib",
-        sha256 = "c549e941f174d47c7b01c13e4fcdf91c9dac9c57d2af7ed06d92f5d3ea1fe819",
-        url = "https://github.com/bzlmodRio/bzlmodRio-allwpilib/releases/download/2024.1.1/bzlmodRio-allwpilib-2024.1.1.tar.gz",
+        sha256 = "986e7ba1cdb7cacadb22256185843ba12bd1c5e2b6da10019829f18bedafa3ee",
+        url = "https://github.com/bzlmodRio/bzlmodRio-allwpilib/releases/download/2025.1.1-beta-1/bzlmodRio-allwpilib-2025.1.1-beta-1.tar.gz",
     )
 
     # bzlmodrio-opencv
@@ -50,8 +50,8 @@ def download_dependencies():
     # bzlmodrio-ni
     http_archive(
         name = "bzlmodrio-ni",
-        sha256 = "28abfa366389514669dabf9e71cc723749f650e98a689bf428ec1fc998ca5de9",
-        url = "https://github.com/bzlmodRio/bzlmodRio-ni/releases/download/2024.2.1.bcr1/bzlmodRio-ni-2024.2.1.bcr1.tar.gz",
+        sha256 = "197fceac88bf44fb8427d5e000b0083118d3346172dd2ad31eccf83a5e61b3ce",
+        url = "https://github.com/bzlmodRio/bzlmodRio-ni/releases/download/2025.0.0/bzlmodRio-ni-2025.0.0.tar.gz",
     )
 
     ########################