Skip to content

Commit 61fb054

Browse files
authored
Merge pull request #542 from fd4s/update-scala3
Update to scala 3.0.0-RC1
2 parents e82bfe6 + 5f53ac4 commit 61fb054

2 files changed

Lines changed: 18 additions & 16 deletions

File tree

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
strategy:
2424
matrix:
2525
os: [ubuntu-latest]
26-
scala: [2.12.13, 2.13.3, 3.0.0-M3]
26+
scala: [2.12.13, 2.13.4, 3.0.0-RC1]
2727
java: [adopt@1.8]
2828
runs-on: ${{ matrix.os }}
2929
steps:
@@ -54,7 +54,7 @@ jobs:
5454

5555
- run: sbt ++${{ matrix.scala }} ci
5656

57-
- if: matrix.scala == '2.13.3'
57+
- if: matrix.scala == '2.13.4'
5858
run: sbt ++${{ matrix.scala }} docs/run
5959

6060
publish:
@@ -64,7 +64,7 @@ jobs:
6464
strategy:
6565
matrix:
6666
os: [ubuntu-latest]
67-
scala: [2.13.3]
67+
scala: [2.13.4]
6868
java: [adopt@1.8]
6969
runs-on: ${{ matrix.os }}
7070
steps:

build.sbt

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@ val kafkaVersion = "2.7.0"
1010

1111
val testcontainersScalaVersion = "0.39.1"
1212

13-
val vulcanVersion = "1.4.0"
13+
val vulcanVersion = "1.4.1"
1414

1515
val scala212 = "2.12.13"
1616

17-
val scala213 = "2.13.3"
17+
val scala213 = "2.13.4"
1818

19-
val scala3 = "3.0.0-M3"
19+
val scala3 = "3.0.0-RC1"
2020

2121
lazy val `fs2-kafka` = project
2222
.in(file("."))
@@ -86,19 +86,21 @@ lazy val dependencySettings = Seq(
8686
.withDottyCompat(scalaVersion.value),
8787
("com.dimafeng" %% "testcontainers-scala-kafka" % testcontainersScalaVersion)
8888
.withDottyCompat(scalaVersion.value),
89-
"org.typelevel" %% "discipline-scalatest" % "2.1.1",
89+
"org.typelevel" %% "discipline-scalatest" % "2.1.2",
9090
"org.typelevel" %% "cats-effect-laws" % catsEffectVersion,
91-
"org.typelevel" %% "cats-testkit-scalatest" % "2.1.1",
91+
"org.typelevel" %% "cats-testkit-scalatest" % "2.1.2",
9292
"ch.qos.logback" % "logback-classic" % "1.2.3"
9393
).map(_ % Test),
94-
libraryDependencies ++= (if (isDotty.value) Nil
95-
else
96-
Seq(
97-
compilerPlugin(
98-
("org.typelevel" %% "kind-projector" % "0.11.3")
99-
.cross(CrossVersion.full)
100-
)
101-
)),
94+
libraryDependencies ++= {
95+
if (isDotty.value) Nil
96+
else
97+
Seq(
98+
compilerPlugin(
99+
("org.typelevel" %% "kind-projector" % "0.11.3")
100+
.cross(CrossVersion.full)
101+
)
102+
)
103+
},
102104
pomPostProcess := { (node: xml.Node) =>
103105
new xml.transform.RuleTransformer(new xml.transform.RewriteRule {
104106
def scopedDependency(e: xml.Elem): Boolean =

0 commit comments

Comments
 (0)