Skip to content

Scala 2.13.0-M2, plus other version bumps #92

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

Merged
merged 1 commit into from
Oct 10, 2017
Merged

Scala 2.13.0-M2, plus other version bumps #92

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
4 changes: 2 additions & 2 deletions benchmark/build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ val parseJmh = TaskKey[Unit]("parseJmh", "Parses JMH benchmark logs in results/j

lazy val root = (project in file(".")).settings(
name := "java8-compat-bench",
scalaVersion := "2.11.8",
crossScalaVersions := List("2.11.8" /* TODO, "2.12.0-M4"*/),
scalaVersion := "2.11.11",
crossScalaVersions := List("2.11.11" /* TODO, "2.12.0-M4"*/),
organization := "org.scala-lang.modules",
version := "0.6.0-SNAPSHOT",
unmanagedJars in Compile ++= Seq(baseDirectory.value / "../target/scala-2.11/scala-java8-compat_2.11-0.9.0-SNAPSHOT.jar"),
Expand Down
2 changes: 1 addition & 1 deletion build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import ScalaModulePlugin._

scalaVersionsByJvm in ThisBuild := Map(
8 -> List("2.12.2", "2.11.11", "2.13.0-M1").map(_ -> true)
8 -> List("2.12.3", "2.11.11", "2.13.0-M2").map(_ -> true)
)

val disableDocs = sys.props("nodocs") == "true"
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=0.13.15
sbt.version=0.13.16
2 changes: 1 addition & 1 deletion project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
scalacOptions += "-Xfatal-warnings"

addSbtPlugin("org.scala-lang.modules" % "scala-module-plugin" % "1.0.8")
addSbtPlugin("org.scala-lang.modules" % "sbt-scala-module" % "1.0.12")