Skip to content

Commit

Permalink
Merge pull request #80 from Philippus/update-dependencies
Browse files Browse the repository at this point in the history
Update dependencies
  • Loading branch information
godenji authored Jun 29, 2019
2 parents b33f32b + 31828cd commit 1b8322c
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
language: scala
jdk: openjdk6
scala: 2.10.6
jdk: openjdk8
sudo: false

# Build only master and version tags - http://stackoverflow.com/a/31882307/463761
Expand Down
5 changes: 3 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ version in ThisBuild := "1.8.2"
)
)

crossSbtVersions := Vector("0.13.16", "1.0.3")
crossSbtVersions := Vector("0.13.18", "1.2.8")

scalacOptions ++= List(
"-unchecked",
Expand All @@ -34,7 +34,7 @@ scalacOptions ++= List(
"-encoding", "UTF-8"
) ++ (if (scalaVersion.value startsWith "2.10.") List("-target:jvm-1.6") else List.empty)

libraryDependencies += "org.scalariform" %% "scalariform" % "0.2.5"
libraryDependencies += "org.scalariform" %% "scalariform" % "0.2.10"

com.typesafe.sbt.SbtScalariform.ScalariformKeys.preferences := {
import scalariform.formatter.preferences._
Expand All @@ -50,6 +50,7 @@ com.typesafe.sbt.SbtScalariform.ScalariformKeys.preferences := {
// preserve formatting of sbt-scripted test files
excludeFilter in scalariformFormat := "unformatted.scala" || "formatted.scala"

enablePlugins(SbtPlugin)
scriptedLaunchOpts := {
val sbtAssemblyVersion = "0.14.5"

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.0.3
sbt.version=1.2.8
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.1")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.7.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.2")
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0")
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0")

0 comments on commit 1b8322c

Please sign in to comment.