From 59a0eac4909436a23bbd7d45720010e7025061cb Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 1 Sep 2024 19:22:55 +0900 Subject: [PATCH] use new `&` syntax instead of `with` --- .../com/github/tototoshi/slick/JodaSupportSpec.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/scala/com/github/tototoshi/slick/JodaSupportSpec.scala b/src/test/scala/com/github/tototoshi/slick/JodaSupportSpec.scala index 47a5fd0..1e1226d 100644 --- a/src/test/scala/com/github/tototoshi/slick/JodaSupportSpec.scala +++ b/src/test/scala/com/github/tototoshi/slick/JodaSupportSpec.scala @@ -273,7 +273,7 @@ class H2JodaSupportSpec extends JodaSupportSpec { } abstract class TestContainerSpec extends JodaSupportSpec with ForAllTestContainer { - override def container: JdbcDatabaseContainer with Container + override def container: JdbcDatabaseContainer & Container override def jdbcUrl = container.jdbcUrl override def jdbcUser = container.username override def jdbcPassword = container.password @@ -284,7 +284,7 @@ object MySQLJodaSupportSpec { } class MySQLJodaSupportSpec extends TestContainerSpec { - override val container: JdbcDatabaseContainer with Container = MySQLContainer( + override val container: JdbcDatabaseContainer & Container = MySQLContainer( configurationOverride = "test-mysql-conf", mysqlImageVersion = DockerImageName.parse(MySQLJodaSupportSpec.mySQLDockerImageName) ) @@ -295,7 +295,7 @@ class MySQLJodaSupportSpec extends TestContainerSpec { } class MySQLJodaSupportWithoutCalenderSpec extends TestContainerSpec { - override val container: JdbcDatabaseContainer with Container = MySQLContainer(mysqlImageVersion = DockerImageName.parse(MySQLJodaSupportSpec.mySQLDockerImageName)) + override val container: JdbcDatabaseContainer & Container = MySQLContainer(mysqlImageVersion = DockerImageName.parse(MySQLJodaSupportSpec.mySQLDockerImageName)) override def jdbcDriver = "com.mysql.jdbc.Driver" override val driver: JdbcProfile = MySQLProfile override val jodaSupport: GenericJodaSupport = new GenericJodaSupport(MySQLProfile, _ => None) @@ -303,7 +303,7 @@ class MySQLJodaSupportWithoutCalenderSpec extends TestContainerSpec { } class PostgresJodaSupportSpec extends TestContainerSpec { - override val container: JdbcDatabaseContainer with Container = PostgreSQLContainer() + override val container: JdbcDatabaseContainer & Container = PostgreSQLContainer() override def jdbcDriver = "org.postgresql.Driver" override val driver: JdbcProfile = PostgresProfile override val jodaSupport: GenericJodaSupport = PostgresJodaSupport