diff options
| -rw-r--r-- | CHANGELOG.md | 4 | ||||
| -rw-r--r-- | build.sbt | 15 | ||||
| -rw-r--r-- | project/Dependencies.scala | 8 | ||||
| -rw-r--r-- | project/build.properties | 2 | ||||
| -rw-r--r-- | project/plugins.sbt | 10 |
5 files changed, 23 insertions, 16 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index 1dcd894..6087eaf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# UNRELEASED +- Upgrade Akka to 2.5.7 +- Build: upgrade sbt to 1.0.4 and related plugins + # Version 4.1.1 - (Re-)Include armv6 binary in fat jar (thanks @mthmulders) @@ -1,6 +1,9 @@ // Build settings -version in ThisBuild := ("git describe --always --dirty=-SNAPSHOT --match v[0-9].*" !!).tail.trim -crossScalaVersions in ThisBuild := List("2.12.2", "2.11.11") +version in ThisBuild := { + import scala.sys.process._ + ("git describe --always --dirty=-SNAPSHOT --match v[0-9].*" !!).tail.trim +} +crossScalaVersions in ThisBuild := List("2.12.4", "2.11.11") scalaVersion in ThisBuild := crossScalaVersions.value.head scalacOptions in ThisBuild ++= Seq( "-deprecation", @@ -64,8 +67,8 @@ lazy val samplesWatcher = (project in file("samples") / "watcher") // Root project settings publishArtifact := false -publish := () -publishLocal := () +publish := {} +publishLocal := {} // make sbt-pgp happy publishTo := Some(Resolver.file("Unused transient repository", target.value / "unusedrepo")) @@ -80,8 +83,7 @@ preprocessVars in Preprocess := Map( // Add scaladoc to documentation enablePlugins(SiteScaladocPlugin) -import UnidocKeys._ -unidocSettings +enablePlugins(ScalaUnidocPlugin) unidocProjectFilter in (ScalaUnidoc, unidoc) := inAnyProject -- inProjects( samplesTerminal, samplesTerminalStream, samplesWatcher) scalacOptions in (ScalaUnidoc, doc) ++= Seq( @@ -90,6 +92,7 @@ scalacOptions in (ScalaUnidoc, doc) ++= Seq( "-implicits", // Add methods "inherited" through implicit conversions "-sourcepath", baseDirectory.value.getAbsolutePath ) ++ { + import scala.sys.process._ val latestTag: String = "git describe --abbrev=0 --match v[0-9].*".!! Opts.doc.sourceUrl( s"https://github.com/jodersky/akka-serial/blob/$latestTag€{FILE_PATH}.scala" diff --git a/project/Dependencies.scala b/project/Dependencies.scala index 3bd2540..4605b34 100644 --- a/project/Dependencies.scala +++ b/project/Dependencies.scala @@ -4,10 +4,10 @@ import sbt._ object Dependencies { - val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.0" - val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.5.0" + val akkaActor = "com.typesafe.akka" %% "akka-actor" % "2.5.7" + val akkaStream ="com.typesafe.akka" %% "akka-stream" % "2.5.7" - val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % "2.5.0" - val scalatest = "org.scalatest" %% "scalatest" % "3.0.1" + val akkaTestKit = "com.typesafe.akka" %% "akka-testkit" % "2.5.7" + val scalatest = "org.scalatest" %% "scalatest" % "3.0.2" } diff --git a/project/build.properties b/project/build.properties index 27e88aa..a31be40 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=0.13.13 +sbt.version=1.0.4
\ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 2ff38e5..88e6acf 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -3,19 +3,19 @@ */ // Build, package and load native libraries -addSbtPlugin("ch.jodersky" % "sbt-jni" % "1.2.4") +addSbtPlugin("ch.jodersky" % "sbt-jni" % "1.3.1") /* * Utility plugins, can be disabled during plain build */ // Generate documentation for all sources -addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.3.3") +addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.1") // Generate website content -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.0.0") +addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.3.1") // Sign published artifacts -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.0.0") +addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") // Publish to sonatype and sync with maven central -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "1.1") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.0") |