Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 2 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
import com.typesafe.tools.mima.plugin.{MimaPlugin, MimaKeys}

resolvers in ThisBuild += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-pr-validation-snapshots/"
resolvers in ThisBuild += "scala-pr" at "https://scala-ci.typesafe.com/artifactory/scala-integration/"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the new version supposed be in some other repo, too? Because it is in this one.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

doh. fixed


// this is the SHA of https://github.com/scala/scala/pull/5603 as of 2017-01-12
// (that's the PR that removes the parallel collections)
crossScalaVersions in ThisBuild := Seq("2.13.0-eb9fdcd-SNAPSHOT")
crossScalaVersions in ThisBuild := Seq("2.13.0-pre-e2a2cba") // March 16, 2017

scalaVersion in ThisBuild := crossScalaVersions.value.head

Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.3")
addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.4")