Skip to content
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
14 changes: 2 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ jobs:
strategy:
matrix:
os: [ubuntu-22.04]
scala: [2.12, 2.13, 3]
scala: [2.13, 3]
java: [temurin@8]
runs-on: ${{ matrix.os }}
timeout-minutes: 60
Expand Down Expand Up @@ -114,16 +114,6 @@ jobs:
if: matrix.java == 'temurin@8' && steps.setup-java-temurin-8.outputs.cache-hit == 'false'
run: sbt +update

- name: Download target directories (2.12)
uses: actions/download-artifact@v6
with:
name: target-${{ matrix.os }}-${{ matrix.java }}-2.12

- name: Inflate target directories (2.12)
run: |
tar xf targets.tar
rm targets.tar

- name: Download target directories (2.13)
uses: actions/download-artifact@v6
with:
Expand Down Expand Up @@ -201,7 +191,7 @@ jobs:
- name: Submit Dependencies
uses: scalacenter/sbt-dependency-submission@v2
with:
modules-ignore: fuuid_2.12 fuuid_2.13 fuuid_3 site_2.12 site_2.13 site_3
modules-ignore: fuuid_2.13 fuuid_3 site_2.13 site_3
configs-ignore: test scala-tool scala-doc-tool test-internal

site:
Expand Down
20 changes: 10 additions & 10 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ val Scala3 = "3.3.8"

Global / onChangedBuildSource := ReloadOnSourceChanges

ThisBuild / crossScalaVersions := Seq(Scala212, Scala213, Scala3)
ThisBuild / crossScalaVersions := Seq(Scala213, Scala3)
ThisBuild / scalaVersion := Scala213

def crossCompileDirs(scalaVersion: String, baseDirectory: File) = {
Expand Down Expand Up @@ -76,7 +76,7 @@ lazy val doobie = project
"org.typelevel" %% "discipline-munit" % disciplineMunit % Test,
"org.scalameta" %% "munit" % munitV % Test,
"org.scalameta" %% "munit-scalacheck" % munitV % Test,
"org.typelevel" %%% "munit-cats-effect-3" % munitCE3V % Test,
"org.typelevel" %%% "munit-cats-effect" % munitCE3V % Test,
("com.dimafeng" %% "testcontainers-scala-postgresql" % testcontainersV % Test)
.cross(CrossVersion.for3Use2_13)
),
Expand Down Expand Up @@ -128,16 +128,16 @@ lazy val site = project
.build
)

val catsV = "2.7.0" //https://github.com/typelevel/cats/releases
val catsEffectV = "3.3.12" //https://github.com/typelevel/cats-effect/releases
val catsV = "2.13.0" //https://github.com/typelevel/cats/releases
val catsEffectV = "3.7.1" //https://github.com/typelevel/cats-effect/releases
val circeV = "0.14.1" //https://github.com/circe/circe/releases
val http4sV = "0.23.6" //https://github.com/http4s/http4s/releases
val http4sV = "0.23.37" //https://github.com/http4s/http4s/releases
val doobieV = "1.0.0-RC1" //https://github.com/tpolecat/doobie/releases
val scalaJavaTimeV = "2.3.0" // https://github.com/cquiroz/scala-java-time/releases
val scalaJavaTimeV = "2.7.0" // https://github.com/cquiroz/scala-java-time/releases
val testcontainersV = "0.39.8"
val munitV = "0.7.29"
val munitCE3V = "1.0.6"
val disciplineMunit = "1.0.9"
val munitV = "1.3.1"
val munitCE3V = "2.2.1"
val disciplineMunit = "2.0.0"

// General Settings
lazy val commonSettings = Seq(
Expand All @@ -147,7 +147,7 @@ lazy val commonSettings = Seq(
"org.typelevel" %%% "discipline-munit" % disciplineMunit % Test,
"org.scalameta" %%% "munit" % munitV % Test,
"org.scalameta" %%% "munit-scalacheck" % munitV % Test,
"org.typelevel" %%% "munit-cats-effect-3" % munitCE3V % Test
"org.typelevel" %%% "munit-cats-effect" % munitCE3V % Test
),
// Compiler settings DavenversePlugin injected globally. sbt-typelevel-ci-release
// does not supply these (only sbt-typelevel-settings would).
Expand Down
Loading