Merge pull request #241 from profunktor/release/2.0.0

Preparing release 2.0.0
profunktor · Sep 17, 2019 · 0be2ffa · 0be2ffa
2 parents 5be18c9 + f991d75
commit 0be2ffa
Show file tree

Hide file tree

Showing 5 changed files with 79 additions and 135 deletions.
diff --git a/build.sbt b/build.sbt
@@ -8,28 +8,20 @@ name := """fs2-rabbit-root"""
 organization in ThisBuild := "dev.profunktor"
 
 scalaVersion in ThisBuild := "2.12.9"
-crossScalaVersions in ThisBuild := Seq("2.11.12", "2.12.9", "2.13.0")
-
-// makes `tut` fail :( -> https://github.com/tpolecat/tut/issues/255
-//scalaVersion in ThisBuild := "2.12.8" // needed for metals
+crossScalaVersions in ThisBuild := Seq("2.12.10", "2.13.0")
 
 sonatypeProfileName := "dev.profunktor"
 
-promptTheme := PromptTheme(List(
-  text("[sbt] ", fg(105)),
-  text(_ => "fs2-rabbit", fg(15)).padRight(" λ ")
- ))
-
-// We use String as our input type because `scalaVersion.value` cannot be called
-// in a lot of places in a build.sbt file where it would be convenient to do so
-// and so we have to thread it through at the last moment instead and
-// scalaVersion.value is a String.
-def determineVersionSpecificDeps(scalaVersionStr: String) = CrossVersion.partialVersion(scalaVersionStr) match {
-  case Some((2, 13)) => Scala213Dependencies
-  case Some((2, 12)) => Scala212Dependencies
-  case Some((2, 11)) => Scala211Dependencies
-  // Fallback to 2.12 libraries as they're currently the most well-supported
-  case _ => Scala212Dependencies
+promptTheme := PromptTheme(
+  List(
+    text("[sbt] ", fg(105)),
+    text(_ => "fs2-rabbit", fg(15)).padRight(" λ ")
+  )
+)
+
+def maxClassFileName(v: String) = CrossVersion.partialVersion(v) match {
+  case Some((2, 13)) => Seq.empty[String]
+  case _             => Seq("-Xmax-classfile-name", "100")
 }
 
 val commonSettings = Seq(
@@ -39,17 +31,16 @@ val commonSettings = Seq(
   homepage := Some(url("https://fs2-rabbit.profunktor.dev/")),
   headerLicense := Some(HeaderLicense.ALv2("2017-2019", "ProfunKtor")),
   scalacOptions in (Compile, doc) ++= Seq("-no-link-warnings"),
-  scalacOptions ++= determineVersionSpecificDeps(scalaVersion.value).scalacOptions,
+  scalacOptions ++= maxClassFileName(scalaVersion.value),
   libraryDependencies ++= {
-    val library = determineVersionSpecificDeps(scalaVersion.value)
     Seq(
-      compilerPlugin(library.kindProjector),
-      compilerPlugin(library.betterMonadicFor),
-      library.amqpClient,
-      library.catsEffect,
-      library.fs2Core,
-      library.scalaTest % "test",
-      library.scalaCheck % "test"
+      compilerPlugin(Libraries.kindProjector),
+      compilerPlugin(Libraries.betterMonadicFor),
+      Libraries.amqpClient,
+      Libraries.catsEffect,
+      Libraries.fs2Core,
+      Libraries.scalaTest  % "test",
+      Libraries.scalaCheck % "test"
     )
   },
   resolvers += "Apache public" at "https://repository.apache.org/content/groups/public/",
@@ -63,9 +54,11 @@ val commonSettings = Seq(
   },
   publishMavenStyle := true,
   publishArtifact in Test := false,
-  pomIncludeRepository := { _ => false },
+  pomIncludeRepository := { _ =>
+    false
+  },
   pomExtra :=
-      <developers>
+    <developers>
         <developer>
           <id>gvolpe</id>
           <name>Gabriel Volpe</name>
@@ -74,41 +67,22 @@ val commonSettings = Seq(
       </developers>
 )
 
-def CoreDependencies(scalaVersionStr: String): Seq[ModuleID] = {
-  val library = determineVersionSpecificDeps(scalaVersionStr)
+def CoreDependencies(scalaVersionStr: String): Seq[ModuleID] = Seq(Libraries.logback % "test")
+
+def JsonDependencies(scalaVersionStr: String): Seq[ModuleID] =
   Seq(
-    library.logback % "test"
+    Libraries.circeCore,
+    Libraries.circeGeneric,
+    Libraries.circeParser
   )
-}
 
-def JsonDependencies(scalaVersionStr: String): Seq[ModuleID] = {
-  val library = determineVersionSpecificDeps(scalaVersionStr)
+def ExamplesDependencies(scalaVersionStr: String): Seq[ModuleID] =
   Seq(
-    library.circeCore,
-    library.circeGeneric,
-    library.circeParser
+    Libraries.logback % "runtime",
+    Libraries.monix,
+    Libraries.zioCore,
+    Libraries.zioCats
   )
-}
-
-def ExamplesDependencies(scalaVersionStr: String): Seq[ModuleID] = {
-  determineVersionSpecificDeps(scalaVersionStr) match {
-    case library: Scala213Dependencies.type => Seq(library.logback % "runtime")
-    case library: Scala212Dependencies.type =>
-      Seq(
-        library.logback % "runtime",
-        library.monix,
-        library.zioCore,
-        library.zioCats
-      )
-    case library: Scala211Dependencies.type =>
-      Seq(
-        library.logback % "runtime",
-        library.monix,
-        library.zioCore,
-        library.zioCats
-      )
-  }
-}
 
 lazy val noPublish = Seq(
   publish := {},
@@ -117,44 +91,51 @@ lazy val noPublish = Seq(
   skip in publish := true
 )
 
-lazy val `fs2-rabbit-root` = project.in(file("."))
+lazy val `fs2-rabbit-root` = project
+  .in(file("."))
   .aggregate(`fs2-rabbit`, `fs2-rabbit-circe`, `fs2-rabbit-test-support`, tests, examples, microsite)
   .settings(noPublish)
 
-lazy val `fs2-rabbit` = project.in(file("core"))
+lazy val `fs2-rabbit` = project
+  .in(file("core"))
   .settings(commonSettings: _*)
   .settings(libraryDependencies ++= CoreDependencies(scalaVersion.value))
   .settings(parallelExecution in Test := false)
   .enablePlugins(AutomateHeaderPlugin)
 
-lazy val `fs2-rabbit-circe` = project.in(file("json-circe"))
+lazy val `fs2-rabbit-circe` = project
+  .in(file("json-circe"))
   .settings(commonSettings: _*)
   .settings(libraryDependencies ++= JsonDependencies(scalaVersion.value))
   .settings(parallelExecution in Test := false)
   .enablePlugins(AutomateHeaderPlugin)
   .dependsOn(`fs2-rabbit`)
 
-lazy val `fs2-rabbit-test-support` = project.in(file("test-support"))
+lazy val `fs2-rabbit-test-support` = project
+  .in(file("test-support"))
   .settings(commonSettings: _*)
-  .settings(libraryDependencies += determineVersionSpecificDeps(scalaVersion.value).scalaTest)
+  .settings(libraryDependencies += Libraries.scalaTest)
   .enablePlugins(AutomateHeaderPlugin)
   .dependsOn(`fs2-rabbit`)
 
-lazy val tests = project.in(file("tests"))
+lazy val tests = project
+  .in(file("tests"))
   .settings(commonSettings: _*)
   .settings(noPublish)
   .enablePlugins(AutomateHeaderPlugin)
   .settings(parallelExecution in Test := false)
   .dependsOn(`fs2-rabbit-test-support` % Test)
 
-lazy val examples = project.in(file("examples"))
+lazy val examples = project
+  .in(file("examples"))
   .settings(commonSettings: _*)
   .settings(libraryDependencies ++= ExamplesDependencies(scalaVersion.value))
   .settings(noPublish)
   .enablePlugins(AutomateHeaderPlugin)
   .dependsOn(`fs2-rabbit`, `fs2-rabbit-circe`)
 
-lazy val microsite = project.in(file("site"))
+lazy val microsite = project
+  .in(file("site"))
   .enablePlugins(MicrositesPlugin)
   .settings(commonSettings: _*)
   .settings(noPublish)
@@ -178,14 +159,14 @@ lazy val microsite = project.in(file("site"))
       )
     ),
     micrositePalette := Map(
-      "brand-primary"     -> "#E05236",
-      "brand-secondary"   -> "#774615",
-      "brand-tertiary"    -> "#2f2623",
-      "gray-dark"         -> "#453E46",
-      "gray"              -> "#837F84",
-      "gray-light"        -> "#E3E2E3",
-      "gray-lighter"      -> "#F4F3F4",
-      "white-color"       -> "#FFFFFF"
+      "brand-primary"   -> "#E05236",
+      "brand-secondary" -> "#774615",
+      "brand-tertiary"  -> "#2f2623",
+      "gray-dark"       -> "#453E46",
+      "gray"            -> "#837F84",
+      "gray-light"      -> "#E3E2E3",
+      "gray-lighter"    -> "#F4F3F4",
+      "white-color"     -> "#FFFFFF"
     ),
     micrositeGitterChannel := true,
     micrositeGitterChannelUrl := "profunktor-dev/fs2-rabbit",
@@ -197,11 +178,10 @@ lazy val microsite = project.in(file("site"))
       "-Ywarn-unused-import",
       "-Ywarn-numeric-widen",
       "-Ywarn-dead-code",
-      "-Xlint:-missing-interpolator,_",
+      "-Xlint:-missing-interpolator,_"
     )
   )
   .dependsOn(`fs2-rabbit`, `fs2-rabbit-circe`, `examples`)
 
 // CI build
 addCommandAlias("buildFs2Rabbit", ";clean;+test;tut")
