From 775d4dfb1573d79c57c20d76cd3d7729a7a6d07c Mon Sep 17 00:00:00 2001 From: John Millikin Date: Fri, 6 Sep 2024 14:02:20 +0900 Subject: [PATCH 1/3] Add javacc and javaparser --- modules/javacc/7.0.13/MODULE.bazel | 5 + .../7.0.13/patches/build_with_bazel.patch | 322 ++++++++++++++++++ .../7.0.13/patches/module_dot_bazel.patch | 8 + modules/javacc/7.0.13/presubmit.yml | 19 ++ modules/javacc/7.0.13/source.json | 10 + modules/javacc/metadata.json | 14 + modules/javaparser/3.26.2/MODULE.bazel | 10 + .../3.26.2/patches/build_with_bazel.patch | 112 ++++++ .../3.26.2/patches/module_dot_bazel.patch | 13 + modules/javaparser/3.26.2/presubmit.yml | 22 ++ modules/javaparser/3.26.2/source.json | 10 + modules/javaparser/metadata.json | 14 + 12 files changed, 559 insertions(+) create mode 100644 modules/javacc/7.0.13/MODULE.bazel create mode 100644 modules/javacc/7.0.13/patches/build_with_bazel.patch create mode 100644 modules/javacc/7.0.13/patches/module_dot_bazel.patch create mode 100644 modules/javacc/7.0.13/presubmit.yml create mode 100644 modules/javacc/7.0.13/source.json create mode 100644 modules/javacc/metadata.json create mode 100644 modules/javaparser/3.26.2/MODULE.bazel create mode 100644 modules/javaparser/3.26.2/patches/build_with_bazel.patch create mode 100644 modules/javaparser/3.26.2/patches/module_dot_bazel.patch create mode 100644 modules/javaparser/3.26.2/presubmit.yml create mode 100644 modules/javaparser/3.26.2/source.json create mode 100644 modules/javaparser/metadata.json diff --git a/modules/javacc/7.0.13/MODULE.bazel b/modules/javacc/7.0.13/MODULE.bazel new file mode 100644 index 00000000000..e5d9ac2c9bd --- /dev/null +++ b/modules/javacc/7.0.13/MODULE.bazel @@ -0,0 +1,5 @@ +module( + name = "javacc", + version = "7.0.13", + compatibility_level = 1, +) diff --git a/modules/javacc/7.0.13/patches/build_with_bazel.patch b/modules/javacc/7.0.13/patches/build_with_bazel.patch new file mode 100644 index 00000000000..355f7034b56 --- /dev/null +++ b/modules/javacc/7.0.13/patches/build_with_bazel.patch @@ -0,0 +1,322 @@ +--- /dev/null ++++ BUILD.bazel +@@ -0,0 +1,251 @@ ++load(":javacc_bootstrap.bzl", "javacc_bootstrap") ++ ++JAVAC_OPTS = [ ++ "-XepAllErrorsAsWarnings", ++ "-Xep:ComparisonOutOfRange:OFF", ++ "-Xep:ChainingConstructorIgnoresParameter:OFF", ++] ++ ++JAR_RESOURCES = glob(["src/main/resources/**/*"]) ++ ++JAVACC_PARSER_SRCS = glob([ ++ "src/main/java/org/javacc/parser/**/*.java", ++ "src/main/java/org/javacc/utils/**/*.java", ++]) ++ ++JTREE_SRCS = glob([ ++ "src/main/java/org/javacc/jjtree/**/*.java", ++]) ++ ++java_library( ++ name = "javacc_version", ++ srcs = ["src/main/java/org/javacc/Version.java"], ++) ++ ++java_library( ++ name = "javacc_parser", ++ srcs = JAVACC_PARSER_SRCS + [ ++ ":javacc_stage2_ConditionParser", ++ ":javacc_stage2_JavaCC", ++ ], ++ javacopts = JAVAC_OPTS, ++ deps = [":javacc_version"], ++) ++ ++java_binary( ++ name = "javacc", ++ srcs = ["src/main/java/javacc.java"], ++ javacopts = JAVAC_OPTS, ++ main_class = "javacc", ++ resources = JAR_RESOURCES, ++ visibility = ["//visibility:public"], ++ deps = [":javacc_parser"], ++) ++ ++java_binary( ++ name = "jjdoc", ++ srcs = ["src/main/java/jjdoc.java"] + glob([ ++ "src/main/java/org/javacc/jjdoc/**/*.java", ++ ]), ++ javacopts = JAVAC_OPTS, ++ main_class = "jjdoc", ++ visibility = ["//visibility:public"], ++ deps = [":javacc_parser"], ++) ++ ++java_binary( ++ name = "jjtree", ++ srcs = JTREE_SRCS + [ ++ "src/main/java/jjtree.java", ++ ":javacc_stage2_JJTree", ++ ":jtree_stage2_JJTree_java", ++ ], ++ javacopts = JAVAC_OPTS, ++ main_class = "jjtree", ++ resources = JAR_RESOURCES, ++ visibility = ["//visibility:public"], ++ deps = [ ++ ":javacc_parser", ++ ":javacc_version", ++ ], ++) ++ ++# javacc bootstrap {{{ ++ ++JAVACC_JJ_OUTS = [ ++ "JavaCCParser.java", ++ "JavaCCParserConstants.java", ++ "JavaCCParserTokenManager.java", ++ "JavaCharStream.java", ++ "ParseException.java", ++ "TokenMgrError.java", ++] ++ ++CONDITION_PARSER_JJ_OUTS = [ ++ "ConditionParser.java", ++ "ConditionParserConstants.java", ++ "ConditionParserTokenManager.java", ++ "JavaCharStream.java", ++ "ParseException.java", ++ "Token.java", ++ "TokenMgrError.java", ++] ++ ++javacc_bootstrap( ++ name = "javacc_stage1_JavaCC", ++ src = "src/main/javacc/JavaCC.jj", ++ outs = JAVACC_JJ_OUTS, ++ javacc = "//bootstrap:javacc_stage1", ++) ++ ++javacc_bootstrap( ++ name = "javacc_stage1_ConditionParser", ++ src = "src/main/javacc/ConditionParser.jj", ++ outs = CONDITION_PARSER_JJ_OUTS, ++ javacc = "//bootstrap:javacc_stage1", ++) ++ ++javacc_bootstrap( ++ name = "javacc_stage2_JavaCC", ++ src = "src/main/javacc/JavaCC.jj", ++ outs = JAVACC_JJ_OUTS, ++ javacc = ":javacc_stage2", ++) ++ ++javacc_bootstrap( ++ name = "javacc_stage2_ConditionParser", ++ src = "src/main/javacc/ConditionParser.jj", ++ outs = CONDITION_PARSER_JJ_OUTS, ++ javacc = ":javacc_stage2", ++) ++ ++java_binary( ++ name = "javacc_stage2", ++ srcs = JAVACC_PARSER_SRCS + [ ++ "src/main/java/javacc.java", ++ ":javacc_stage1_ConditionParser", ++ ":javacc_stage1_JavaCC", ++ ], ++ javacopts = JAVAC_OPTS, ++ main_class = "javacc", ++ resources = JAR_RESOURCES, ++ deps = [":javacc_version"], ++) ++ ++# }}} ++ ++# jtree bootstrap {{{ ++ ++JJTREE_JJ_OUTS = [ ++ "JavaCharStream.java", ++ "JJTreeParserConstants.java", ++ "JJTreeParser.java", ++ "JJTreeParserTokenManager.java", ++ "ParseException.java", ++ "TokenMgrError.java", ++] ++ ++JJTREE_JJT_OUTS = [ ++ "ASTBNFAssignment.java", ++ "ASTBNFChoice.java", ++ "ASTBNFLookahead.java", ++ "ASTBNFNonTerminal.java", ++ "ASTBNFOneOrMore.java", ++ "ASTBNFParenthesized.java", ++ "ASTBNFSequence.java", ++ "ASTBNFTryBlock.java", ++ "ASTBNFZeroOrMore.java", ++ "ASTBNFZeroOrOne.java", ++ "ASTCharDescriptor.java", ++ "ASTPrimaryExpression.java", ++ "ASTProductions.java", ++ "ASTRECharList.java", ++ "ASTREChoice.java", ++ "ASTREEOF.java", ++ "ASTRE.java", ++ "ASTRENamed.java", ++ "ASTREOneOrMore.java", ++ "ASTREParenthesized.java", ++ "ASTREReference.java", ++ "ASTRESequence.java", ++ "ASTRESpec.java", ++ "ASTREStringLiteral.java", ++ "ASTREZeroOrMore.java", ++ "ASTREZeroOrOne.java", ++ "ASTRRepetitionRange.java", ++ "ASTTokenDecls.java", ++ "JJTJJTreeParserState.java", ++ "JJTreeParserTreeConstants.java", ++ "Node.java", ++ "SimpleNode.java", ++] ++ ++javacc_bootstrap( ++ name = "jtree_stage1_JJTree", ++ src = "src/main/jjtree/JJTree.jjt", ++ outs = ["JJTree.jj"] + JJTREE_JJT_OUTS, ++ javacc = "//bootstrap:jjtree_stage1", ++) ++ ++filegroup( ++ name = "jtree_stage1_JJTree_java", ++ srcs = [":jtree_stage1_JJTree"], ++ output_group = "java_files", ++) ++ ++filegroup( ++ name = "jtree_stage1_JJTree_jj", ++ srcs = [":jtree_stage1_JJTree"], ++ output_group = "jj_files", ++) ++ ++javacc_bootstrap( ++ name = "javacc_stage1_JJTree", ++ src = ":jtree_stage1_JJTree_jj", ++ outs = JJTREE_JJ_OUTS, ++ javacc = ":javacc", ++) ++ ++java_binary( ++ name = "jjtree_stage2", ++ srcs = JTREE_SRCS + [ ++ "src/main/java/jjtree.java", ++ ":javacc_stage1_JJTree", ++ ":jtree_stage1_JJTree_java", ++ ], ++ javacopts = JAVAC_OPTS, ++ main_class = "jjtree", ++ resources = JAR_RESOURCES, ++ deps = [ ++ ":javacc_parser", ++ ":javacc_version", ++ ], ++) ++ ++javacc_bootstrap( ++ name = "jtree_stage2_JJTree", ++ src = "src/main/jjtree/JJTree.jjt", ++ outs = ["JJTree.jj"] + JJTREE_JJT_OUTS, ++ javacc = ":jjtree_stage2", ++) ++ ++filegroup( ++ name = "jtree_stage2_JJTree_java", ++ srcs = [":jtree_stage2_JJTree"], ++ output_group = "java_files", ++) ++ ++filegroup( ++ name = "jtree_stage2_JJTree_jj", ++ srcs = [":jtree_stage2_JJTree"], ++ output_group = "jj_files", ++) ++ ++javacc_bootstrap( ++ name = "javacc_stage2_JJTree", ++ src = ":jtree_stage2_JJTree_jj", ++ outs = JJTREE_JJ_OUTS, ++ javacc = ":javacc", ++) ++ ++# }}} + +--- /dev/null ++++ bootstrap/BUILD.bazel +@@ -0,0 +1,18 @@ ++java_import( ++ name = "javacc_jar", ++ jars = ["javacc.jar"], ++) ++ ++java_binary( ++ name = "javacc_stage1", ++ main_class = "javacc", ++ visibility = ["//:__subpackages__"], ++ runtime_deps = [":javacc_jar"], ++) ++ ++java_binary( ++ name = "jjtree_stage1", ++ main_class = "jjtree", ++ visibility = ["//:__subpackages__"], ++ runtime_deps = [":javacc_jar"], ++) + +--- /dev/null ++++ javacc_bootstrap.bzl +@@ -0,0 +1,42 @@ ++def _javacc_bootstrap(ctx): ++ outs = [] ++ java_outs = [] ++ jj_outs = [] ++ for out_basename in ctx.attr.outs: ++ out = ctx.actions.declare_file(ctx.attr.name + "/" + out_basename) ++ outs.append(out) ++ if out_basename.endswith(".java"): ++ java_outs.append(out) ++ if out_basename.endswith(".jj"): ++ jj_outs.append(out) ++ ctx.actions.run( ++ outputs = outs, ++ inputs = ctx.files.src, ++ executable = ctx.executable.javacc, ++ arguments = [ ++ "-OUTPUT_DIRECTORY:" + outs[0].dirname, ++ ctx.file.src.path, ++ ], ++ mnemonic = "JavaccBootstrap", ++ ) ++ return [ ++ DefaultInfo(files = depset(outs)), ++ OutputGroupInfo( ++ jj_files = depset(jj_outs), ++ java_files = depset(java_outs), ++ ), ++ ] ++ ++javacc_bootstrap = rule( ++ implementation = _javacc_bootstrap, ++ attrs = { ++ "javacc": attr.label( ++ executable = True, ++ cfg = "exec", ++ ), ++ "src": attr.label( ++ allow_single_file = True, ++ ), ++ "outs": attr.string_list(), ++ }, ++) diff --git a/modules/javacc/7.0.13/patches/module_dot_bazel.patch b/modules/javacc/7.0.13/patches/module_dot_bazel.patch new file mode 100644 index 00000000000..47b7063a45f --- /dev/null +++ b/modules/javacc/7.0.13/patches/module_dot_bazel.patch @@ -0,0 +1,8 @@ +--- MODULE.bazel ++++ MODULE.bazel +@@ -0,0 +1,5 @@ ++module( ++ name = "javacc", ++ version = "7.0.13", ++ compatibility_level = 1, ++) diff --git a/modules/javacc/7.0.13/presubmit.yml b/modules/javacc/7.0.13/presubmit.yml new file mode 100644 index 00000000000..e6e4d232a4a --- /dev/null +++ b/modules/javacc/7.0.13/presubmit.yml @@ -0,0 +1,19 @@ +matrix: + platform: + - debian10 + - ubuntu2004 + - macos + - macos_arm64 + - windows + bazel: + - 7.x + - 6.x +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + build_targets: + - '@javacc//:javacc' + - '@javacc//:jjdoc' + - '@javacc//:jjtree' diff --git a/modules/javacc/7.0.13/source.json b/modules/javacc/7.0.13/source.json new file mode 100644 index 00000000000..168effd025e --- /dev/null +++ b/modules/javacc/7.0.13/source.json @@ -0,0 +1,10 @@ +{ + "url": "https://mirror.bazel.build/github.com/javacc/javacc/archive/refs/tags/javacc-7.0.13.tar.gz", + "integrity": "sha256-0b/rtMqSYcXDsWsAKAsyeKQbGTyoUD8ph/ct5FO/mcY=", + "strip_prefix": "javacc-javacc-7.0.13", + "patch_strip": 0, + "patches": { + "build_with_bazel.patch": "sha256-2sn7euCflgG320d69qWsYnox36wP6Xdb+YVCgYRLlNU=", + "module_dot_bazel.patch": "sha256-9DKfIUZFVVKiR78COoHvFG/0SLHKaHbJYfdEJO0zBC8=" + } +} diff --git a/modules/javacc/metadata.json b/modules/javacc/metadata.json new file mode 100644 index 00000000000..064c087fcd9 --- /dev/null +++ b/modules/javacc/metadata.json @@ -0,0 +1,14 @@ +{ + "homepage": "https://javacc.org/", + "maintainers": [ + { + "email": "john@john-millikin.com", + "github": "jmillikin", + "name": "John Millikin" + } + ], + "versions": [ + "7.0.13" + ], + "yanked_versions": {} +} diff --git a/modules/javaparser/3.26.2/MODULE.bazel b/modules/javaparser/3.26.2/MODULE.bazel new file mode 100644 index 00000000000..3cecec5b76c --- /dev/null +++ b/modules/javaparser/3.26.2/MODULE.bazel @@ -0,0 +1,10 @@ +module( + name = "javaparser", + version = "3.26.2", + compatibility_level = 1, +) + +bazel_dep( + name = "javacc", + version = "7.0.13", +) diff --git a/modules/javaparser/3.26.2/patches/build_with_bazel.patch b/modules/javaparser/3.26.2/patches/build_with_bazel.patch new file mode 100644 index 00000000000..7be7070883f --- /dev/null +++ b/modules/javaparser/3.26.2/patches/build_with_bazel.patch @@ -0,0 +1,112 @@ +--- /dev/null ++++ BUILD.bazel +@@ -0,0 +1 @@ ++ + +--- /dev/null ++++ javaparser-core/BUILD.bazel +@@ -0,0 +1,68 @@ ++load("@bazel_skylib//rules:common_settings.bzl", "bool_flag") ++load(":gen_java_parser.bzl", "gen_java_parser") ++ ++gen_java_parser( ++ name = "javacc_java_jj", ++ src = "src/main/javacc/java.jj", ++ outs = [ ++ "GeneratedJavaParser.java", ++ "GeneratedJavaParserConstants.java", ++ "GeneratedJavaParserTokenManager.java", ++ "ParseException.java", ++ "Provider.java", ++ "SimpleCharStream.java", ++ "StreamProvider.java", ++ "StringProvider.java", ++ "Token.java", ++ "TokenMgrException.java", ++ ], ++ out_dir = "src/main/java/com/github/javaparser", ++) ++ ++java_library( ++ name = "javaparser-core", ++ srcs = [":javacc_java_jj"] + glob([ ++ "src/main/java/**/*.java", ++ "src/main/javacc-support/**/*.java", ++ ]), ++ javacopts = [ ++ "-XepAllErrorsAsWarnings", ++ "-Xep:DoubleBraceInitialization:OFF", ++ ], ++ visibility = ["//visibility:public"], ++ deps = select( ++ { ++ ":skip_jdk_version_check__true": [], ++ ":remotejdk_11": [], ++ ":remotejdk_17": [], ++ }, ++ no_match_error = ( ++ "\n\nJavaParser is incompatible with JDK versions 21 and later." + ++ " See https://github.com/javaparser/javaparser/issues/4022" + ++ " for details." ++ ), ++ ), ++) ++ ++bool_flag( ++ name = "skip_jdk_version_check", ++ build_setting_default = False, ++ visibility = ["//visibility:public"], ++) ++ ++config_setting( ++ name = "skip_jdk_version_check__true", ++ flag_values = { ++ ":skip_jdk_version_check": "true", ++ }, ++) ++ ++config_setting( ++ name = "remotejdk_11", ++ values = {"java_runtime_version": "remotejdk_11"}, ++) ++ ++config_setting( ++ name = "remotejdk_17", ++ values = {"java_runtime_version": "remotejdk_17"}, ++) + +--- /dev/null ++++ javaparser-core/gen_java_parser.bzl +@@ -0,0 +1,32 @@ ++def _gen_java_parser(ctx): ++ outs = [] ++ for out_basename in ctx.attr.outs: ++ out = ctx.actions.declare_file(ctx.attr.out_dir + "/" + out_basename) ++ outs.append(out) ++ ctx.actions.run( ++ outputs = outs, ++ inputs = ctx.files.src, ++ executable = ctx.executable._javacc, ++ arguments = [ ++ "-OUTPUT_DIRECTORY:" + outs[0].dirname, ++ ctx.file.src.path, ++ ], ++ mnemonic = "Javacc", ++ ) ++ return DefaultInfo(files = depset(outs)) ++ ++gen_java_parser = rule( ++ implementation = _gen_java_parser, ++ attrs = { ++ "_javacc": attr.label( ++ default = "@javacc//:javacc", ++ executable = True, ++ cfg = "exec", ++ ), ++ "src": attr.label( ++ allow_single_file = True, ++ ), ++ "out_dir": attr.string(), ++ "outs": attr.string_list(), ++ }, ++) diff --git a/modules/javaparser/3.26.2/patches/module_dot_bazel.patch b/modules/javaparser/3.26.2/patches/module_dot_bazel.patch new file mode 100644 index 00000000000..ffbbf453ce4 --- /dev/null +++ b/modules/javaparser/3.26.2/patches/module_dot_bazel.patch @@ -0,0 +1,13 @@ +--- MODULE.bazel ++++ MODULE.bazel +@@ -0,0 +1,10 @@ ++module( ++ name = "javaparser", ++ version = "3.26.2", ++ compatibility_level = 1, ++) ++ ++bazel_dep( ++ name = "javacc", ++ version = "7.0.13", ++) diff --git a/modules/javaparser/3.26.2/presubmit.yml b/modules/javaparser/3.26.2/presubmit.yml new file mode 100644 index 00000000000..8c5ffa8610d --- /dev/null +++ b/modules/javaparser/3.26.2/presubmit.yml @@ -0,0 +1,22 @@ +matrix: + platform: + - debian10 + - ubuntu2004 + - macos + - macos_arm64 + - windows + bazel: + - 7.x + - 6.x +tasks: + verify_targets: + name: Verify build targets + platform: ${{ platform }} + bazel: ${{ bazel }} + # JavaParser is incompatible with JDK versions 21 and later. + # https://github.com/javaparser/javaparser/issues/4022 + build_flags: + - '--java_language_version=17' + - '--java_runtime_version=remotejdk_17' + build_targets: + - '@javaparser//javaparser-core' diff --git a/modules/javaparser/3.26.2/source.json b/modules/javaparser/3.26.2/source.json new file mode 100644 index 00000000000..200de7f9c2f --- /dev/null +++ b/modules/javaparser/3.26.2/source.json @@ -0,0 +1,10 @@ +{ + "url": "https://mirror.bazel.build/github.com/javaparser/javaparser/archive/refs/tags/javaparser-parent-3.26.2.tar.gz", + "integrity": "sha256-alKR8wQMNu3n8/icelY2cMoZFKsgBuKPFYwHrFT6ZOU=", + "strip_prefix": "javaparser-javaparser-parent-3.26.2", + "patch_strip": 0, + "patches": { + "build_with_bazel.patch": "sha256-5DuMExkKokjKN2mUm4yPjop+idnto++N/AHXthpH7z4=", + "module_dot_bazel.patch": "sha256-dsyQ2Ny06luY8XFfCXgR9XjV5PPKCvX566mdNTD1dyg=" + } +} diff --git a/modules/javaparser/metadata.json b/modules/javaparser/metadata.json new file mode 100644 index 00000000000..d25b7bda299 --- /dev/null +++ b/modules/javaparser/metadata.json @@ -0,0 +1,14 @@ +{ + "homepage": "https://javaparser.org/", + "maintainers": [ + { + "email": "john@john-millikin.com", + "github": "jmillikin", + "name": "John Millikin" + } + ], + "versions": [ + "3.26.2" + ], + "yanked_versions": {} +} From 27f57edd06056733ce69fd13bc86005d71461396 Mon Sep 17 00:00:00 2001 From: John Millikin Date: Sat, 7 Sep 2024 00:11:19 +0900 Subject: [PATCH 2/3] Add `bazel_skylib` dependency to javaparser `MODULE.bazel` --- modules/javaparser/3.26.2/MODULE.bazel | 6 ++---- modules/javaparser/3.26.2/patches/module_dot_bazel.patch | 8 +++----- modules/javaparser/3.26.2/source.json | 2 +- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/modules/javaparser/3.26.2/MODULE.bazel b/modules/javaparser/3.26.2/MODULE.bazel index 3cecec5b76c..2a21a82aebc 100644 --- a/modules/javaparser/3.26.2/MODULE.bazel +++ b/modules/javaparser/3.26.2/MODULE.bazel @@ -4,7 +4,5 @@ module( compatibility_level = 1, ) -bazel_dep( - name = "javacc", - version = "7.0.13", -) +bazel_dep(name = "bazel_skylib", version = "1.3.0") +bazel_dep(name = "javacc", version = "7.0.13") diff --git a/modules/javaparser/3.26.2/patches/module_dot_bazel.patch b/modules/javaparser/3.26.2/patches/module_dot_bazel.patch index ffbbf453ce4..82a5d83a2a8 100644 --- a/modules/javaparser/3.26.2/patches/module_dot_bazel.patch +++ b/modules/javaparser/3.26.2/patches/module_dot_bazel.patch @@ -1,13 +1,11 @@ --- MODULE.bazel +++ MODULE.bazel -@@ -0,0 +1,10 @@ +@@ -0,0 +1,8 @@ +module( + name = "javaparser", + version = "3.26.2", + compatibility_level = 1, +) + -+bazel_dep( -+ name = "javacc", -+ version = "7.0.13", -+) ++bazel_dep(name = "bazel_skylib", version = "1.3.0") ++bazel_dep(name = "javacc", version = "7.0.13") diff --git a/modules/javaparser/3.26.2/source.json b/modules/javaparser/3.26.2/source.json index 200de7f9c2f..c8a68951457 100644 --- a/modules/javaparser/3.26.2/source.json +++ b/modules/javaparser/3.26.2/source.json @@ -5,6 +5,6 @@ "patch_strip": 0, "patches": { "build_with_bazel.patch": "sha256-5DuMExkKokjKN2mUm4yPjop+idnto++N/AHXthpH7z4=", - "module_dot_bazel.patch": "sha256-dsyQ2Ny06luY8XFfCXgR9XjV5PPKCvX566mdNTD1dyg=" + "module_dot_bazel.patch": "sha256-HRtPuFsSh9lnOuwPNltZfjjN5XfLeXgMUggm8GAvPRs=" } } From 9d4c66f22a01e8c686c7d67e34f22a382b951e85 Mon Sep 17 00:00:00 2001 From: John Millikin Date: Sat, 7 Sep 2024 01:16:26 +0900 Subject: [PATCH 3/3] Ensure a recent rules_java so that Turbine doesn't crash in JavaCC. --- modules/javacc/7.0.13/MODULE.bazel | 2 ++ modules/javacc/7.0.13/patches/module_dot_bazel.patch | 4 +++- modules/javacc/7.0.13/source.json | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/modules/javacc/7.0.13/MODULE.bazel b/modules/javacc/7.0.13/MODULE.bazel index e5d9ac2c9bd..cb86f78ad6f 100644 --- a/modules/javacc/7.0.13/MODULE.bazel +++ b/modules/javacc/7.0.13/MODULE.bazel @@ -3,3 +3,5 @@ module( version = "7.0.13", compatibility_level = 1, ) + +bazel_dep(name = "rules_java", version = "6.0.0") diff --git a/modules/javacc/7.0.13/patches/module_dot_bazel.patch b/modules/javacc/7.0.13/patches/module_dot_bazel.patch index 47b7063a45f..4a560d12f21 100644 --- a/modules/javacc/7.0.13/patches/module_dot_bazel.patch +++ b/modules/javacc/7.0.13/patches/module_dot_bazel.patch @@ -1,8 +1,10 @@ --- MODULE.bazel +++ MODULE.bazel -@@ -0,0 +1,5 @@ +@@ -0,0 +1,7 @@ +module( + name = "javacc", + version = "7.0.13", + compatibility_level = 1, +) ++ ++bazel_dep(name = "rules_java", version = "6.0.0") diff --git a/modules/javacc/7.0.13/source.json b/modules/javacc/7.0.13/source.json index 168effd025e..443f72aa0e3 100644 --- a/modules/javacc/7.0.13/source.json +++ b/modules/javacc/7.0.13/source.json @@ -5,6 +5,6 @@ "patch_strip": 0, "patches": { "build_with_bazel.patch": "sha256-2sn7euCflgG320d69qWsYnox36wP6Xdb+YVCgYRLlNU=", - "module_dot_bazel.patch": "sha256-9DKfIUZFVVKiR78COoHvFG/0SLHKaHbJYfdEJO0zBC8=" + "module_dot_bazel.patch": "sha256-0WOwt7CRH+tiNmJxmRzew2Qy5RC2VV3KAWtFp63v7yg=" } }