Skip to content

Commit

Permalink
Merge branch 'master' into validated
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristopherDavenport authored Jan 7, 2021
2 parents c5b86af + ab3ce8d commit 67046d2
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
4 changes: 2 additions & 2 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ val catsEffectV = "2.1.2" //https://github.com/typelevel/cats-effect/releas
val specs2V = "4.9.4" //https://github.com/etorreborre/specs2/releases
val disciplineSpecs2V = "1.1.0"
val circeV = "0.13.0" //https://github.com/circe/circe/releases
val http4sV = "0.21.7" //https://github.com/http4s/http4s/releases
val http4sV = "0.21.15" //https://github.com/http4s/http4s/releases
val doobieV = "0.9.0" //https://github.com/tpolecat/doobie/releases
val scalaJavaTimeV = "2.0.0" // https://github.com/cquiroz/scala-java-time/releases
val testContainersSpecs2V = "0.2.0-M2" //
Expand All @@ -98,7 +98,7 @@ lazy val commonSettings = Seq(
scalaVersion := "2.13.1",
crossScalaVersions := Seq(scalaVersion.value, "2.12.10"),

addCompilerPlugin("org.typelevel" % "kind-projector" % "0.11.0" cross CrossVersion.full),
addCompilerPlugin("org.typelevel" % "kind-projector" % "0.11.2" cross CrossVersion.full),
addCompilerPlugin("com.olegpy" %% "better-monadic-for" % "0.3.1"),
libraryDependencies ++= Seq(
"org.scala-lang" % "scala-reflect" % scalaVersion.value,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,4 +146,13 @@ object FUUID {
def withUUID[A](fuuid: FUUID)(f: UUID => A): A = f(fuuid.uuid)
}

/**
* The Nil UUID.
*
* This is a constant UUID for which all bits are 0.
*
* @see [[https://tools.ietf.org/html/rfc4122#section-4.1.7]]
*/
val NilUUID: FUUID =
FUUID.fromUUID(new UUID(0L, 0L))
}
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.13")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.16")
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.7.0")
addSbtPlugin("org.tpolecat" % "tut-plugin" % "0.6.13")
addSbtPlugin("com.47deg" % "sbt-microsites" % "0.9.7")
addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.0.1")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.3")
addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.5")

0 comments on commit 67046d2

Please sign in to comment.