Skip to content

Commit

Permalink
Merge branch 'master' into readme-updates
Browse files Browse the repository at this point in the history
  • Loading branch information
AugustNagro committed Dec 1, 2024
2 parents c0a86bf + a2334fd commit 3f8a6a8
Show file tree
Hide file tree
Showing 82 changed files with 2,423 additions and 3,270 deletions.
4 changes: 2 additions & 2 deletions .scalafmt.conf
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
version = 3.8.3
version = 3.8.4-RC3
runner.dialect = scala3
rewrite.scala3.insertEndMarkerMinLines = 20
rewrite.scala3.removeEndMarkerMaxLines = 19

binPack.parentConstructors = Oneline
10 changes: 7 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
ThisBuild / organization := "com.augustnagro"
ThisBuild / version := "1.3.1-SNAPSHOT"
ThisBuild / version := "2.0.0-SNAPSHOT"
ThisBuild / versionScheme := Some("early-semver")
ThisBuild / scalaVersion := "3.3.4"
ThisBuild / scalacOptions ++= Seq("-deprecation")
Expand Down Expand Up @@ -36,9 +36,10 @@ ThisBuild / publishTo := {
}
ThisBuild / publish / skip := true

Global / onChangedBuildSource := ReloadOnSourceChanges
addCommandAlias("fmt", "scalafmtAll")

val testcontainersVersion = "0.41.4"
val circeVersion = "0.14.10"

lazy val root = project
.in(file("."))
Expand Down Expand Up @@ -75,6 +76,9 @@ lazy val magnumPg = project
"org.postgresql" % "postgresql" % "42.7.4" % "provided",
"org.scalameta" %% "munit" % "1.0.2" % Test,
"com.dimafeng" %% "testcontainers-scala-munit" % testcontainersVersion % Test,
"com.dimafeng" %% "testcontainers-scala-postgresql" % testcontainersVersion % Test
"com.dimafeng" %% "testcontainers-scala-postgresql" % testcontainersVersion % Test,
"io.circe" %% "circe-core" % circeVersion % Test,
"io.circe" %% "circe-parser" % circeVersion % Test,
"org.scala-lang.modules" %% "scala-xml" % "2.3.0" % Test
)
)
Loading

0 comments on commit 3f8a6a8

Please sign in to comment.