Release of FoBo v1.7 for Lift 3.0 / Scala 2.12

karma4u101 · Dec 17, 2016 · 773e92c · 773e92c
1 parent 817bcc1
commit 773e92c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,8 @@
 For update history see the [History log](https://github.com/karma4u101/FoBo/tree/master/CHANGELOG.md#history-log) section
 
 **Latest Stable Releases:**
-- **2016-10-04** -- FoBo Module v.17
+- **2016-12-17** -- FoBo Module v.1.7 (Scala 2.12)
+- **2016-10-04** -- FoBo Module v.1.7 (Scala 2.11)
 - **2016-06-25** -- FoBo Module v1.6
 - **2015-12-30** -- FoBo Module v1.5.1
 

diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ Setup example:
 ```xml
 <dependency>
   <groupId>net.liftmodules</groupId>
-  <artifactId>fobo_3.0_2.11.6</artifactId>
+  <artifactId>fobo_3.0_2.12.1</artifactId>
   <version>1.7</version>
 </dependency>
 ```
@@ -110,7 +110,7 @@ Setup example using the FoBo/Lift Bootstrap3 API module:
 ```xml      
 <dependency>
   <groupId>net.liftmodules</groupId>
-  <artifactId>fobo-twbs-bootstrap3-api_3.0_2.11.6</artifactId>
+  <artifactId>fobo-twbs-bootstrap3-api_3.0_2.12.1</artifactId>
   <version>1.7</version>
 </dependency>
 ```

diff --git a/build.sbt b/build.sbt
@@ -17,8 +17,8 @@ lazy val fobometa = (project in file("."))
   .settings(unidocSettings: _*)
   //.settings(scalafmtConfig in ThisBuild := Some(file(".scalafmt")))
   .settings(name := "fobo-meta")
-  .settings(scalaVersion in ThisBuild := "2.11.7")
-  .settings(liftVersion in ThisBuild <<= liftVersion ?? "3.0-RC4")
+  .settings(scalaVersion in ThisBuild := "2.12.1")
+  .settings(liftVersion in ThisBuild <<= liftVersion ?? "3.0.1")
   .settings(liftEdition in ThisBuild <<= liftVersion apply {
     _.substring(0, 3)
   })
@@ -212,13 +212,17 @@ libraryDependencies in ThisBuild <++= (scalaVersion, liftVersion) { (sv, lv) =>
       "org.specs2" %% "specs2" % "1.12.3" % "test"
     case ("2.10.4", _) => "org.specs2" %% "specs2" % "1.13"   % "test"
     case (_, "2.6.2")  => "org.specs2" %% "specs2" % "2.3.11" % "test"
-    case (_, _)        => "org.specs2" %% "specs2" % "3.7"    % "test"
+    case (_, "3.0.0")  => "org.specs2" %% "specs2" % "2.3.11" % "test"
+    case (_, _)        => "org.specs2" %% "specs2-core" % "3.8.6"    % "test"
+  }) ::
+  ((sv, lv) match {
+    case ("2.12.1", _) => "org.specs2" %% "specs2-matcher-extra" % "3.8.6"    % "test"
   }) ::
     ((sv, lv) match {
       case ("2.10.4", _) | ("2.9.2", _) | ("2.9.1", _) | ("2.9.1-1", _) =>
         "org.scalacheck" %% "scalacheck" % "1.10.0" % "test"
       case (_, "2.6.2") => "org.scalacheck" %% "scalacheck"        % "1.11.4" % "test"
-      case (_, _)       => "org.specs2"     %% "specs2-scalacheck" % "3.7"    % "test"
+      case (_, _)       => "org.specs2"     %% "specs2-scalacheck" % "3.8.6"    % "test"
     }) ::
       Nil
 }

diff --git a/project/autobuildscript/build-publish-Lift3.txt b/project/autobuildscript/build-publish-Lift3.txt
@@ -2,8 +2,8 @@ alias pub=publish-signed
 
 set version       in ThisBuild:="1.7"
 
-set liftVersion   in ThisBuild:="3.0-RC4"
-set scalaVersion  in ThisBuild:="2.11.7"
+set liftVersion   in ThisBuild:="3.0.1"
+set scalaVersion  in ThisBuild:="2.12.1"
 
 project fobo
 clean