Skip to content

Commit

Permalink
Fix for --incompatible_disable_starlark_host_transitions
Browse files Browse the repository at this point in the history
Update rules_scala, bazel_skylib and rules_proto to avoid the breaking expected by flipping `--incompatible_disable_starlark_host_transitions` flag in bazel.

Fixes: #4207
PiperOrigin-RevId: 501316312
  • Loading branch information
mai93 authored and copybara-github committed Jan 11, 2023
1 parent 7cd9b19 commit 0bf4a9a
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
22 changes: 13 additions & 9 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -437,8 +437,11 @@ new_git_repository(

http_archive(
name = "bazel_skylib",
sha256 = "2ef429f5d7ce7111263289644d233707dba35e39696377ebab8b0bc701f7818e",
url = "https://github.com/bazelbuild/bazel-skylib/releases/download/0.8.0/bazel-skylib.0.8.0.tar.gz",
sha256 = "74d544d96f4a5bb630d465ca8bbcfe231e3594e5aae57e1edbf17a6eb3ca2506",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.3.0/bazel-skylib-1.3.0.tar.gz",
],
)

# specify a minimum version for bazel otherwise users on old versions may see
Expand Down Expand Up @@ -484,11 +487,10 @@ bazel_external_dependency_archive(
# LICENSE: The Apache Software License, Version 2.0
http_archive(
name = "rules_proto",
sha256 = "aa1ee19226f707d44bee44c720915199c20c84a23318bb0597ed4e5c873ccbd5",
strip_prefix = "rules_proto-40298556293ae502c66579620a7ce867d5f57311",
sha256 = "dc3fb206a2cb3441b485eb1e423165b231235a1ea9b031b4433cf7bc1fa460dd",
strip_prefix = "rules_proto-5.3.0-21.7",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_proto/archive/40298556293ae502c66579620a7ce867d5f57311.tar.gz",
"https://github.com/bazelbuild/rules_proto/archive/40298556293ae502c66579620a7ce867d5f57311.tar.gz",
"https://github.com/bazelbuild/rules_proto/archive/refs/tags/5.3.0-21.7.tar.gz",
],
)

Expand All @@ -499,11 +501,13 @@ rules_proto_dependencies()
rules_proto_toolchains()

# LICENSE: The Apache Software License, Version 2.0
rules_scala_version = "a0235fda820c635732d0d7cce86710eec92909ef"
http_archive(
name = "io_bazel_rules_scala",
sha256 = "ccf19e8f966022eaaca64da559c6140b23409829cb315f2eff5dc3e757fb6ad8",
strip_prefix = "rules_scala-e4560ac332e9da731c1e50a76af2579c55836a5c",
urls = ["https://github.com/bazelbuild/rules_scala/archive/e4560ac332e9da731c1e50a76af2579c55836a5c.zip"],
sha256 = "8981e4c5bb0f854b1c5da738876093249cf16b4b533cfec2d87dcdd1c867ffee",
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_config.bzl", "scala_config")
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package com.google.idea.blaze.aspect.scala.scalatest;

import org.scalatest.FlatSpec
import org.scalatest.flatspec.AnyFlatSpec

/** Dummy test class. */
class FooTest extends FlatSpec {
class FooTest extends AnyFlatSpec {
"test" should "pass" in {}
}

0 comments on commit 0bf4a9a

Please sign in to comment.