Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Release/1.6 #281

Merged
merged 3 commits into from
May 2, 2020
Merged

Release/1.6 #281

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
436dad2
1.6 release
lloydmeta May 2, 2020
76129f7
1.6.1-SNAPSHOT begins
lloydmeta May 2, 2020
ebdf072
Scalafmt
lloydmeta May 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 14 additions & 14 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,9 +183,9 @@ lazy val core = crossProject(JSPlatform, JVMPlatform)
name := "enumeratum",
version := Versions.Core.head,
crossScalaVersions := scalaVersionsAll,
// libraryDependencies += "com.beachape" %% "enumeratum-macros" % Versions.Macros.stable
libraryDependencies += "com.beachape" %% "enumeratum-macros" % Versions.Macros.stable
)
.dependsOn(macros) // used for testing macros
// .dependsOn(macros) // used for testing macros
lazy val coreJS = core.js
lazy val coreJVM = core.jvm

Expand Down Expand Up @@ -223,7 +223,7 @@ lazy val coreJVMTests = Project(id = "coreJVMTests", base = file("enumeratum-cor
.settings(testSettings: _*)
.settings(
name := "coreJVMTests",
version := Versions.Core.stable,
version := Versions.Core.head,
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-compiler" % scalaVersion.value % Test
Expand All @@ -238,7 +238,7 @@ lazy val enumeratumReactiveMongoBson =
.settings(commonWithPublishSettings: _*)
.settings(testSettings: _*)
.settings(
version := "1.5.17-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= Seq(
"org.reactivemongo" %% "reactivemongo-bson-api" % s"$reactiveMongoVersion-noshaded" % Provided,
Expand All @@ -258,7 +258,7 @@ lazy val enumeratumPlayJson = crossProject(JSPlatform, JVMPlatform)
.settings(testSettings: _*)
.settings(
name := "enumeratum-play-json",
version := s"1.5.18-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= {
Seq(
Expand All @@ -275,7 +275,7 @@ lazy val enumeratumPlay = Project(id = "enumeratum-play", base = file("enumeratu
.settings(commonWithPublishSettings: _*)
.settings(testSettings: _*)
.settings(
version := s"1.5.18-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++=
Seq(
Expand All @@ -296,7 +296,7 @@ lazy val enumeratumCirce = crossProject(JSPlatform, JVMPlatform)
.settings(testSettings: _*)
.settings(
name := "enumeratum-circe",
version := "1.5.24-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= {
Seq(
Expand All @@ -317,7 +317,7 @@ lazy val enumeratumArgonaut = crossProject(JSPlatform, JVMPlatform)
.settings(testSettings: _*)
.settings(
name := "enumeratum-argonaut",
version := "1.5.14-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= {
Seq(
Expand All @@ -335,7 +335,7 @@ lazy val enumeratumJson4s =
.settings(commonWithPublishSettings: _*)
.settings(testSettings: _*)
.settings(
version := "1.5.16-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= Seq(
"org.json4s" %% "json4s-core" % json4sVersion,
Expand All @@ -354,7 +354,7 @@ lazy val enumeratumScalacheck = crossProject(JSPlatform, JVMPlatform)
.settings(testSettings: _*)
.settings(
name := "enumeratum-scalacheck",
version := "1.5.17-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= {
Seq(
Expand All @@ -378,7 +378,7 @@ lazy val enumeratumQuill = crossProject(JSPlatform, JVMPlatform)
.settings(testSettings: _*)
.settings(
name := "enumeratum-quill",
version := "1.5.16-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= {
Seq(
Expand All @@ -405,7 +405,7 @@ lazy val enumeratumDoobie =
.settings(testSettings: _*)
.settings(
crossScalaVersions := scalaVersionsAll,
version := "1.5.18-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
libraryDependencies ++= {
Seq(
"com.beachape" %%% "enumeratum" % Versions.Core.stable,
Expand All @@ -419,7 +419,7 @@ lazy val enumeratumSlick =
.settings(commonWithPublishSettings: _*)
.settings(testSettings: _*)
.settings(
version := "1.5.17-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= Seq(
"com.typesafe.slick" %% "slick" % theSlickVersion(scalaVersion.value),
Expand All @@ -436,7 +436,7 @@ lazy val enumeratumCats = crossProject(JSPlatform, JVMPlatform)
.settings(testSettings: _*)
.settings(
name := "enumeratum-cats",
version := "1.5.17-SNAPSHOT",
version := "1.6.1-SNAPSHOT",
crossScalaVersions := scalaVersionsAll,
libraryDependencies ++= {
Seq(
Expand Down
8 changes: 4 additions & 4 deletions project/Versions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
object Versions {

object Core {
val stable = "1.5.15"
val head = "1.5.16-SNAPSHOT"
val stable = "1.6.0"
val head = "1.6.1-SNAPSHOT"
}

object Macros {
val stable = "1.5.10"
val head = "1.5.11-SNAPSHOT"
val stable = "1.6.0"
val head = "1.6.1-SNAPSHOT"
}

}