Skip to content

Commit

Permalink
version 1.0.5
Browse files Browse the repository at this point in the history
  • Loading branch information
seratch committed May 4, 2016
1 parent 285d9ed commit fd78268
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ http://www.scala-sbt.org/0.13/docs/Scripts.html
#!/usr/bin/env scalas
// or ./scalas app.scala
/***
scalaVersion := "2.11.7"
scalaVersion := "2.11.8"
resolvers += "sonatype releases" at "https://oss.sonatype.org/content/repositories/releases"
libraryDependencies += "org.skinny-framework" %% "skinny-micro-server" % "1.0.+"
*/
Expand Down
14 changes: 7 additions & 7 deletions project/Build.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,20 @@ import scala.language.postfixOps

object SkinnyMicroBuild extends Build {

lazy val currentVersion = "1.0.5-SNAPSHOT"
lazy val currentVersion = "1.0.5"

lazy val json4SVersion = "3.3.0"
// specs2 breaking changes since 2.4.0
lazy val scalatraTestVersion = "2.3.1"
lazy val mockitoVersion = "1.10.19"
// Jetty 9.3 dropped Java 7
lazy val jettyVersion = "9.2.15.v20160210"
lazy val logbackVersion = "1.1.6"
lazy val slf4jApiVersion = "1.7.19"
lazy val jettyVersion = "9.2.16.v20160414"
lazy val logbackVersion = "1.1.7"
lazy val slf4jApiVersion = "1.7.21"
// TODO: 2.7
lazy val jacksonVersion = "2.6.5"
lazy val jacksonVersion = "2.6.6"
// Akka 2.4 dropped Scala 2.10 support
lazy val akkaVersion = "2.3.14"
lazy val akkaVersion = "2.3.15"
lazy val scalaTestVersion = "2.2.6"

lazy val baseSettings = Seq(
Expand Down Expand Up @@ -141,7 +141,7 @@ object SkinnyMicroBuild extends Build {
settings = baseSettings ++ mimaSettings ++ Seq(
name := "skinny-micro-json4s",
libraryDependencies ++= servletApiDependencies ++ json4sDependencies ++ Seq(
"joda-time" % "joda-time" % "2.9.2" % Compile,
"joda-time" % "joda-time" % "2.9.3" % Compile,
"org.joda" % "joda-convert" % "1.8.1" % Compile,
"org.scalatra" %% "scalatra-scalatest" % scalatraTestVersion % Test,
"com.typesafe.akka" %% "akka-actor" % akkaVersion % Test,
Expand Down
8 changes: 4 additions & 4 deletions project/MimaSettings.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import sbt._, Keys._
import com.typesafe.tools.mima.plugin.MimaPlugin
import com.typesafe.tools.mima.plugin.MimaKeys.{previousArtifacts, reportBinaryIssues, binaryIssueFilters}
import com.typesafe.tools.mima.plugin.MimaKeys.{mimaPreviousArtifacts, mimaReportBinaryIssues, mimaBinaryIssueFilters}

/*
* MiMa settings of Skinny-Micro libs.
Expand All @@ -9,17 +9,17 @@ object MimaSettings {
val previousVersions = (0 to 3).map(patch => s"1.0.$patch").toSet

val mimaSettings = MimaPlugin.mimaDefaultSettings ++ Seq(
previousArtifacts := {
mimaPreviousArtifacts := {
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, scalaMajor)) if scalaMajor <= 11 => previousVersions.map { organization.value % s"${name.value}_${scalaBinaryVersion.value}" % _ }
case _ => Set.empty
}
},
test in Test := {
reportBinaryIssues.value
mimaReportBinaryIssues.value
(test in Test).value
},
binaryIssueFilters ++= {
mimaBinaryIssueFilters ++= {
import com.typesafe.tools.mima.core._
Seq(
// Add new method since 1.0.3
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ resolvers += Classpaths.sbtPluginReleases
resolvers += "sonatype releases" at "https://oss.sonatype.org/content/repositories/releases"
//addMavenResolverPlugin

addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.8")
addSbtPlugin("org.skinny-framework" % "sbt-servlet-plugin" % "2.0.3")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.1.9")
addSbtPlugin("org.skinny-framework" % "sbt-servlet-plugin" % "2.0.4")
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.6.0")
addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.6.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0")
Expand Down

0 comments on commit fd78268

Please sign in to comment.