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

Update rules_scala #11616

Merged
merged 2 commits into from
Nov 11, 2021
Merged

Update rules_scala #11616

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cfa0b86
Update rules_scala
aherrmann Nov 9, 2021
16a5d75
JMH deps were moved into a toolchain
aherrmann Nov 11, 2021
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
29 changes: 0 additions & 29 deletions bazel_tools/rules_scala_java_bin_path.patch
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions bazel_tools/rules_scala_suite_tags.patch
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions compatibility/deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,6 @@ def daml_deps():
sha256 = rules_scala_sha256,
patches = [
"@daml//bazel_tools:scala-escape-jvmflags.patch",
# Remove once https://github.com/bazelbuild/rules_scala/pull/1313 is merged
"@daml//bazel_tools:rules_scala_java_bin_path.patch",
],
patch_args = ["-p1"],
)
Expand Down
8 changes: 2 additions & 6 deletions deps.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive", "http_file"
load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
load("@bazel_tools//tools/build_defs/repo:utils.bzl", "maybe")

rules_scala_version = "67a7ac178a73d1d5ff4c2b0663a8eda6dfcbbc56"
rules_scala_sha256 = "95054009fd938ac7ef53a20619f94a5408d8ae74eb5b318cd150a3ecb1a6086f"
rules_scala_version = "e4560ac332e9da731c1e50a76af2579c55836a5c"
rules_scala_sha256 = "ccf19e8f966022eaaca64da559c6140b23409829cb315f2eff5dc3e757fb6ad8"

rules_haskell_version = "673e74aea244a6a9ee1eccec719677c80348aebf"
rules_haskell_sha256 = "73a06dc6e0d928ceeab64e2cd3159f863eb2e263ecc64d79e3952c770cd1ee51"
Expand Down Expand Up @@ -148,10 +148,6 @@ def daml_deps():
sha256 = rules_scala_sha256,
patches = [
"@com_github_digital_asset_daml//bazel_tools:scala-escape-jvmflags.patch",
# Remove once https://github.com/bazelbuild/rules_scala/pull/1261 is merged
"@com_github_digital_asset_daml//bazel_tools:rules_scala_suite_tags.patch",
# Remove once https://github.com/bazelbuild/rules_scala/pull/1313 is merged
"@com_github_digital_asset_daml//bazel_tools:rules_scala_java_bin_path.patch",
],
patch_args = ["-p1"],
)
Expand Down