Skip to content

Commit

Permalink
Release 2021 02 26 (#304)
Browse files Browse the repository at this point in the history
* Fixup reactivemongo build

Signed-off-by: Lloyd <lloydmeta@gmail.com>

* enumeratum-reachtivemongo 1.6.3

Signed-off-by: Lloyd <lloydmeta@gmail.com>

* Fix up play build

Signed-off-by: Lloyd <lloydmeta@gmail.com>

* enumeratum-play-json 1.6.2

Signed-off-by: Lloyd <lloydmeta@gmail.com>

* enumeratum-play-json 1.6.3-SNAPSHOT begins

Signed-off-by: Lloyd <lloydmeta@gmail.com>
  • Loading branch information
lloydmeta committed Feb 26, 2021
1 parent 1d49a09 commit 5f9dcf8
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 16 deletions.
18 changes: 5 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ def theArgonautVersion(scalaVersion: String) =
def thePlayVersion(scalaVersion: String) =
CrossVersion.partialVersion(scalaVersion) match {
case Some((2, scalaMajor)) if scalaMajor >= 12 => "2.8.0"
case Some((2, scalaMajor)) if scalaMajor >= 11 => "2.7.0"
case _ =>
throw new IllegalArgumentException(s"Unsupported Scala version $scalaVersion")
}
Expand Down Expand Up @@ -76,8 +75,6 @@ def theCirceVersion(scalaVersion: String) =
def scalaTestPlay(scalaVersion: String) = CrossVersion.partialVersion(scalaVersion) match {
case Some((2, scalaMajor)) if scalaMajor >= 12 =>
"org.scalatestplus.play" %% "scalatestplus-play" % "5.0.0" % Test
case Some((2, scalaMajor)) if scalaMajor >= 11 =>
"org.scalatestplus.play" %% "scalatestplus-play" % "4.0.3" % Test
case _ =>
throw new IllegalArgumentException(s"Unsupported Scala version $scalaVersion")
}
Expand Down Expand Up @@ -279,7 +276,7 @@ lazy val enumeratumReactiveMongoBson =
.settings(commonWithPublishSettings: _*)
.settings(testSettings: _*)
.settings(
version := "1.6.3-SNAPSHOT",
version := "1.6.4-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= Seq(
"org.reactivemongo" %% "reactivemongo-bson-api" % reactiveMongoVersion % Provided,
Expand All @@ -298,7 +295,8 @@ lazy val enumeratumPlayJson = crossProject(JSPlatform, JVMPlatform)
.jsSettings(jsTestSettings: _*)
.settings(
name := "enumeratum-play-json",
version := "1.6.2-SNAPSHOT",
version := "1.6.3-SNAPSHOT",
crossScalaVersions := Seq(scala_2_12Version, scala_2_13Version),
libraryDependencies ++= {
Seq(
"com.typesafe.play" %%% "play-json" % thePlayJsonVersion(scalaVersion.value),
Expand All @@ -307,21 +305,15 @@ lazy val enumeratumPlayJson = crossProject(JSPlatform, JVMPlatform)
)
}
)
.jvmSettings(
crossScalaVersions := scalaVersionsAll,
)
.jsSettings(
crossScalaVersions := Seq(scala_2_12Version, scala_2_13Version)
)
lazy val enumeratumPlayJsonJs = enumeratumPlayJson.js
lazy val enumeratumPlayJsonJvm = enumeratumPlayJson.jvm

lazy val enumeratumPlay = Project(id = "enumeratum-play", base = file("enumeratum-play"))
.settings(commonWithPublishSettings: _*)
.settings(testSettings: _*)
.settings(
version := "1.6.2-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
version := "1.6.3-SNAPSHOT",
crossScalaVersions := Seq(scala_2_12Version, scala_2_13Version),
libraryDependencies ++=
Seq(
"com.typesafe.play" %% "play" % thePlayVersion(scalaVersion.value),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package enumeratum

import reactivemongo.api.bson._

import scala.util.{Failure, Success, Try}
import scala.util.{Failure, Success}

/**
* Holds BSON reader and writer for [[enumeratum.Enum]]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@ package enumeratum.values

import reactivemongo.api.bson._

import scala.util.Try

/**
* @author Alessandro Lacava (@lambdista)
* @since 2016-04-23
Expand Down

0 comments on commit 5f9dcf8

Please sign in to comment.