-
diff --git a/json-circe/src/main/scala/dev/profunktor/fs2rabbit/json/Fs2JsonEncoder.scala b/json-circe/src/main/scala/dev/profunktor/fs2rabbit/json/Fs2JsonEncoder.scala
@@ -46,5 +46,5 @@ class Fs2JsonEncoder(printer: Printer = Printer.noSpaces) {
     * The result will be an `AmqpMessage` of type `String`
     * */
   def jsonEncode[A: Encoder]: AmqpMessage[A] => AmqpMessage[String] =
-    amqpMsg => AmqpMessage[String](amqpMsg.payload.asJson.pretty(printer), amqpMsg.properties)
+    amqpMsg => AmqpMessage[String](amqpMsg.payload.asJson.printWith(printer), amqpMsg.properties)
 }
diff --git a/json-circe/src/test/scala/dev/profunktor/fs2rabbit/json/Fs2JsonEncoderSpec.scala b/json-circe/src/test/scala/dev/profunktor/fs2rabbit/json/Fs2JsonEncoderSpec.scala
@@ -51,7 +51,7 @@ class Fs2JsonEncoderSpec extends FlatSpecLike with Matchers {
     val customEncode = new Fs2JsonEncoder(Printer.spaces4).jsonEncode[Address]
 
     customEncode(AmqpMessage(payload, AmqpProperties.empty)) should be(
-      AmqpMessage(payload.asJson.pretty(Printer.spaces4), AmqpProperties.empty))
+      AmqpMessage(payload.asJson.printWith(Printer.spaces4), AmqpProperties.empty))
   }
 
 }
diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -2,12 +2,15 @@ import sbt._
 
 object Dependencies {
 
-  sealed trait Version {
+  object Version {
     val catsEffect = "2.0.0"
     val fs2        = "2.0.0"
-    val circe      = "0.11.1"
+    val circe      = "0.12.1"
     val amqpClient = "5.7.3"
     val logback    = "1.2.3"
+    val monix      = "3.0.0"
+    val zio        = "1.0.0-RC12-1"
+    val zioCats    = "2.0.0.0-RC3"
 
     val kindProjector    = "0.10.3"
     val betterMonadicFor = "0.3.1"
@@ -16,70 +19,31 @@ object Dependencies {
     val scalaCheck = "1.14.0"
   }
 
-  object Scala211Versions extends Version {
-    val monix      = "3.0.0"
-    val zio        = "1.0.0-RC8-4"
-  }
-
-  object Scala212Versions extends Version {
-    val monix      = "3.0.0"
-    val zio        = "1.0.0-RC8-4"
-  }
-
-  object Scala213Versions extends Version {
-    override val catsEffect = "2.0.0-M4"
-    override val fs2        = "1.1.0-M1"
-    override val circe      = "0.12.0-M3"
-  }
+  object Libraries {
+    def circe(artifact: String): ModuleID = "io.circe" %% artifact % Version.circe
 
-  sealed abstract class VersionSpecificDeps[V <: Version](val version: V) {
-    def circe(artifact: String): ModuleID = "io.circe" %% artifact % version.circe
-
-    lazy val amqpClient = "com.rabbitmq"  % "amqp-client"  % version.amqpClient
-    lazy val catsEffect = "org.typelevel" %% "cats-effect" % version.catsEffect
-    lazy val fs2Core    = "co.fs2"        %% "fs2-core"    % version.fs2
+    lazy val amqpClient = "com.rabbitmq"  % "amqp-client"  % Version.amqpClient
+    lazy val catsEffect = "org.typelevel" %% "cats-effect" % Version.catsEffect
+    lazy val fs2Core    = "co.fs2"        %% "fs2-core"    % Version.fs2
 
     // Compiler
-    lazy val kindProjector    = "org.typelevel" % "kind-projector"      % version.kindProjector cross CrossVersion.binary
-    lazy val betterMonadicFor = "com.olegpy"    %% "better-monadic-for" % version.betterMonadicFor
+    lazy val kindProjector    = "org.typelevel" % "kind-projector"      % Version.kindProjector cross CrossVersion.binary
+    lazy val betterMonadicFor = "com.olegpy"    %% "better-monadic-for" % Version.betterMonadicFor
 
     // Examples
-    lazy val logback = "ch.qos.logback" % "logback-classic" % version.logback
+    lazy val logback = "ch.qos.logback" % "logback-classic" % Version.logback
+    lazy val monix   = "io.monix" %% "monix" % Version.monix
+    lazy val zioCore = "dev.zio" %% "zio" % Version.zio
+    lazy val zioCats = "dev.zio" %% "zio-interop-cats" % Version.zioCats
 
     // Json libraries
     lazy val circeCore    = circe("circe-core")
     lazy val circeGeneric = circe("circe-generic")
     lazy val circeParser  = circe("circe-parser")
 
     // Scala test libraries
-    lazy val scalaTest  = "org.scalatest"  %% "scalatest"  % version.scalaTest
-    lazy val scalaCheck = "org.scalacheck" %% "scalacheck" % version.scalaCheck
-
-    lazy val scalacOptions: Seq[String] = Seq.empty
+    lazy val scalaTest  = "org.scalatest"  %% "scalatest"  % Version.scalaTest
+    lazy val scalaCheck = "org.scalacheck" %% "scalacheck" % Version.scalaCheck
   }
 
-  case object Scala211Dependencies extends VersionSpecificDeps(Scala211Versions) {
-    def zio(artifact: String): ModuleID = "dev.zio" %% artifact % version.zio
-
-    // Example Libraries
-    lazy val monix = "io.monix" %% "monix" % version.monix
-    lazy val zioCore = zio("zio")
-    lazy val zioCats = zio("zio-interop-cats")
-
-    override lazy val scalacOptions: Seq[String] = Seq("-Xmax-classfile-name", "100")
-  }
-
-  case object Scala212Dependencies extends VersionSpecificDeps(Scala212Versions) {
-    def zio(artifact: String): ModuleID = "dev.zio" %% artifact % version.zio
-
-    // Example Libraries
-    lazy val monix = "io.monix" %% "monix" % version.monix
-    lazy val zioCore = zio("zio")
-    lazy val zioCats = zio("zio-interop-cats")
-
-    override lazy val scalacOptions: Seq[String] = Seq("-Xmax-classfile-name", "100")
-  }
-
-  case object Scala213Dependencies extends VersionSpecificDeps(Scala213Versions)
-
 }
diff --git a/version.sbt b/version.sbt
@@ -1,2 +1,2 @@
-version in ThisBuild := "2.0.0-RC3"
+version in ThisBuild := "2.0.0"
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		version in ThisBuild := "2.0.0-RC3"
		version in ThisBuild := "2.0.0"