Skip to content

Commit 08bcc34

Browse files
authored
Revert jflex_deps() to use maven_jar (#16)
* Revert "Replace maven_jar by maven_install for JFlex deps." This reverts commit a25b375. `maven_install` can only be loaded in the WORKSPACE, which breaks the simple use of `jflex_deps()`. * Add sha256 on the JFlex maven_jar
1 parent c786108 commit 08bcc34

File tree

3 files changed

+28
-11
lines changed

3 files changed

+28
-11
lines changed

WORKSPACE

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,12 @@
44
# This WORKSPACE file defines the workspace for the Bazel build system.
55
# See https://docs.bazel.build/versions/master/build-ref.html#workspace
66

7-
load("//jflex:deps.bzl", "JFLEX_DEPS")
7+
load("//jflex:deps.bzl", "jflex_deps")
88
load("//third_party:third_party_deps.bzl", "THIRD_PARTY_ARTIFACTS")
99
load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
1010

11+
jflex_deps()
12+
1113
RULES_JVM_EXTERNAL_TAG = "2.10"
1214

1315
RULES_JVM_EXTERNAL_SHA = "1bbf2e48d07686707dd85357e9a94da775e1dbd7c464272b3664283c9c716d26"
@@ -23,7 +25,7 @@ load("@rules_jvm_external//:defs.bzl", "maven_install")
2325

2426
maven_install(
2527
name = "maven",
26-
artifacts = THIRD_PARTY_ARTIFACTS + JFLEX_DEPS,
28+
artifacts = THIRD_PARTY_ARTIFACTS,
2729
repositories = [
2830
"https://jcenter.bintray.com/",
2931
"https://maven.google.com/",

jflex/BUILD

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@ java_binary(
1414
],
1515
)
1616

17-
alias(
17+
java_library(
1818
name = "jflex",
19-
actual = "@maven//:de_jflex_jflex_1_7_0",
19+
exports = ["@de_jflex_jflex_1_7_0//jar"],
2020
)
2121

22-
alias(
22+
java_library(
2323
name = "cup_runtime",
24-
actual = "@maven//:de_jflex_cup_runtime_11b",
24+
exports = ["@de_jflex_cup_runtime_11b//jar"],
2525
)

jflex/deps.bzl

Lines changed: 20 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,21 @@
1-
# Copyright 2018-2019 Google LLC.
1+
# Copyright 2018 Google LLC.
22
# SPDX-License-Identifier: Apache-2.0
3-
JFLEX_DEPS = [
4-
"de.jflex:jflex:1.7.0",
5-
"de.jflex:cup_runtime:11b",
6-
]
3+
4+
def jflex_deps():
5+
"""Bazel macro that iports dependencies used by JFlex."""
6+
7+
native.maven_jar(
8+
name = "de_jflex_jflex_1_7_0",
9+
artifact = "de.jflex:jflex:1.7.0",
10+
repository = "https://jcenter.bintray.com/",
11+
sha256 = "c40e64600f7d29e1618a1c1d5cd697c926ff8495e166ea9416cae19644e37ae6",
12+
sha256_src = "3b18eb44332183ac1fbbf4573da1f2e8a373b71899a9d05a0d70308d5c5a56f3",
13+
)
14+
15+
native.maven_jar(
16+
name = "de_jflex_cup_runtime_11b",
17+
artifact = "de.jflex:cup_runtime:11b",
18+
repository = "https://jcenter.bintray.com/",
19+
sha256 = "9c0b5c93fe0c0e239d5f92affb672cb7c45122c3e3de8cda9513fa8e39dbbc3c",
20+
sha256_src = "7155a72ab7b2d6c1ecf129bcacfbe942d0b490bfe1d634532e5619a836e17591",
21+
)

0 commit comments

Comments
 (0)