Bump batch version of scala, logkback

skinny-framework · Dec 11, 2016 · 5ff64e1 · 5ff64e1
1 parent d2bf1d2
commit 5ff64e1
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 9 deletions.
diff --git a/build.sbt b/build.sbt
@@ -10,9 +10,9 @@ lazy val skinnyMicroVersion = "1.2.0"
 lazy val scalikeJDBCVersion = "2.5.0"
 lazy val h2Version = "1.4.193"
 lazy val kuromojiVersion = "6.3.0"
-lazy val mockitoVersion = "2.2.26"
+lazy val mockitoVersion = "2.3.0"
 lazy val jettyVersion = "9.3.14.v20161028"
-lazy val logbackVersion = "1.1.7"
+lazy val logbackVersion = "1.1.8"
 lazy val slf4jApiVersion = "1.7.21"
 lazy val scalaTestVersion = "3.0.1"
 lazy val commonsIoVersion = "2.5"
@@ -28,7 +28,7 @@ lazy val baseSettings = Seq(
   ),
   publishTo := _publishTo(version.value),
   sbtPlugin := false,
-  scalaVersion := "2.12.0",
+  scalaVersion := "2.12.1",
   ivyScala := ivyScala.value map { _.copy(overrideScalaVersion = true) },
   scalacOptions ++= Seq("-deprecation", "-unchecked", "-feature"),
   publishMavenStyle := true,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -3,7 +3,7 @@ resolvers += "sonatype releases"  at "https://oss.sonatype.org/content/repositor
 // https://github.com/sbt/sbt/issues/2217
 fullResolvers ~= { _.filterNot(_.name == "jcenter") }
 // https://github.com/alexarchambault/coursier/issues/378
-//addSbtPlugin("io.get-coursier"      % "sbt-coursier"            % "1.0.0-M14-7")
+//addSbtPlugin("io.get-coursier"      % "sbt-coursier"            % "1.0.0-M15-1")
 
 addSbtPlugin("org.skinny-framework" % "sbt-scalate-precompiler" % "1.8.0.0")
 addSbtPlugin("org.skinny-framework" % "sbt-servlet-plugin"      % "2.1.0")

diff --git a/publish.sh b/publish.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-sbt ++2.12.0 \
+sbt ++2.12.1 \
   clean \
   common/publishSigned \
   assets/publishSigned \

diff --git a/publish_local.sh b/publish_local.sh
@@ -20,7 +20,7 @@ sbt ++2.11.8 \
 
 else
 
-sbt ++2.12.0 \
+sbt ++2.12.1 \
   clean \
   common/publishLocal \
   assets/publishLocal \

diff --git a/skinny-blank-app/build.sbt b/skinny-blank-app/build.sbt
@@ -14,7 +14,7 @@ val appName = "skinny-blank-app"
 val appVersion = "0.1.0-SNAPSHOT"
 
 val skinnyVersion = "2.3.1"
-val theScalaVersion = "2.11.8" // 2.12.0 is available if you don't mind if `skinny console` doesn't work ;(
+val theScalaVersion = "2.11.8" // 2.12.1 is available if you don't mind if `skinny console` doesn't work ;(
 val jettyVersion = "9.3.14.v20161028"
 
 lazy val baseSettings = servletSettings ++ Seq(
@@ -34,7 +34,7 @@ lazy val baseSettings = servletSettings ++ Seq(
     "org.skinny-framework"    %% "skinny-framework"     % skinnyVersion,
     "org.skinny-framework"    %% "skinny-assets"        % skinnyVersion,
     "org.skinny-framework"    %% "skinny-task"          % skinnyVersion,
-    "org.skinny-framework"    %  "skinny-logback"       % "1.0.9",
+    "org.skinny-framework"    %  "skinny-logback"       % "1.0.10",
     "com.h2database"          %  "h2"                   % "1.4.193",      // your own JDBC driver
     "org.skinny-framework"    %% "skinny-factory-girl"  % skinnyVersion   % "test",
     "org.skinny-framework"    %% "skinny-test"          % skinnyVersion   % "test",

diff --git a/skinny-blank-app/project/plugins.sbt b/skinny-blank-app/project/plugins.sbt
@@ -9,7 +9,7 @@ fullResolvers ~= { _.filterNot(_.name == "jcenter") }
 // Much fatster dependency resolver - https://github.com/alexarchambault/coursier
 // If you don't mind the following issue (breaking sbt console), enabling this would be life-changing!
 // https://github.com/alexarchambault/coursier/issues/378
-// addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M14-7")
+// addSbtPlugin("io.get-coursier" % "sbt-coursier" % "1.0.0-M15-1")
 
 // --------
 // scalac options for sbt