Skip to content
Permalink
Browse files

Bump up dependencies

  • Loading branch information...
pocorall committed Aug 6, 2018
1 parent 6060e8b commit e2967434b2d394f9c71c81fcc53018ee05601712
Showing with 5 additions and 5 deletions.
  1. +4 −4 project/Build.scala
  2. +1 −1 project/build.properties
@@ -8,7 +8,7 @@ object Dependencies {
val scaloid = "org.scaloid" %% "scaloid" % scaloidVersion

val robolectric = "org.robolectric" % "robolectric" % "2.4" % "test"
val scalaTest = "org.scalatest" %% "scalatest" % "2.2.5" % "test"
val scalaTest = "org.scalatest" %% "scalatest" % "3.0.4" % "test"
val junit = "junit" % "junit" % "4.12" % "test"
val junitInterface = "com.novocode" % "junit-interface" % "0.11" % "test"
}
@@ -23,8 +23,8 @@ object ScaloidBuild extends Build {
organizationHomepage := Some(new URL("http://blog.scaloid.org")),
description := "Less Painful Android Development with Scala",
startYear := Some(2012),
scalaVersion := "2.11.8",
crossScalaVersions := Seq("2.11.8"), // only 2.11.x for now
scalaVersion := "2.11.12",
crossScalaVersions := Seq("2.11.12"), // only 2.11.x for now
version := scaloidVersion,
publishMavenStyle := true,
publishTo <<= version {
@@ -66,7 +66,7 @@ object ScaloidBuild extends Build {
"-source", "1.6",
"-target", "1.6"),
resolvers += "Android Repository" at (new File(System.getenv("ANDROID_HOME")) / "extras" / "android" / "m2repository").getCanonicalFile.toURI.toString,
addCompilerPlugin("org.scalamacros" % "paradise" % "2.0.1" cross CrossVersion.full)
addCompilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full)
)

// configure prompt to show current project
@@ -1 +1 @@
sbt.version=0.13.8
sbt.version=0.13.16

0 comments on commit e296743

Please sign in to comment.
You can’t perform that action at this time.