Skip to content

Commit af363f0

Browse files
committed
Adding some missing config files
1 parent 70ff614 commit af363f0

File tree

4 files changed

+19
-7
lines changed

4 files changed

+19
-7
lines changed

flink/BUILD.bazel

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,6 @@ test_deps = _FLINK_TEST_DEPS + [
3737
# Libraries
3838
maven_scala_artifact("org.scala-lang.modules:scala-java8-compat"),
3939
maven_scala_artifact("org.scala-lang.modules:scala-collection-compat"),
40-
# maven_artifact("org.scala-lang:scala-library", "2.13.12"),
41-
# maven_artifact("org.scala-lang:scala-reflect", "2.13.12"),
4240
maven_artifact("org.slf4j:slf4j-api"),
4341
maven_artifact("org.apache.logging.log4j:log4j-api"),
4442
maven_artifact("org.apache.logging.log4j:log4j-core"),

scala_config.bzl

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
DEFAULT_SCALA_VERSION = "2.12.18"
2+
3+
def _scala_version_impl(repository_ctx):
4+
scala_version = repository_ctx.os.environ.get("SCALA_VERSION", DEFAULT_SCALA_VERSION)
5+
repository_ctx.file("BUILD", "")
6+
repository_ctx.file("version.bzl",
7+
content = "SCALA_VERSION = '%s'\n" % scala_version)
8+
9+
scala_version = repository_rule(
10+
implementation = _scala_version_impl,
11+
environ = ["SCALA_VERSION"],
12+
)

tools/build_rules/prelude_bazel

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ load("//tools/build_rules:jvm_binary.bzl", "jvm_binary")
77
load("@rules_java//java:defs.bzl", "java_library")
88
load("@contrib_rules_jvm//docs:stardoc-input.bzl", "java_test_suite")
99
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_test", "scala_test_suite")
10-
load("//tools/build_rules:artifact.bzl", "maven_artifact", "maven_scala_artifact")
11-
load("//tools/build_rules:artifact.bzl", "spark_artifact")
10+
load("//tools/build_rules:artifact.bzl", "maven_artifact", "maven_scala_artifact", "spark_artifact")
1211
load("//tools/build_rules:scala_junit_test_suite.bzl", "scala_junit_suite")
1312

1413
load("@io_bazel_rules_scala//scala:advanced_usage/scala.bzl", "make_scala_library")
@@ -32,9 +31,6 @@ _JVM_FLAGS_FOR_ACCESSING_BASE_JAVA_CLASSES = [
3231
]
3332

3433
_SCALA_DEPS = [
35-
# "@io_bazel_rules_scala_scala_library_2_12_18//:io_bazel_rules_scala_scala_library_2_12_18",
36-
# "@io_bazel_rules_scala_scala_library_2_13_12//:io_bazel_rules_scala_scala_library_2_13_12",
37-
# other scala related deps...
3834
maven_artifact("org.scala-lang:scala-library", SCALA_VERSION),
3935
]
4036

tools/config/BUILD

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
config_setting(
2+
name = "scala_2_13",
3+
values = {
4+
"define": "SCALA_VERSION=2.13.12",
5+
},
6+
)

0 commit comments

Comments
 (0)