From 2eda9b2a53a4bd863738d76c13034256171fa2b8 Mon Sep 17 00:00:00 2001 From: Abdulla Abdurakhmanov Date: Mon, 25 Sep 2017 15:14:40 +0300 Subject: [PATCH 1/2] Scala 2.12 support --- build.sbt | 10 ++++++---- project/plugins.sbt | 6 +++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/build.sbt b/build.sbt index 9d0c050..3cf04c5 100644 --- a/build.sbt +++ b/build.sbt @@ -2,7 +2,7 @@ import SonatypeKeys._ name := "ScalaVerbalExpression" -version := "1.0.0" +version := "1.1.0" description := "VerbalExpressions in Scala" @@ -10,9 +10,11 @@ licenses += ("MIT", url("http://opensource.org/licenses/MIT")) organization := "com.github.verbalexpressions" -scalaVersion := "2.11.7" +scalaVersion := "2.12.3" -crossScalaVersions := Seq("2.10.6", "2.11.7") +sbtVersion := "0.13.16" + +crossScalaVersions := Seq("2.10.6","2.11.11","2.12.3") scalacOptions ++= Seq( "-unchecked", "-deprecation", "-feature", @@ -20,7 +22,7 @@ scalacOptions ++= Seq( ) libraryDependencies ++= Seq( - "org.specs2" %% "specs2" % "2.3.13" % "test" + "org.specs2" %% "specs2-core" % "3.9.5" % "test" ) sonatypeSettings diff --git a/project/plugins.sbt b/project/plugins.sbt index 22dca91..fce78a7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -6,8 +6,8 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "0.2.1") addSbtPlugin("com.typesafe.sbt" % "sbt-pgp" % "0.8.3") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.0.4") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1") -addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.0.0") +addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.1.0") -addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.9") +addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.3.1") From 8e4e14110d5d8a4c418b88689a7eff5a4030512e Mon Sep 17 00:00:00 2001 From: Abdulla Abdurakhmanov Date: Tue, 26 Sep 2017 12:03:36 +0300 Subject: [PATCH 2/2] Fix ver in readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 826f91a..18bcc00 100644 --- a/README.md +++ b/README.md @@ -34,5 +34,5 @@ Add the following to your `build.sbt`: ```scala resolvers += "Sonatype releases" at "https://oss.sonatype.org/content/repositories/releases/" -libraryDependency += "com.github.verbalexpressions" %% "scalaverbalexpression" % "1.0.1" +libraryDependency += "com.github.verbalexpressions" %% "scalaverbalexpression" % "1.1.0" ```