From 54b0721afc24e0ece57745ac189e00f078c70c83 Mon Sep 17 00:00:00 2001 From: Cees de Groot Date: Mon, 5 Oct 2015 21:26:07 -0400 Subject: [PATCH] Move to Scala 2.11 Now that https://github.com/jitpack/jitpack.io/issues/178 has been fixed, scala versions can be specified on-demand. So we can move default development to 2.11, have Travis check 2.10 too, and tell people that JitPack will take care of the rest :) --- .travis.yml | 3 ++- project/Build.scala | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index dc37477..e6cf457 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,4 @@ language: scala scala: - - 2.10.5 + - 2.10.6 + - 2.11.7 diff --git a/project/Build.scala b/project/Build.scala index 9ed3e46..0185404 100755 --- a/project/Build.scala +++ b/project/Build.scala @@ -2,16 +2,15 @@ import sbt._ import sbt.Keys._ object HardcodedBuild extends Build { - //val buildScalaVersion = "2.11.7" - val buildScalaVersion = "2.10.5" lazy val root = Project(id = "hardcoded", base = file(".")) .configs(IntegrationTest) .settings( - scalaVersion := buildScalaVersion, + scalaVersion := "2.11.7", + crossScalaVersions := Seq("2.10.6", "2.11.7"), scalacOptions ++= Seq("-unchecked", "-deprecation", "-feature", "-Xfatal-warnings"), libraryDependencies ++= Seq( - "org.scala-lang" % "scala-reflect" % buildScalaVersion, + "org.scala-lang" % "scala-reflect" % scalaVersion.value, "org.scalatest" %% "scalatest" % "2.2.4" % "it,test", "org.scalamock" %% "scalamock-scalatest-support" % "3.2" % "it,test"))