Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v2.13.3 #1

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

v2.13.3 #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package(
scala_binary(
name = "amm",
srcs = [],
deps = ["@third_party//3rdparty/jvm/com/lihaoyi:ammonite_2_12_8", "//src:mylib"],
deps = ["@third_party//3rdparty/jvm/com/lihaoyi:ammonite_2_13_3", "//src:mylib"],
main_class = "ammonite.Main"
)

Expand Down
76 changes: 16 additions & 60 deletions WORKSPACE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,39 +11,13 @@ http_archive(
url = "https://github.com/bazelbuild/bazel-skylib/releases/download/{}/bazel-skylib-{}.tar.gz".format(skylib_version, skylib_version),
)

rules_scala_version = "eabb1d28fb288fb5b15857260f87818dda5a97c8" # update this as needed
rules_scala_version = "scala_2_13" # update this as needed

http_archive(
name = "io_bazel_rules_scala",
sha256 = "c75f3f6725369171f7a670767a28fd488190070fc9f31d882d9b7a61caffeb26",
strip_prefix = "rules_scala-%s" % rules_scala_version,
type = "zip",
url = "https://github.com/bazelbuild/rules_scala/archive/%s.zip" % rules_scala_version,
)

load(
"@io_bazel_rules_scala//scala/scalafmt:scalafmt_repositories.bzl",
"scalafmt_default_config",
"scalafmt_repositories",
)

scalafmt_repositories()

scalafmt_default_config()

bind(
name = "io_bazel_rules_scala_dependency_scalap_scalap",
actual = "//3rdparty/jvm/org/scala-lang:scalap",
)

bind(
name = "io_bazel_rules_scala_dependency_scalatest_scalatest",
actual = "//3rdparty/jvm/org/scalatest:scalatest",
)

bind(
name = "io_bazel_rules_scala_dependency_scala_scalactic_scalactic",
actual = "//3rdparty/jvm/org/scalactic:scalactic",
url = "https://github.com/liucijus/rules_scala/archive/scala_2_13.zip"
)

git_repository(
Expand All @@ -54,49 +28,22 @@ git_repository(
)

load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
load("@io_bazel_rules_scala//:scala_config.bzl", "scala_config")
scala_config(scala_version="2.13.8")
load(
"@io_bazel_rules_scala//scala:toolchains.bzl",
"scala_register_toolchains",
)


scala_register_toolchains()

load(
"@io_bazel_rules_scala//scala:scala.bzl",
"scala_repositories",
)

scala_repositories(
scala_extra_jars = {
"2.12": {
"scalatest": {
"version": "3.0.8",
"sha256": "a4045cea66f3eaab525696f3000d7d610593778bd070e98349a7066f872844cd",
},
"scalactic": {
"version": "3.0.8",
"sha256": "5f9ad122f54e9a0112ff4fcaadfb2802d8796f5dde021caa4c831067fca68469",
},
"scala_xml": {
"version": "1.0.5",
"sha256": "035015366f54f403d076d95f4529ce9eeaf544064dbc17c2d10e4f5908ef4256",
},
"scala_parser_combinators": {
"version": "1.0.4",
"sha256": "282c78d064d3e8f09b3663190d9494b85e0bb7d96b0da05994fe994384d96111",
},
},
},
scala_version_shas = (
"2.12.8",
{
"scala_compiler": "f34e9119f45abd41e85b9e121ba19dd9288b3b4af7f7047e86dc70236708d170",
"scala_library": "321fb55685635c931eba4bc0d7668349da3f2c09aee2de93a70566066ff25c28",
"scala_reflect": "4d6405395c4599ce04cea08ba082339e3e42135de9aae2923c9f5367e957315a",
"scalajs_compiler": "fc54c1a5f08598c3aef8b4dd13cf482323b56cb416547da9944655d7c53eae32",
},
),
)
scala_repositories()

protobuf_version = "3.11.3"

Expand All @@ -108,10 +55,19 @@ http_archive(
strip_prefix = "protobuf-%s" % protobuf_version,
url = "https://github.com/protocolbuffers/protobuf/archive/v%s.tar.gz" % protobuf_version,
)
load(
"@io_bazel_rules_scala//scala/scalafmt:scalafmt_repositories.bzl",
"scalafmt_default_config",
"scalafmt_repositories",
)

scalafmt_repositories()

scalafmt_default_config()


load(
"@io_bazel_rules_scala//scala:scala_cross_version.bzl",
"default_scala_major_version",
"scala_mvn_artifact",
)
load(
Expand Down
25 changes: 5 additions & 20 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
options:
buildHeader: [ "load(\"@io_bazel_rules_scala//scala:scala_import.bzl\", \"scala_import\")",
"load(\"@io_bazel_rules_scala//scala:scala.bzl\", \"scala_library\")" ]
languages: [ "java", "scala:2.12.8" ]
languages: [ "java", "scala:2.13.3" ]
resolvers:
- id: "mavencentral"
type: "default"
Expand All @@ -13,7 +13,7 @@ options:

dependencies:
com.lihaoyi:
ammonite_2.12.8:
ammonite_2.13.3:
lang: scala/unmangled
version: "2.2.0"
os-lib:
Expand Down Expand Up @@ -78,38 +78,23 @@ dependencies:
org.scala-lang:
scalap:
lang: java
version: "2.12.10"
version: "2.13.3"

org.scala-lang.modules:
scala-parser-combinators:
lang: scala
version: "1.1.2"

org.scalacheck:
scalacheck:
lang: scala
version: "1.14.1"

org.scalactic:
scalactic:
lang: scala
version: "3.0.8"

org.scalameta:
scalameta:
lang: scala
version: "4.1.0"
version: "4.3.24"

org.scalatest:
scalatest:
lang: scala
version: "3.0.8"

org.scalatestplus:
scalatestplus-scalacheck:
lang: scala
version: "3.1.0.0-RC2"

org.scalaz:
scalaz-core:
lang: scala
Expand All @@ -122,7 +107,7 @@ dependencies:
version: "2.2.0"
squants:
lang: scala
version: "1.3.0"
version: "1.7.0"

replacements:
org.scala-lang:
Expand Down