diff --git a/.travis.yml b/.travis.yml index e21e05bf..c75bafa1 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,8 +3,8 @@ sudo: required services: - docker scala: -- 2.11.8 -- 2.12.1 +- 2.11.11 +- 2.12.3 jdk: - oraclejdk8 cache: diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index 7cea5504..f5991eac 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -84,7 +84,7 @@ object ProjectPlugin extends AutoPlugin { organizationEmail = "hello@47deg.com" ), orgLicenseSetting := ApacheLicense, - scalaVersion := "2.11.8", + scalaVersion := "2.11.11", scalaOrganization := "org.scala-lang", javacOptions ++= Seq("-encoding", "UTF-8", "-Xlint:-options"), fork in Test := false, diff --git a/project/plugins.sbt b/project/plugins.sbt index 7d43061c..e16bf982 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,4 @@ resolvers += Resolver.sonatypeRepo("snapshots") addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0-M8") addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4") addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.1") -addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.3.2") +addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.5.13") \ No newline at end of file diff --git a/server/src/main/scala/org/scalaexercises/evaluator/evaluation.scala b/server/src/main/scala/org/scalaexercises/evaluator/evaluation.scala index f7bbe7b6..5309151e 100644 --- a/server/src/main/scala/org/scalaexercises/evaluator/evaluation.scala +++ b/server/src/main/scala/org/scalaexercises/evaluator/evaluation.scala @@ -74,7 +74,7 @@ class Evaluator(timeout: FiniteDuration = 20.seconds)( classpath.value = newJars + File.pathSeparator + classpath.value (jars map (_.toString)).filter(_.endsWith(".jar")).find(_.contains("paradise")) match { - case Some(compilerJar) => plugin.appendToValue(compilerJar) + case Some(compilerJar) => plugin.value ++= List(compilerJar) case None => } } diff --git a/version.sbt b/version.sbt index 03a8b079..87c01ed1 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.2.0-SNAPSHOT" +version in ThisBuild := "0.3.0-SNAPSHOT"