Skip to content

Commit

Permalink
Move to Scala 2.11
Browse files Browse the repository at this point in the history
Now that jitpack/jitpack.io#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 :)
  • Loading branch information
Cees de Groot committed Oct 6, 2015
1 parent 99b1f56 commit 54b0721
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
language: scala
scala:
- 2.10.5
- 2.10.6
- 2.11.7
7 changes: 3 additions & 4 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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"))

Expand Down

0 comments on commit 54b0721

Please sign in to comment.