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.

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

Update Deps #64

Merged
merged 10 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 18 additions & 13 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,15 @@
ThisBuild / organization := "com.augustnagro"
ThisBuild / version := "1.3.1-SNAPSHOT"
ThisBuild / versionScheme := Some("early-semver")
ThisBuild / scalaVersion := "3.3.0"
ThisBuild / scalaVersion := "3.3.4"
ThisBuild / scalacOptions ++= Seq("-deprecation")
ThisBuild / homepage := Some(url("https://github.com/AugustNagro/magnum"))
ThisBuild / licenses += ("Apache-2.0", url(
"https://opensource.org/licenses/Apache-2.0"
))
ThisBuild / licenses += (
"Apache-2.0",
url(
"https://opensource.org/licenses/Apache-2.0"
)
)
ThisBuild / scmInfo := Some(
ScmInfo(
url("https://github.com/AugustNagro/magnum"),
Expand All @@ -33,7 +36,9 @@ ThisBuild / publishTo := {
}
ThisBuild / publish / skip := true

val testcontainersVersion = "0.40.12"
Global / onChangedBuildSource := ReloadOnSourceChanges

val testcontainersVersion = "0.41.4"

lazy val root = project
.in(file("."))
Expand All @@ -45,18 +50,18 @@ lazy val magnum = project
Test / fork := true,
publish / skip := false,
libraryDependencies ++= Seq(
"org.scalameta" %% "munit" % "0.7.29" % Test,
"org.scalameta" %% "munit" % "1.0.2" % Test,
"com.dimafeng" %% "testcontainers-scala-munit" % testcontainersVersion % Test,
"com.dimafeng" %% "testcontainers-scala-postgresql" % testcontainersVersion % Test,
"org.postgresql" % "postgresql" % "42.6.0" % Test,
"org.postgresql" % "postgresql" % "42.7.4" % Test,
"com.dimafeng" %% "testcontainers-scala-mysql" % testcontainersVersion % Test,
"mysql" % "mysql-connector-java" % "8.0.32" % Test,
"com.h2database" % "h2" % "2.1.214" % Test,
"com.mysql" % "mysql-connector-j" % "9.0.0" % Test,
"com.h2database" % "h2" % "2.3.232" % Test,
"com.dimafeng" %% "testcontainers-scala-oracle-xe" % testcontainersVersion % Test,
"com.oracle.database.jdbc" % "ojdbc11" % "21.9.0.0" % Test,
"com.dimafeng" %% "testcontainers-scala-clickhouse" % testcontainersVersion % Test,
"com.clickhouse" % "clickhouse-jdbc" % "0.4.1" % Test classifier "http",
"org.xerial" % "sqlite-jdbc" % "3.41.0.0" % Test
"com.clickhouse" % "clickhouse-jdbc" % "0.6.0" % Test classifier "http",
"org.xerial" % "sqlite-jdbc" % "3.46.1.3" % Test
)
)

Expand All @@ -67,8 +72,8 @@ lazy val magnumPg = project
Test / fork := true,
publish / skip := false,
libraryDependencies ++= Seq(
"org.postgresql" % "postgresql" % "42.6.0" % "provided",
"org.scalameta" %% "munit" % "0.7.29" % Test,
"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
)
Expand Down
6 changes: 3 additions & 3 deletions magnum-pg/src/test/scala/PgCodecTests.scala
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import com.dimafeng.testcontainers.PostgreSQLContainer
import com.dimafeng.testcontainers.munit.fixtures.TestContainersFixtures
import munit.FunSuite
import munit.{AnyFixture, FunSuite}
import org.testcontainers.utility.DockerImageName
import org.postgresql.ds.PGSimpleDataSource
import org.postgresql.geometric.*
Expand Down Expand Up @@ -153,11 +153,11 @@ class PgCodecTests extends FunSuite, TestContainersFixtures:

val pgContainer = ForAllContainerFixture(
PostgreSQLContainer
.Def(dockerImageName = DockerImageName.parse("postgres:15.2"))
.Def(dockerImageName = DockerImageName.parse("postgres:17.0"))
.createContainer()
)

override def munitFixtures: Seq[Fixture[_]] =
override def munitFixtures: Seq[AnyFixture[_]] =
super.munitFixtures :+ pgContainer

def ds(): DataSource =
Expand Down
6 changes: 3 additions & 3 deletions magnum/src/test/scala/ClickHouseTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.dimafeng.testcontainers.{
ContainerDef,
JdbcDatabaseContainer
}
import munit.{FunSuite, Location, TestOptions}
import munit.{AnyFixture, FunSuite, Location, TestOptions}
import com.clickhouse.jdbc.ClickHouseDataSource
import org.testcontainers.utility.DockerImageName

Expand Down Expand Up @@ -393,7 +393,7 @@ class ClickHouseTests extends FunSuite, TestContainersFixtures:
val clickHouseContainer = ForAllContainerFixture(
ClickHouseContainer
.Def(dockerImageName =
DockerImageName.parse("clickhouse/clickhouse-server:23.2.2.20")
DockerImageName.parse("clickhouse/clickhouse-server:24.3.12.75")
)
.createContainer()
)
Expand All @@ -411,7 +411,7 @@ class ClickHouseTests extends FunSuite, TestContainersFixtures:
val johnCnt = findPersonCnt(sql"$isAdminFrag AND first_name = 'John'", 2)
assertEquals(johnCnt, 2)

override def munitFixtures: Seq[Fixture[_]] =
override def munitFixtures: Seq[AnyFixture[_]] =
super.munitFixtures :+ clickHouseContainer

def ds(): DataSource =
Expand Down
4 changes: 2 additions & 2 deletions magnum/src/test/scala/MySqlTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import com.dimafeng.testcontainers.{
MySQLContainer
}
import com.mysql.cj.jdbc.MysqlDataSource
import munit.{FunSuite, Location, TestOptions}
import munit.{AnyFixture, FunSuite, Location, TestOptions}
import org.testcontainers.utility.DockerImageName

import java.nio.file.{Files, Path}
Expand Down Expand Up @@ -419,7 +419,7 @@ class MySqlTests extends FunSuite, TestContainersFixtures:
.createContainer()
)

