Skip to content

Instantly share code, notes, and snippets.

@ianoc
Created November 16, 2019 17:21
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save ianoc/eb2bdb2c968c2aa3d00bb509197483fa to your computer and use it in GitHub Desktop.
Save ianoc/eb2bdb2c968c2aa3d00bb509197483fa to your computer and use it in GitHub Desktop.
diff applied
diff --git a/WORKSPACE b/WORKSPACE
index a76b6f6..4c140a2 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -15,7 +15,14 @@ scala_register_toolchains()
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_repositories")
-scala_repositories()
+scala_repositories((
+ "2.12.10",
+ {
+ "scala_compiler": "cedc3b9c39d215a9a3ffc0cc75a1d784b51e9edc7f13051a1b4ad5ae22cfbc0c",
+ "scala_library": "0a57044d10895f8d3dd66ad4286891f607169d948845ac51e17b4c1cf0ab569d",
+ "scala_reflect": "56b609e1bab9144fb51525bfa01ccd72028154fc40a58685a1e9adcbe7835730",
+ },
+))
# bazel-skylib 0.8.0 released 2019.03.20 (https://github.com/bazelbuild/bazel-skylib/releases/tag/0.8.0)
diff --git a/dependencies.yml b/dependencies.yml
index b5f2ae9..c60206a 100644
--- a/dependencies.yml
+++ b/dependencies.yml
@@ -53,13 +53,15 @@ dependencies:
modules: ["api", "core", "slf4j-impl"]
org.scalatest:
- scalatest_2.12:
+ scalatest:
version: "3.0.5"
- lang: scala/unmangled
+ lang: scala
+ exports:
+ - 'org.scalactic:scalactic'
org.scalactic:
- scalactic_2.12:
- lang: scala/unmangled
+ scalactic:
+ lang: scala
io.dropwizard.metrics:
metrics:
diff --git a/src/BUILD b/src/BUILD
index ef5772d..8f101b7 100644
--- a/src/BUILD
+++ b/src/BUILD
@@ -1,18 +1,10 @@
load("@io_bazel_rules_scala//scala:scala.bzl", "scala_library", "scala_binary", "scala_test")
load("@io_bazel_rules_scala//scala:scala_import.bzl", "scala_import")
-scala_import(
- name = "scalatest",
- jars = [
- "//3rdparty/jvm/org/scalatest:scalatest_2_12",
- "//3rdparty/jvm/org/scalactic:scalactic_2_12",
- ],
-)
-
scala_library(
name = "myspec-all",
srcs = glob(["**/*.scala"]),
- deps = [
+ deps = [
"//3rdparty/jvm/dk/cwconsult/peregrin:peregrin_core",
"//3rdparty/jvm/dk/cwconsult:tempgres_client",
"//3rdparty/jvm/org/apache/logging/log4j:log4j_api",
@@ -31,6 +23,6 @@ scala_library(
"@io_bazel_rules_scala_scala_reflect//:io_bazel_rules_scala_scala_reflect",
"@io_bazel_rules_scala_scala_compiler//:io_bazel_rules_scala_scala_compiler",
"@io_bazel_rules_scala_scala_xml//:io_bazel_rules_scala_scala_xml",
- ":scalatest",
+ "//3rdparty/jvm/org/scalatest:scalatest",
],
)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment