Skip to content

Commit

Permalink
1.5.13 release (#180)
Browse files Browse the repository at this point in the history
* Bump versions for libs
* Bump our versions
  • Loading branch information
lloydmeta authored Mar 14, 2018
1 parent fea39d6 commit cef09db
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 22 deletions.
40 changes: 22 additions & 18 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,31 +8,32 @@ lazy val scalaTestVersion = "3.0.5"
lazy val scalacheckVersion = "1.13.5"

// Library versions
lazy val reactiveMongoVersion = "0.12.1"
lazy val reactiveMongoVersion = "0.13.0"
lazy val circeVersion = "0.9.2"
lazy val uPickleVersion = "0.4.4"
lazy val argonautVersion = "6.2"
lazy val json4sVersion = "3.5.1"
lazy val quillVersion = "2.3.2"
lazy val argonautVersion = "6.2.1"
lazy val json4sVersion = "3.5.3"
lazy val quillVersion = "2.3.3"

def thePlayVersion(scalaVersion: String) =
CrossVersion.partialVersion(scalaVersion) match {
case Some((2, scalaMajor)) if scalaMajor >= 11 => "2.6.6"
case Some((2, scalaMajor)) if scalaMajor >= 11 => "2.6.12"
case Some((2, scalaMajor)) if scalaMajor == 10 => "2.4.11"
case _ =>
throw new IllegalArgumentException(s"Unsupported Scala version $scalaVersion")
}

def thePlayJsonVersion(scalaVersion: String) =
CrossVersion.partialVersion(scalaVersion) match {
case Some((2, scalaMajor)) if scalaMajor >= 11 => "2.6.6"
case Some((2, scalaMajor)) if scalaMajor >= 11 => "2.6.9"
case Some((2, scalaMajor)) if scalaMajor == 10 => "2.4.11"
case _ =>
throw new IllegalArgumentException(s"Unsupported Scala version $scalaVersion")
}

def scalaTestPlay(scalaVersion: String) = CrossVersion.partialVersion(scalaVersion) match {
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
"org.scalatestplus.play" %% "scalatestplus-play" % "3.0.0-M2" % Test
"org.scalatestplus.play" %% "scalatestplus-play" % "3.1.2" % Test
case Some((2, scalaMajor)) if scalaMajor == 10 =>
"org.scalatestplus" %% "play" % "1.4.0" % Test
case _ =>
Expand Down Expand Up @@ -152,7 +153,7 @@ lazy val enumeratumReactiveMongoBson =
.settings(commonWithPublishSettings: _*)
.settings(testSettings: _*)
.settings(
version := "1.5.13-SNAPSHOT",
version := "1.5.14-SNAPSHOT",
libraryDependencies ++= Seq(
"org.reactivemongo" %% "reactivemongo" % reactiveMongoVersion,
"com.beachape" %% "enumeratum" % Versions.Core.stable,
Expand All @@ -165,7 +166,7 @@ lazy val enumeratumPlayJson =
.settings(commonWithPublishSettings: _*)
.settings(testSettings: _*)
.settings(
version := s"1.5.13-SNAPSHOT",
version := s"1.5.14-SNAPSHOT",
libraryDependencies ++= Seq(
"com.typesafe.play" %% "play-json" % thePlayJsonVersion(scalaVersion.value),
"com.beachape" %% "enumeratum" % Versions.Core.stable,
Expand All @@ -178,7 +179,7 @@ lazy val enumeratumPlay = Project(id = "enumeratum-play", base = file("enumeratu
.settings(commonWithPublishSettings: _*)
.settings(testSettings: _*)
.settings(
version := s"1.5.13-SNAPSHOT",
version := s"1.5.14-SNAPSHOT",
libraryDependencies ++= Seq(
"com.typesafe.play" %% "play" % thePlayVersion(scalaVersion.value),
"com.beachape" %% "enumeratum" % Versions.Core.stable,
Expand All @@ -196,7 +197,7 @@ lazy val enumeratumUPickle = crossProject
.settings(testSettings: _*)
.settings(
name := "enumeratum-upickle",
version := "1.5.12-SNAPSHOT",
version := "1.5.13-SNAPSHOT",
libraryDependencies ++= {
import org.scalajs.sbtplugin._
val cross = {
Expand Down Expand Up @@ -233,7 +234,7 @@ lazy val enumeratumCirce = crossProject
.settings(testSettings: _*)
.settings(
name := "enumeratum-circe",
version := "1.5.16-SNAPSHOT",
version := "1.5.17-SNAPSHOT",
libraryDependencies ++= {
import org.scalajs.sbtplugin._
val cross = {
Expand All @@ -260,7 +261,7 @@ lazy val enumeratumArgonaut = crossProject
.settings(testSettings: _*)
.settings(
name := "enumeratum-argonaut",
version := "1.5.13-SNAPSHOT",
version := "1.5.14-SNAPSHOT",
libraryDependencies ++= {
import org.scalajs.sbtplugin._
val cross = {
Expand All @@ -284,7 +285,7 @@ lazy val enumeratumJson4s =
.settings(commonWithPublishSettings: _*)
.settings(testSettings: _*)
.settings(
version := "1.5.14-SNAPSHOT",
version := "1.5.15-SNAPSHOT",
libraryDependencies ++= Seq(
"org.json4s" %% "json4s-core" % json4sVersion,
"org.json4s" %% "json4s-native" % json4sVersion % Test,
Expand All @@ -302,7 +303,7 @@ lazy val enumeratumScalacheck = crossProject
.settings(testSettings: _*)
.settings(
name := "enumeratum-scalacheck",
version := "1.5.14-SNAPSHOT",
version := "1.5.15-SNAPSHOT",
libraryDependencies ++= {
import org.scalajs.sbtplugin._
val cross = {
Expand Down Expand Up @@ -333,7 +334,7 @@ lazy val enumeratumQuill = crossProject
.settings(testSettings: _*)
.settings(
name := "enumeratum-quill",
version := "1.5.12",
version := "1.5.14-SNAPSHOT",
crossScalaVersions := post210Only(crossScalaVersions.value),
libraryDependencies ++= {
import org.scalajs.sbtplugin._
Expand Down Expand Up @@ -372,8 +373,11 @@ lazy val commonWithPublishSettings =
publishSettings

lazy val resolverSettings = Seq(
resolvers += "Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/",
resolvers += "Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots"
resolvers ++= Seq(
"Typesafe Releases" at "http://repo.typesafe.com/typesafe/releases/",
"Sonatype snapshots" at "https://oss.sonatype.org/content/repositories/snapshots",
"Sonatype releases" at "https://oss.sonatype.org/content/repositories/releases"
)
)

lazy val ideSettings = Seq(
Expand Down
4 changes: 2 additions & 2 deletions project/Versions.scala
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
object Versions {

object Core {
val stable = "1.5.12"
val head = "1.5.13-SNAPSHOT"
val stable = "1.5.13"
val head = "1.5.14-SNAPSHOT"
}

object Macros {
Expand Down
4 changes: 2 additions & 2 deletions publish-integration-libs
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,11 @@ sbt "project enumeratum-play-json" +clean +publishSigned &&
say "Done 4" &&
sbt "project enumeratum-play" +clean +publishSigned &&
say "Done 5" &&
sbt "project enumeratum-argonaut" +clean +publishSigned &&
sbt "project argonaut-aggregate" +clean +publishSigned &&
say "Done 6" &&
sbt "project enumeratum-json4s" +clean +publishSigned &&
say "Done 7" &&
sbt "project enumeratum-scalacheck" +clean +publishSigned &&
sbt "project scalacheck-aggregate" +clean +publishSigned &&
say "Done 8" &&
sbt "project quill-aggregate" +clean +publishSigned &&
say "All done"

0 comments on commit cef09db

Please sign in to comment.