Skip to content

Commit

Permalink
Merge branch 'main' into update/scala3-library-3.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@fedefernandez
fedefernandez authored Jan 19, 2024
2 parents 4e5705d + 5168fef commit 3f64742
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 26 deletions.
6 changes: 6 additions & 0 deletions .git-blame-ignore-revs
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
# Scala Steward: Reformat with scalafmt 3.7.8
96bba9c8f4409c4e91d51ff415444d4e85e3156b

# Scala Steward: Reformat with scalafmt 3.7.15
db2f4d588111c5b4a18444980c4d1e2dc839ceaa

# Scala Steward: Reformat with scalafmt 3.7.16
e717c8bb5ba206d8568265496baebb402a56c242
4 changes: 2 additions & 2 deletions modules/memeid4s/src/main/scala/memeid4s/UUID.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ object UUID {
/** Creates a valid [[UUID]] from a [[UUID]].
*
* @param juuid
* the { @link java.util.UUID}
* the {@@@linkjava.util.UUID}
* @return
* a valid { @link UUID} created from a { @link java.util.UUID}
* a valid {@@@linkUUID} created from a {@@@linkjava.util.UUID}
*/
@inline def fromUUID(juuid: JUUID): UUID = memeid.UUID.fromUUID(juuid)

Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.4
sbt.version=1.9.8
32 changes: 16 additions & 16 deletions project/dependencies.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@ object dependencies extends AutoPlugin {

val scala2_12 = "2.12.18"

val scala2_13 = "2.13.11"
val scala2_13 = "2.13.12"

val scala3 = "3.3.1"

val commonSettings: Seq[Def.Setting[_]] = Seq(
libraryDependencies ++= Seq(
"org.specs2" %% "specs2-scalacheck" % "4.20.2" % Test
"org.specs2" %% "specs2-scalacheck" % "4.20.4" % Test
) ++ (CrossVersion.partialVersion(scalaVersion.value) match {
case Some((2, major)) if major <= 12 =>
Seq()
Expand All @@ -25,10 +25,10 @@ object dependencies extends AutoPlugin {
)

val cats: Seq[ModuleID] = Seq(
"org.typelevel" %% "cats-effect" % "3.5.1",
"org.typelevel" %% "cats-effect" % "3.5.3",
"org.typelevel" %% "cats-laws" % "2.10.0" % Test,
"org.typelevel" %% "discipline-specs2" % "1.4.0" % Test,
"org.specs2" %% "specs2-cats" % "4.20.2" % Test
"org.specs2" %% "specs2-cats" % "4.20.4" % Test
)

val literalSettings: Seq[Def.Setting[_]] = Seq(
Expand All @@ -45,9 +45,9 @@ object dependencies extends AutoPlugin {
)

val doobie: Seq[ModuleID] = Seq(
"org.tpolecat" %% "doobie-core" % "1.0.0-RC4",
"org.tpolecat" %% "doobie-h2" % "1.0.0-RC4",
"org.tpolecat" %% "doobie-munit" % "1.0.0-RC4" % Test
"org.tpolecat" %% "doobie-core" % "1.0.0-RC5",
"org.tpolecat" %% "doobie-h2" % "1.0.0-RC5",
"org.tpolecat" %% "doobie-munit" % "1.0.0-RC5" % Test
)

val circe: Seq[ModuleID] = Seq(
Expand All @@ -57,14 +57,14 @@ object dependencies extends AutoPlugin {
)

val http4s: Seq[ModuleID] = Seq(
"org.http4s" %% "http4s-core" % "0.23.23",
"org.http4s" %% "http4s-dsl" % "0.23.23" % Test
"org.http4s" %% "http4s-core" % "0.23.25",
"org.http4s" %% "http4s-dsl" % "0.23.25" % Test
)

val tapir: Seq[ModuleID] = Seq(
"com.softwaremill.sttp.tapir" %% "tapir-core" % "1.7.3",
"com.softwaremill.sttp.tapir" %% "tapir-openapi-docs" % "1.7.3" % Test,
"com.softwaremill.sttp.apispec" %% "openapi-circe-yaml" % "0.6.0" % Test
"com.softwaremill.sttp.tapir" %% "tapir-core" % "1.9.6",
"com.softwaremill.sttp.tapir" %% "tapir-openapi-docs" % "1.9.6" % Test,
"com.softwaremill.sttp.apispec" %% "openapi-circe-yaml" % "0.7.3" % Test
)

val fuuid: Seq[ModuleID] = Seq(
Expand All @@ -76,12 +76,12 @@ object dependencies extends AutoPlugin {
)

val documentation: Seq[ModuleID] = Seq(
"org.typelevel" %% "cats-effect" % "3.5.1",
"org.typelevel" %% "cats-effect" % "3.5.3",
"io.circe" %% "circe-core" % "0.14.6",
"org.tpolecat" %% "doobie-h2" % "1.0.0-RC4",
"org.http4s" %% "http4s-dsl" % "0.23.23",
"org.tpolecat" %% "doobie-h2" % "1.0.0-RC5",
"org.http4s" %% "http4s-dsl" % "0.23.25",
"org.scalacheck" %% "scalacheck" % "1.17.0",
"com.softwaremill.sttp.tapir" %% "tapir-core" % "1.7.3",
"com.softwaremill.sttp.tapir" %% "tapir-core" % "1.9.6",
"io.chrisdavenport" %% "fuuid" % "0.8.0-M2"
)

Expand Down
14 changes: 7 additions & 7 deletions project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
ThisBuild / libraryDependencySchemes ++= Seq(
"org.scala-lang.modules" %% "scala-xml" % VersionScheme.Always
)
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.1")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.0")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.3")
addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.9.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.11.1")
addSbtPlugin("com.47deg" % "sbt-microsites" % "1.4.4")
addSbtPlugin("com.alejandrohdezma" % "sbt-codecov" % "0.2.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.11")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.11")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.11.13")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.11.13")
addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.4.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-remove-test-from-pom" % "0.1.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafmt-defaults" % "0.9.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("com.thoughtworks.sbt-api-mappings" % "sbt-api-mappings" % "3.0.2")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.7")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.8")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.6")
addSbtPlugin("com.47deg" %% "sbt-hood-plugin" % "0.4.0")

0 comments on commit 3f64742

Please sign in to comment.