Skip to content

Commit 89f76c5

Browse files
dominvjuanpedromoreno
authored andcommitted
Updating libraries versions (#57)
* Updating libraries versions * Updating sbt-org-policies version * Fixing compilerSettings for scala 2.12.3
1 parent 7fd7bef commit 89f76c5

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ sudo: required
33
services:
44
- docker
55
scala:
6-
- 2.11.8
7-
- 2.12.1
6+
- 2.11.11
7+
- 2.12.3
88
jdk:
99
- oraclejdk8
1010
cache:

project/ProjectPlugin.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ object ProjectPlugin extends AutoPlugin {
8484
organizationEmail = "[email protected]"
8585
),
8686
orgLicenseSetting := ApacheLicense,
87-
scalaVersion := "2.11.8",
87+
scalaVersion := "2.11.11",
8888
scalaOrganization := "org.scala-lang",
8989
javacOptions ++= Seq("-encoding", "UTF-8", "-Xlint:-options"),
9090
fork in Test := false,

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@ resolvers += Resolver.sonatypeRepo("snapshots")
22
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.2.0-M8")
33
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.4")
44
addSbtPlugin("se.marcuslonnberg" % "sbt-docker" % "1.4.1")
5-
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.3.2")
5+
addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.5.13")

server/src/main/scala/org/scalaexercises/evaluator/evaluation.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ class Evaluator(timeout: FiniteDuration = 20.seconds)(
7474
classpath.value = newJars + File.pathSeparator + classpath.value
7575

7676
(jars map (_.toString)).filter(_.endsWith(".jar")).find(_.contains("paradise")) match {
77-
case Some(compilerJar) => plugin.appendToValue(compilerJar)
77+
case Some(compilerJar) => plugin.value ++= List(compilerJar)
7878
case None =>
7979
}
8080
}

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
version in ThisBuild := "0.2.0-SNAPSHOT"
1+
version in ThisBuild := "0.3.0-SNAPSHOT"

0 commit comments

Comments
 (0)