Merge master into scala 2.12 branch #307
Conversation
…trib#297) * Fix scala rule inconsistency for generated resource files * Remove newline
… proto dependencies (bazel-contrib#294) * Make sure to extract workspace root for proto files * Update tests and docs * Append deps to the end * Targets run properly * Fix comments and fail if needed * One more comment * Update readme
* Move scala_mvn_artifact to separate bzl file Move scala_version and scala_mvn_artifact from scala.bzl to scala_cross_version.bzl. This will allow for specs2.bzl to depend on these functions without introducing a cycle. Before this refactor, the cycle is: scala.bzl -> specs2.bzl -> specs2.bzl * Use scala_mvn_artifact instead of hardcoded _2.11 Migrate most of occurences of Scala dependencies with _2.11 suffix hardcoded to use scala_mvn_artifact that abstract Scala's major version. With this change we get down to just a few remaining hardcoded _2.11 uses: $ ag _2.11 scala/scala.bzl 980: jars = ["lib/scala-xml_2.11-1.0.5.jar"], 986: jars = ["lib/scala-parser-combinators_2.11-1.0.4.jar"], 1021: url = "http://mirror.bazel.build/oss.sonatype.org/content/groups/public/org/scalatest/scalatest_2.11/2.2.6/scalatest_2.11-2.2.6.jar", specs2/specs2_junit.bzl 10: name = "io_bazel_rules_scala_org_specs2_specs2_junit_2_11", 14: native.bind(name = 'io_bazel_rules_scala/dependency/specs2/specs2_junit', actual = '@io_bazel_rules_scala_org_specs2_specs2_junit_2_11//jar') test/aspect/aspect.bzl 55: "@io_bazel_rules_scala_org_specs2_specs2_junit_2_11//jar:jar", * Upgrade to scalding-date 0.17.0 This is a version that has both 2.11 and 2.12 releases available so will make the diff between 2.11 and 2.12 smaller.
# Conflicts: # WORKSPACE # scala/scala.bzl # scala_proto/scala_proto.bzl # specs2/specs2.bzl # specs2/specs2_junit.bzl # tut_rule/tut.bzl
|
Can one of the admins verify this patch? |
|
So there's good news and bad news. 👍 The good news is that everyone that needs to sign a CLA (the pull request submitter and all commit authors) have done so. Everything is all good there. 😕 The bad news is that it appears that one or more commits were authored by someone other than the pull request submitter. We need to confirm that they're okay with their commits being contributed to this project. Please have them confirm that here in the pull request. Note to project maintainer: This is a terminal state, meaning the |
gkk-stripe
changed the title
|
@oscar-stripe not sure what the cla warning means. |
|
👍 |
Includes #303