From 5612944bf9ae2f39b5a75c6d2e7233f3b28054eb Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Thu, 20 Apr 2023 01:25:33 +0000 Subject: [PATCH 01/16] Update mysql-connector-java to 8.0.33 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 181702c5b..4dba290f6 100644 --- a/build.sbt +++ b/build.sbt @@ -197,7 +197,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 ) From 388a9489b22f61607449a8f547111e7218a27c65 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 29 Jul 2023 05:19:27 +0000 Subject: [PATCH 02/16] Update logback-classic to 1.4.8 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6e00c1b91..fd4e19978 100644 --- a/build.sbt +++ b/build.sbt @@ -27,7 +27,7 @@ val zioVersion = "2.0.15" val zioSchemaVersion = "0.4.13" val testcontainersVersion = "1.18.3" val testcontainersScalaVersion = "0.40.17" -val logbackVersion = "1.3.8" +val logbackVersion = "1.4.8" lazy val root = project .in(file(".")) From 0a15c7e1eb8ee5183971324d8958ca6c9b001ad5 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 29 Jul 2023 05:19:52 +0000 Subject: [PATCH 03/16] Update ojdbc8 to 23.2.0.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6e00c1b91..42b1b1a55 100644 --- a/build.sbt +++ b/build.sbt @@ -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 ) From 7b56b61467396d35a8ee980e5bf1583df45b4e18 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 29 Jul 2023 05:20:18 +0000 Subject: [PATCH 04/16] Update sbt-tpolecat to 0.5.0 --- project/plugins.sbt | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4bdf3ebcf..bb617a4c6 100644 --- 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.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("org.typelevel" % "sbt-tpolecat" % "0.5.0") +addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.10") From aacf2672da8d07e331ebd5224ba9d4e40cc4be15 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 11 Sep 2023 04:39:43 +0000 Subject: [PATCH 05/16] Update sbt-scalafix to 0.11.1 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4bdf3ebcf..6d1825a3e 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -7,6 +7,6 @@ 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("ch.epfl.scala" % "sbt-scalafix" % "0.11.1") addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.4.4") addSbtPlugin("dev.zio" % "zio-sbt-website" % "0.3.10") From 0bbd48f973a00f86078447dda95cc698aab77efe Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Mon, 11 Sep 2023 04:40:44 +0000 Subject: [PATCH 06/16] Update sbt-scalafmt to 2.5.2 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4bdf3ebcf..1c96310d7 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,6 +1,6 @@ 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("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") From 7ece83acacf278525f42ecdb3cf54f9cb0cd812c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 7 Nov 2023 03:20:16 +0000 Subject: [PATCH 07/16] Update HikariCP to 5.1.0 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6e00c1b91..cc43d0908 100644 --- a/build.sbt +++ b/build.sbt @@ -175,7 +175,7 @@ lazy val jdbc_hikaricp = project .settings(buildInfoSettings("zio.sql.jdbc-hickaricp")) .settings( libraryDependencies ++= Seq( - "com.zaxxer" % "HikariCP" % "4.0.3", // 5.x doesn't support Java 1.8 + "com.zaxxer" % "HikariCP" % "5.1.0", // 5.x doesn't support Java 1.8 "dev.zio" %% "zio-test" % zioVersion % Test, "dev.zio" %% "zio-test-sbt" % zioVersion % Test, "org.testcontainers" % "mysql" % testcontainersVersion % Test, From e3402a48ae4b2fbf395dc7fdd1c38fa2a04f8e5b Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 18 Nov 2023 08:39:24 +0000 Subject: [PATCH 08/16] Update scalafmt-core to 3.7.17 --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index 342a5dd24..d49630712 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = "3.7.11" +version = "3.7.17" maxColumn = 120 align.preset = most continuationIndent.defnSite = 2 From ac289967e98e240afd9f1a51f35571b3d0215a0c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 13 Jan 2024 21:13:33 +0000 Subject: [PATCH 09/16] Update zio, zio-streams, zio-test, ... to 2.0.21 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6e00c1b91..23ebbf54e 100644 --- a/build.sbt +++ b/build.sbt @@ -23,7 +23,7 @@ addCommandAlias("fmtOnce", "all scalafmtSbt scalafmt test:scalafmt") addCommandAlias("fmt", "fmtOnce;fmtOnce") addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck") -val zioVersion = "2.0.15" +val zioVersion = "2.0.21" val zioSchemaVersion = "0.4.13" val testcontainersVersion = "1.18.3" val testcontainersScalaVersion = "0.40.17" From 55dd02e6688a40880290fc59ce2bda288df8514c Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 13 Jan 2024 21:13:51 +0000 Subject: [PATCH 10/16] Update zio-schema, zio-schema-derivation to 0.4.17 --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 6e00c1b91..4de539810 100644 --- a/build.sbt +++ b/build.sbt @@ -24,7 +24,7 @@ addCommandAlias("fmt", "fmtOnce;fmtOnce") addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck") val zioVersion = "2.0.15" -val zioSchemaVersion = "0.4.13" +val zioSchemaVersion = "0.4.17" val testcontainersVersion = "1.18.3" val testcontainersScalaVersion = "0.40.17" val logbackVersion = "1.3.8" From af8a93a85d0e52ccbb0ee5af5b80db24e9542b23 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 13 Jan 2024 21:14:26 +0000 Subject: [PATCH 11/16] Update sbt-jmh to 0.4.7 --- project/plugins.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/plugins.sbt b/project/plugins.sbt index 4bdf3ebcf..0001784b2 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ 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("pl.project13.scala" % "sbt-jmh" % "0.4.7") 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") From e14470f147171af43c5c8fd35788cc43284971d9 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Tue, 20 Feb 2024 19:47:23 +0000 Subject: [PATCH 12/16] Update postgresql to 42.7.2 --- build.sbt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index 6e00c1b91..9ae056736 100644 --- a/build.sbt +++ b/build.sbt @@ -155,7 +155,7 @@ lazy val jdbc = project libraryDependencies ++= Seq( "dev.zio" %% "zio-test" % zioVersion % Test, "dev.zio" %% "zio-test-sbt" % zioVersion % Test, - "org.postgresql" % "postgresql" % "42.6.0" % Test, + "org.postgresql" % "postgresql" % "42.7.2" % Test, "com.dimafeng" %% "testcontainers-scala-postgresql" % testcontainersScalaVersion % Test ) ) @@ -236,7 +236,7 @@ lazy val postgres = project "org.testcontainers" % "database-commons" % testcontainersVersion % Test, "org.testcontainers" % "postgresql" % testcontainersVersion % Test, "org.testcontainers" % "jdbc" % testcontainersVersion % Test, - "org.postgresql" % "postgresql" % "42.6.0" % Compile, + "org.postgresql" % "postgresql" % "42.7.2" % Compile, "com.dimafeng" %% "testcontainers-scala-postgresql" % testcontainersScalaVersion % Test, "ch.qos.logback" % "logback-classic" % logbackVersion % Test ) From b676dcacd99aac704b5449980a136f78cbbca5a4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 24 Feb 2024 06:34:25 +0000 Subject: [PATCH 13/16] Update sbt to 1.9.9 --- mysql/project/build.properties | 2 +- project/build.properties | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mysql/project/build.properties b/mysql/project/build.properties index 52413ab79..04267b14a 100644 --- a/mysql/project/build.properties +++ b/mysql/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 +sbt.version=1.9.9 diff --git a/project/build.properties b/project/build.properties index 52413ab79..04267b14a 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.9.3 +sbt.version=1.9.9 From b8f8f21e5f8c5d09f9bdebdf72a528e9b23d5d9a Mon Sep 17 00:00:00 2001 From: jczuchnowski Date: Fri, 29 Mar 2024 16:51:08 +0100 Subject: [PATCH 14/16] Hardcode MySQL version --- build.sbt | 2 +- jdbc-hikaricp/src/test/scala/zio/sql/MySqlTestContainer.scala | 2 +- mysql/src/test/scala/zio/sql/mysql/MysqlRunnableSpec.scala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 42b1b1a55..0a363eb06 100644 --- 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 diff --git a/jdbc-hikaricp/src/test/scala/zio/sql/MySqlTestContainer.scala b/jdbc-hikaricp/src/test/scala/zio/sql/MySqlTestContainer.scala index ebba6fa31..bced36f76 100644 --- 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 index 1a97a1a2e..0ff8914c9 100644 --- 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") () From 23a1716da09585f18e1da4f0806e57f7a4daa109 Mon Sep 17 00:00:00 2001 From: jczuchnowski Date: Sat, 30 Mar 2024 21:04:34 +0100 Subject: [PATCH 15/16] Drop support for Java 8 and add Java 17 --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ac38c1366..7fd524fff 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - java: ['adopt@1.8', 'adopt@1.11'] + java: ['adopt@1.11', 'adopt@1.17'] scala: ['2.12.18', '2.13.10'] steps: - name: Checkout current branch From 0f01c59e91593872ce18efb62b6cd9cd58395130 Mon Sep 17 00:00:00 2001 From: jczuchnowski Date: Sat, 30 Mar 2024 21:13:05 +0100 Subject: [PATCH 16/16] Update setup-scala action --- .github/workflows/ci.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 7fd524fff..146dd6fe5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -23,7 +23,7 @@ jobs: with: fetch-depth: 0 - name: Setup Scala and Java - uses: olafurpg/setup-scala@v10 + uses: olafurpg/setup-scala@v14 - name: Cache scala dependencies uses: coursier/cache-action@v5 - name: Lint code @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - java: ['adopt@1.11', 'adopt@1.17'] + java: ['openjdk@1.11.0', 'openjdk@1.17.0'] scala: ['2.12.18', '2.13.10'] steps: - name: Checkout current branch @@ -42,7 +42,7 @@ jobs: with: fetch-depth: 0 - name: Setup Scala and Java - uses: olafurpg/setup-scala@v10 + uses: olafurpg/setup-scala@v14 with: java-version: ${{ matrix.java }} - name: Cache scala dependencies @@ -57,7 +57,7 @@ jobs: - name: Checkout current branch uses: actions/checkout@v3.1.0 - name: Setup Scala and Java - uses: olafurpg/setup-scala@v13 + uses: olafurpg/setup-scala@v14 - name: Cache scala dependencies uses: coursier/cache-action@v6 - name: Check Document Generation @@ -73,7 +73,7 @@ jobs: with: fetch-depth: 0 - name: Setup Scala and Java - uses: olafurpg/setup-scala@v10 + uses: olafurpg/setup-scala@v14 - name: Cache scala dependencies uses: coursier/cache-action@v5 - name: Release artifacts