digital-asset/daml
1
1
Fork 0
mirror of https://github.com/digital-asset/daml.git synced 2024-09-20 01:07:18 +03:00
Code Issues Projects Releases Wiki Activity

scala-protoc-plugins: Don't use two versions of scalapb. (#3665)

Browse Source 
This really confuses IntelliJ, because it's importing two versions of
scala-library-*.jar.

Turns out it's not being used anyway.
This commit is contained in:
Samir Talwar 2019-11-28 17:26:59 +01:00 committed by mergify[bot]
parent 54d98fd186
commit 326f427e8f
4 changed files with 0 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deps.bzl
View File

@ -204,26 +204,6 @@ def daml_deps():
urls = ["https://github.com/johnynek/bazel_jar_jar/archive/20dbf71f09b1c1c2a8575a42005a968b38805519.zip"], # Latest commit SHA as at 2019/02/13
)
if "com_github_scalapb_scalapb" not in native.existing_rules():
http_archive(
name = "com_github_scalapb_scalapb",
url = "https://github.com/scalapb/ScalaPB/releases/download/v0.8.0/scalapbc-0.8.0.zip",
sha256 = "bda0b44b50f0a816342a52c34e6a341b1a792f2a6d26f4f060852f8f10f5d854",
strip_prefix = "scalapbc-0.8.0/lib",
build_file_content = """
java_import(
name = "compilerplugin",
jars = ["com.thesamet.scalapb.compilerplugin-0.8.0.jar"],
visibility = ["//visibility:public"],
)
java_import(
name = "scala-library",
jars = ["org.scala-lang.scala-library-2.11.12.jar"],
visibility = ["//visibility:public"],
)
""",
)
if "com_github_googleapis_googleapis" not in native.existing_rules():
http_archive(
name = "com_github_googleapis_googleapis",

3
scala-protoc-plugins/scala-akka/BUILD.bazel
View File

@ -8,9 +8,6 @@ da_scala_binary(
srcs = glob(["*.scala"]),
main_class = "com.digitalasset.protoc.plugins.akka.AkkaStreamCompilerPlugin",
visibility = ["//visibility:public"],
runtime_deps = [
"@com_github_scalapb_scalapb//:scala-library",
],
deps = [
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_thesamet_scalapb_compilerplugin_2_12",

3
scala-protoc-plugins/scala-logging/BUILD.bazel
View File

@ -8,9 +8,6 @@ da_scala_binary(
srcs = ["LoggingCompilerPlugin.scala"],
main_class = "com.digitalasset.protoc.plugins.logging.LoggingCompilerPlugin",
visibility = ["//visibility:public"],
runtime_deps = [
"@com_github_scalapb_scalapb//:scala-library",
],
deps = [
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_thesamet_scalapb_compilerplugin_2_12",

3
scala-protoc-plugins/scalapb/BUILD.bazel
View File

@ -8,9 +8,6 @@ da_scala_binary(
srcs = glob(["*.scala"]),
main_class = "com.digitalasset.protoc.plugins.scalapb.ScalaPbCompilerPlugin",
visibility = ["//visibility:public"],
runtime_deps = [
"@com_github_scalapb_scalapb//:scala-library",
],
deps = [
"@maven//:com_google_protobuf_protobuf_java",
"@maven//:com_thesamet_scalapb_compilerplugin_2_12",