From 593ee12969a8c1f33ebfbe9c4299f89daf1862c6 Mon Sep 17 00:00:00 2001 From: PJ Reiniger Date: Fri, 29 Dec 2023 02:43:38 -0500 Subject: [PATCH] Testing --- MODULE.bazel | 2 +- generate/get_toolchain_dependencies.py | 4 +++- generate/templates/MODULE.bazel.jinja2 | 6 +++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/MODULE.bazel b/MODULE.bazel index b1054b4..567c800 100644 --- a/MODULE.bazel +++ b/MODULE.bazel @@ -1,6 +1,6 @@ module( name = "rules_bzlmodrio_jdk", - version = "17.0.8+7", + version = "17.0.8-7", compatibility_level = 2024, ) diff --git a/generate/get_toolchain_dependencies.py b/generate/get_toolchain_dependencies.py index ec936ec..884cf44 100644 --- a/generate/get_toolchain_dependencies.py +++ b/generate/get_toolchain_dependencies.py @@ -30,9 +30,11 @@ def __init__( self.jdk_version = jdk_version self.escaped_version = escaped_version self.underscore_version = underscore_version + self.jre_version = jre_version self.version = jdk_version - self.sanitized_version = jdk_version + self.sanitized_version = self.version.replace("+", "-") self.patch = "" + self.year = "2024" platforms = [] diff --git a/generate/templates/MODULE.bazel.jinja2 b/generate/templates/MODULE.bazel.jinja2 index 0a54dec..f6592ca 100644 --- a/generate/templates/MODULE.bazel.jinja2 +++ b/generate/templates/MODULE.bazel.jinja2 @@ -1,7 +1,7 @@ module( - name = "rules_bzlmodrio_jdk", - version = "{{group.jdk_version}}", - compatibility_level = 2024, + name = "{{group.repo_name}}", + version = "{{group.sanitized_version}}{{group.patch}}", + compatibility_level = {{group.year}}, ) {{bazel_dependencies.platforms.module_dep()}}