Merge branch 'master' into update/HikariCP-5.1.0

zio-archive · Mar 30, 2024 · f063b2a · f063b2a
2 parents 7ece83a + 5bf3811
commit f063b2a
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 17 deletions.
diff --git a/build.sbt b/build.sbt
@@ -26,7 +26,7 @@ addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck"
 val zioVersion                 = "2.0.15"
 val zioSchemaVersion           = "0.4.13"
 val testcontainersVersion      = "1.18.3"
-val testcontainersScalaVersion = "0.40.17"
+val testcontainersScalaVersion = "0.41.3"
 val logbackVersion             = "1.3.8"
 
 lazy val root = project
@@ -198,7 +198,7 @@ lazy val mysql = project
       "org.testcontainers" % "database-commons"           % testcontainersVersion      % Test,
       "org.testcontainers" % "jdbc"                       % testcontainersVersion      % Test,
       "org.testcontainers" % "mysql"                      % testcontainersVersion      % Test,
-      "mysql"              % "mysql-connector-java"       % "8.0.32"                   % Test,
+      "mysql"              % "mysql-connector-java"       % "8.0.33"                   % Test,
       "com.dimafeng"      %% "testcontainers-scala-mysql" % testcontainersScalaVersion % Test,
       "ch.qos.logback"     % "logback-classic"            % logbackVersion             % Test
     )
@@ -217,7 +217,7 @@ lazy val oracle = project
       "org.testcontainers"       % "database-commons"               % testcontainersVersion      % Test,
       "org.testcontainers"       % "oracle-xe"                      % testcontainersVersion      % Test,
       "org.testcontainers"       % "jdbc"                           % testcontainersVersion      % Test,
-      "com.oracle.database.jdbc" % "ojdbc8"                         % "21.10.0.0"                % Test,
+      "com.oracle.database.jdbc" % "ojdbc8"                         % "23.2.0.0"                 % Test,
       "com.dimafeng"            %% "testcontainers-scala-oracle-xe" % testcontainersScalaVersion % Test,
       "ch.qos.logback"           % "logback-classic"                % logbackVersion             % Test
     )

diff --git a/jdbc-hikaricp/src/test/scala/zio/sql/MySqlTestContainer.scala b/jdbc-hikaricp/src/test/scala/zio/sql/MySqlTestContainer.scala
@@ -7,7 +7,7 @@ import zio._
 final case class MySqlConfig(username: String, password: String, url: String)
 object MySqlTestContainer {
 
-  def mysql(imageName: String = "mysql"): ZIO[Scope, Throwable, MySQLContainer] =
+  def mysql(imageName: String = "mysql:8.2.0"): ZIO[Scope, Throwable, MySQLContainer] =
     ZIO.acquireRelease {
       ZIO.attemptBlocking {
         val c = new MySQLContainer(

diff --git a/mysql/src/test/scala/zio/sql/mysql/MysqlRunnableSpec.scala b/mysql/src/test/scala/zio/sql/mysql/MysqlRunnableSpec.scala
@@ -8,7 +8,7 @@ trait MysqlRunnableSpec extends JdbcRunnableSpec with MysqlJdbcModule {
 
   override protected def getContainer: SingleContainer[_] with JdbcDatabaseContainer =
     new MySQLContainer(
-      mysqlImageVersion = Option("mysql").map(DockerImageName.parse)
+      mysqlImageVersion = Option("mysql:8.2.0").map(DockerImageName.parse)
     ).configure { a =>
       a.withInitScript("shop_schema.sql")
       ()

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,12 +1,12 @@
-addSbtPlugin("org.scala-js"              % "sbt-scalajs"               % "1.13.2")
-addSbtPlugin("org.portable-scala"        % "sbt-scalajs-crossproject"  % "1.3.2")
-addSbtPlugin("org.scalameta"             % "sbt-scalafmt"              % "2.5.0")
-addSbtPlugin("pl.project13.scala"        % "sbt-jmh"                   % "0.4.5")
-addSbtPlugin("com.eed3si9n"              % "sbt-buildinfo"             % "0.11.0")
-addSbtPlugin("org.scoverage"             % "sbt-scoverage"             % "2.0.8")
-addSbtPlugin("ch.epfl.scala"             % "sbt-bloop"                 % "1.5.9")
-addSbtPlugin("com.github.sbt"            % "sbt-ci-release"            % "1.5.12")
-addSbtPlugin("com.github.cb372"          % "sbt-explicit-dependencies" % "0.3.1")
-addSbtPlugin("ch.epfl.scala"             % "sbt-scalafix"              % "0.11.0")
-addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat"              % "0.4.4")
-addSbtPlugin("dev.zio"                   % "zio-sbt-website"           % "0.3.10")
+addSbtPlugin("org.scala-js"       % "sbt-scalajs"               % "1.13.2")
+addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject"  % "1.3.2")
+addSbtPlugin("org.scalameta"      % "sbt-scalafmt"              % "2.5.2")
+addSbtPlugin("pl.project13.scala" % "sbt-jmh"                   % "0.4.5")
+addSbtPlugin("com.eed3si9n"       % "sbt-buildinfo"             % "0.11.0")
+addSbtPlugin("org.scoverage"      % "sbt-scoverage"             % "2.0.8")
+addSbtPlugin("ch.epfl.scala"      % "sbt-bloop"                 % "1.5.9")
+addSbtPlugin("com.github.sbt"     % "sbt-ci-release"            % "1.5.12")
+addSbtPlugin("com.github.cb372"   % "sbt-explicit-dependencies" % "0.3.1")
+addSbtPlugin("ch.epfl.scala"      % "sbt-scalafix"              % "0.11.1")
+addSbtPlugin("org.typelevel"      % "sbt-tpolecat"              % "0.5.0")
+addSbtPlugin("dev.zio"            % "zio-sbt-website"           % "0.3.10")