override def munitFixtures: Seq[Fixture[_]] =
override def munitFixtures: Seq[AnyFixture[_]] =
super.munitFixtures :+ mySqlContainer

def ds(): DataSource =
Expand Down
4 changes: 2 additions & 2 deletions magnum/src/test/scala/OracleTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import com.augustnagro.magnum.*
import com.augustnagro.magnum.UUIDCodec.VarCharUUIDCodec
import com.dimafeng.testcontainers.OracleContainer
import com.dimafeng.testcontainers.munit.fixtures.TestContainersFixtures
import munit.FunSuite
import munit.{AnyFixture, FunSuite}
import org.testcontainers.utility.DockerImageName
import oracle.jdbc.datasource.impl.OracleDataSource

Expand Down Expand Up @@ -411,7 +411,7 @@ class OracleTests extends FunSuite, TestContainersFixtures:
.createContainer()
)

override def munitFixtures: Seq[Fixture[_]] =
override def munitFixtures: Seq[AnyFixture[_]] =
super.munitFixtures :+ oracleContainer

def ds(): DataSource =
Expand Down
6 changes: 3 additions & 3 deletions magnum/src/test/scala/PgTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import com.dimafeng.testcontainers.{
JdbcDatabaseContainer,
PostgreSQLContainer
}
import munit.{FunSuite, Location, TestOptions}
import munit.{AnyFixture, FunSuite, Location, TestOptions}
import org.postgresql.ds.PGSimpleDataSource
import org.testcontainers.utility.DockerImageName

Expand Down Expand Up @@ -489,7 +489,7 @@ class PgTests extends FunSuite, TestContainersFixtures:

val pgContainer = ForAllContainerFixture(
PostgreSQLContainer
.Def(dockerImageName = DockerImageName.parse("postgres:15.2"))
.Def(dockerImageName = DockerImageName.parse("postgres:17.0"))
.createContainer()
)

Expand All @@ -508,7 +508,7 @@ class PgTests extends FunSuite, TestContainersFixtures:
noIdRepo.insert(entity)
assert(noIdRepo.findAll.exists(_.userName == "Dan"))

override def munitFixtures: Seq[Fixture[_]] =
override def munitFixtures: Seq[AnyFixture[_]] =
super.munitFixtures :+ pgContainer

def ds(): DataSource =
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.3