Skip to content

Commit

Permalink
Merge branch 'master' into update/sbt-jmh-0.4.7
Browse files Browse the repository at this point in the history
  • Loading branch information
@jczuchnowski
jczuchnowski committed Mar 30, 2024
2 parents af8a93a + 6975433 commit 257e7d3
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 27 deletions.
10 changes: 5 additions & 5 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -34,15 +34,15 @@ jobs:
strategy:
fail-fast: false
matrix:
java: ['adopt@1.8', 'adopt@1.11']
java: ['openjdk@1.11.0', 'openjdk@1.17.0']
scala: ['2.12.18', '2.13.10']
steps:
- name: Checkout current branch
uses: actions/checkout@v2.3.4
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
Expand All @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .scalafmt.conf
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version = "3.7.11"
version = "3.7.17"
maxColumn = 120
align.preset = most
continuationIndent.defnSite = 2
Expand Down
14 changes: 7 additions & 7 deletions build.sbt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ addCommandAlias("fmtOnce", "all scalafmtSbt scalafmt test:scalafmt")
addCommandAlias("fmt", "fmtOnce;fmtOnce")
addCommandAlias("check", "all scalafmtSbtCheck scalafmtCheck test:scalafmtCheck")

val zioVersion = "2.0.15"
val zioSchemaVersion = "0.4.13"
val zioVersion = "2.0.21"
val zioSchemaVersion = "0.4.17"
val testcontainersVersion = "1.18.3"
val testcontainersScalaVersion = "0.40.17"
val logbackVersion = "1.3.8"
val testcontainersScalaVersion = "0.41.3"
val logbackVersion = "1.4.8"

lazy val root = project
.in(file("."))
Expand Down Expand Up @@ -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,
Expand All @@ -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
)
Expand All @@ -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
)
Expand Down
2 changes: 1 addition & 1 deletion jdbc-hikaricp/src/test/scala/zio/sql/MySqlTestContainer.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion mysql/src/test/scala/zio/sql/mysql/MysqlRunnableSpec.scala
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")
()
Expand Down
24 changes: 12 additions & 12 deletions project/plugins.sbt
View file
Original file line number Diff line number Diff line change
@@ -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.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")
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.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")
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")

0 comments on commit 257e7d3

Please sign in to comment.