Skip to content

Commit

Permalink
Update Scala to version 2.12.4
Browse files Browse the repository at this point in the history
  • Loading branch information
ruippeixotog committed Oct 19, 2017
1 parent 5525607 commit 1be30da
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Expand Up @@ -2,7 +2,7 @@ language: scala
scala:
- 2.10.6
- 2.11.11
- 2.12.3
- 2.12.4
jdk:
- oraclejdk8
script:
Expand Down
9 changes: 5 additions & 4 deletions build.sbt
Expand Up @@ -38,8 +38,8 @@ lazy val commonSettings = Seq(
homepage := Some(url("https://github.com/pureconfig/pureconfig")),
licenses := Seq("Mozilla Public License, version 2.0" -> url("https://www.mozilla.org/MPL/2.0/")),

scalaVersion := "2.12.3",
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.3"),
scalaVersion := "2.12.4",
crossScalaVersions := Seq("2.10.6", "2.11.11", "2.12.4"),

resolvers ++= Seq(
Resolver.sonatypeRepo("releases"),
Expand All @@ -60,8 +60,9 @@ lazy val commonSettings = Seq(
scalacOptions in (Test, console) := (scalacOptions in (Compile, console)).value,

// use sbt <module_name>/test:console to run an ammonite console
libraryDependencies += "com.lihaoyi" % "ammonite" % "1.0.1" % "test" cross CrossVersion.patch,
initialCommands in (Test, console) := """ammonite.Main().run()""",
// disabled until Ammonite is published for Scala 2.12.4
// libraryDependencies += "com.lihaoyi" % "ammonite" % "1.0.1" % "test" cross CrossVersion.patch,
// initialCommands in (Test, console) := """ammonite.Main().run()""",

scalariformPreferences := scalariformPreferences.value
.setPreference(DanglingCloseParenthesis, Prevent)
Expand Down

0 comments on commit 1be30da

Please sign in to comment.