Merge branch 'master' into release

Author: keritaf

build.sbt

@@ -1,6 +1,4 @@
 
-import com.atlassian.labs.gitstamp.GitStampPlugin._
-
 lazy val repo: Option[String] = sys.props.get("publishTo")
 
 lazy val commonSettings = Seq(
@@ -10,7 +8,7 @@ lazy val commonSettings = Seq(
 
   startYear := Some(2015),
 
-  version := "5.0.0-rc5",
+  version := "5.0.0",
 
   scalaOrganization := "org.typelevel",
   scalaVersion := "2.11.11-bin-typelevel-4",
@@ -77,15 +75,15 @@ lazy val commonSettings = Seq(
   credentials ++= sys.props.get("credentialPath").map {cp =>
     cp.split(',').map {path => Credentials(file(path))}.toSeq
   } getOrElse Seq.empty
-) ++ Seq(gitStampSettings: _*)
+)
 
 lazy val `client-api` = (project in file("client-api")).
   settings(commonSettings: _*).
   settings(
     name := s"client-api",
     description := s"Redmine REST API Client for Scala ${scalaBinaryVersion.value}: Client API. " +
       s"Contains domain classes and API manager traits.",
-    crossScalaVersions := Seq("2.11.11-bin-typelevel-4", "2.12.3-bin-typelevel-4"),
+    crossScalaVersions := Seq("2.11.11-bin-typelevel-4", "2.12.4-bin-typelevel-4"),
     libraryDependencies ++= Seq(
       Dependencies.monixEval,
       Dependencies.catsFree,
@@ -105,7 +103,7 @@ lazy val `client-core` = (project in file("client-core")).
     name := s"client-core",
     description := s"Redmine REST API Client for Scala ${scalaBinaryVersion.value}: Client Core. " +
       s"Contains API manager and JSON serialization implementation.",
-    crossScalaVersions := Seq("2.11.11-bin-typelevel-4", "2.12.3-bin-typelevel-4"),
+    crossScalaVersions := Seq("2.11.11-bin-typelevel-4", "2.12.4-bin-typelevel-4"),
     libraryDependencies ++= Seq(
       Dependencies.catsFree,
       Dependencies.jodaTime,
@@ -142,7 +140,7 @@ lazy val `client-play26-ws` = (project in file("client-play26-ws")).
   settings(
     name := s"client-play26-ws",
     description := s"Redmine REST API Client for Scala ${scalaBinaryVersion.value}: Play-WS 2.6 Web Client",
-    crossScalaVersions := Seq("2.11.11-bin-typelevel-4","2.12.3-bin-typelevel-4"),
+    crossScalaVersions := Seq("2.11.11-bin-typelevel-4","2.12.4-bin-typelevel-4"),
     libraryDependencies ++= Seq(
       Dependencies.play26Ws,
       Dependencies.slf4jJdk14 % Test,
@@ -158,7 +156,7 @@ lazy val `client-play-ws-standalone` = (project in file("client-play-ws-standalo
   settings(
     name := s"client-play-ws-standalone",
     description := s"Redmine REST API Client for Scala ${scalaBinaryVersion.value}: Play-WS Standalone Web Client",
-    crossScalaVersions := Seq("2.11.11-bin-typelevel-4", "2.12.3-bin-typelevel-4"),
+    crossScalaVersions := Seq("2.11.11-bin-typelevel-4", "2.12.4-bin-typelevel-4"),
     libraryDependencies ++= Seq(
       Dependencies.playWsStandalone,
       Dependencies.slf4jJdk14 % Test,
@@ -176,6 +174,4 @@ lazy val `client-parent` = (project in file(".")).
     // Do not publish root project
     publishArtifact := false
   ).
-  aggregate(`client-api`, `client-core`, `client-play25-ws`, `client-play26-ws`, `client-play-ws-standalone`).
-  enablePlugins(CrossPerProjectPlugin)
-
+  aggregate(`client-api`, `client-core`, `client-play25-ws`, `client-play26-ws`, `client-play-ws-standalone`)

docs/_config.yml

@@ -0,0 +1 @@
+theme: jekyll-theme-cayman

docs/index.md

@@ -0,0 +1,8 @@
+# Redmine REST API Client for Scala
+
+* Core and client modules are built for Scala 2.11 and 2.12.
+* Play-WS module is built for Play Framework 2.5/Scala 2.11.
+* Play-WS-Standalone module is built for Scala 2.11 and 2.12.
+* Uses typelevel:cats to provide monadic DSL for web request/response.
+* Uses SLF4J API for logging.
+* Based on [TaskAdapter Redmine Java API](https://github.com/taskadapter/redmine-java-api)

project/Dependencies.scala

@@ -3,17 +3,17 @@ import sbt._
 object Dependencies {
   val slf4jApi         : ModuleID = "org.slf4j" % "slf4j-api" % "1.7.25"
   val slf4jJdk14       : ModuleID = "org.slf4j" % "slf4j-jdk14" % "1.7.25"
-  val jodaTime         : ModuleID = "joda-time" % "joda-time" % "2.9.9"
-  val jodaConvert      : ModuleID = "org.joda" % "joda-convert" % "1.9.2"
-  val play25Ws         : ModuleID = "com.typesafe.play" %% "play-ws" % "2.5.17"
-  val play26Ws         : ModuleID = "com.typesafe.play" %% "play-ahc-ws" % "2.6.5"
-  val playWsStandalone : ModuleID = "com.typesafe.play" %% "play-ahc-ws-standalone" % "1.1.1"
-  val json4sCore       : ModuleID = "org.json4s" %% "json4s-core" % "3.5.3"
-  val json4sJackson    : ModuleID = "org.json4s" %% "json4s-jackson" % "3.5.3"
-  val scalaLogging     : ModuleID = "com.typesafe.scala-logging" %% "scala-logging" % "3.7.2"
-  val scalatest        : ModuleID = "org.scalatest" %% "scalatest" % "3.0.3"
+  val jodaTime         : ModuleID = "joda-time" % "joda-time" % "2.10"
+  val jodaConvert      : ModuleID = "org.joda" % "joda-convert" % "2.1"
+  val play25Ws         : ModuleID = "com.typesafe.play" %% "play-ws" % "2.5.18"
+  val play26Ws         : ModuleID = "com.typesafe.play" %% "play-ahc-ws" % "2.6.15"
+  val playWsStandalone : ModuleID = "com.typesafe.play" %% "play-ahc-ws-standalone" % "1.1.9"
+  val json4sCore       : ModuleID = "org.json4s" %% "json4s-core" % "3.5.4"
+  val json4sJackson    : ModuleID = "org.json4s" %% "json4s-jackson" % "3.5.4"
+  val scalaLogging     : ModuleID = "com.typesafe.scala-logging" %% "scala-logging" % "3.9.0"
+  val scalatest        : ModuleID = "org.scalatest" %% "scalatest" % "3.0.5"
   val restClientDriver : ModuleID = "com.github.rest-driver" % "rest-client-driver" % "2.0.0"
   val catsFree         : ModuleID = "org.typelevel" %% "cats-free" % "0.9.0"
   val scalaArm         : ModuleID = "com.jsuereth" %% "scala-arm" % "2.0"
-  val monixEval        : ModuleID = "io.monix" %% "monix-eval" % "2.3.0"
+  val monixEval        : ModuleID = "io.monix" %% "monix-eval" % "2.3.3"
 }

project/build.properties

@@ -1 +1 @@
-sbt.version=0.13.16
+sbt.version=1.1.6

project/plugins.sbt

@@ -1,7 +1,5 @@
-addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.0")
-addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "1.0.0")
-addSbtPlugin("com.atlassian.labs" % "sbt-git-stamp" % "0.1.2")
+addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.5.1")
+addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "2.1.0")
 addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
-addSbtPlugin("com.eed3si9n" %% "sbt-doge" % "0.1.5")
-addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.1")
-addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.0.0")
+addSbtPlugin("org.foundweekends" % "sbt-bintray" % "0.5.4")
+addSbtPlugin("org.lyranthe.sbt" % "partial-unification" % "1.1.0")