Skip to content

Commit daefb4a

Browse files
authored
[bazel] Adjust to moved bazel_tooling and neverlink domain classes (#1862)
* [bazel] Adjust to bazel tooling in own repo. * [bazel] Have a linked and not linked version of domain classes. This is necessary to be able to swap in other domain classes since Bazel does not have an override functionallity like maven resolvers typically do. In order to achieve something similiar, the dependency needs to be marked as `neverlink` from the begining and each executable needs to bring in a linkable version on its own.
1 parent f0e4c31 commit daefb4a

6 files changed

Lines changed: 24 additions & 7 deletions

File tree

‎MODULE.bazel‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@ bazel_dep(name = "rules_jvm_external", version = "7.0")
66
bazel_dep(name = "aspect_rules_lint", version = "2.5.2")
77
bazel_dep(name = "buildifier_prebuilt", version = "8.5.1.2")
88

9-
JOERN_VERSION = "db325972fdf72e53f76beba77b72e84b2c469905"
9+
BAZEL_TOOLING_VERSION = "a07fda4f8bc736081ad9921831bc9973e77e6e19"
1010

1111
git_override(
1212
module_name = "bazel_tooling",
13-
commit = "{}".format(JOERN_VERSION),
14-
remote = "git@github.com:joernio/joern.git",
15-
strip_prefix = "bazel/tooling",
13+
commit = "{}".format(BAZEL_TOOLING_VERSION),
14+
remote = "git@github.com:joernio/bazel_tooling.git",
1615
)
1716

1817
bazel_dep(name = "rules_scala", version = "7.2.4")

‎bazel/java.bzl‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ _rules = make_java_rules(
99
"-Xlint:-cast",
1010
"-XepDisableAllChecks",
1111
],
12+
common_java_binary_runtime_deps = [],
13+
common_java_test_runtime_deps = [],
1214
)
1315

1416
java_library = _rules.java_library

‎bazel/scala.bzl‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ _rules = make_scala_rules(
1111
"-deprecation",
1212
"-Wconf:msg=Implicit parameters should be provided with a `using` clause:s",
1313
],
14-
common_scalatest_runtime_deps = [],
14+
common_scala_binary_runtime_deps = [],
15+
common_scala_test_runtime_deps = [],
1516
)
1617

1718
scala_library = _rules.scala_library

‎codepropertygraph/BUILD‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ scala_library(
88
]),
99
visibility = ["//visibility:public"],
1010
deps = [
11-
"//schema:domainClasses",
11+
"//schema:domainClassesNeverLinked",
1212
"//schema:java_proto",
1313
"@maven//:com_google_protobuf_protobuf_java",
1414
"@maven//:io_joern_flatgraph_core_3",

‎schema/BUILD‎

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,19 @@ genrule(
8383
)
8484

8585
java_import(
86-
name = "domainClasses",
86+
name = "domainClassesNeverLinked",
87+
jars = [":domainClasses_jar"],
88+
srcjar = ":domainClasses_src_jar",
89+
visibility = ["//visibility:public"],
90+
exports = [
91+
"@maven//:io_joern_flatgraph_core_3",
92+
"@maven//:io_joern_flatgraph_help_3",
93+
],
94+
neverlink = True,
95+
)
96+
97+
java_import(
98+
name = "domainClassesLinked",
8799
jars = [":domainClasses_jar"],
88100
srcjar = ":domainClasses_src_jar",
89101
visibility = ["//visibility:public"],

‎schema2json/BUILD‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@ scala_binary(
1212
"@maven//:org_json4s_json4s_ast_3",
1313
"@maven//:org_json4s_json4s_native_3",
1414
],
15+
runtime_deps = [
16+
"//schema:domainClassesLinked",
17+
],
1518
)

0 commit comments

Comments
 (0)