Skip to content

Commit e1edbd9

Browse files
author
jmast
committed
change crossScalaVersions so the matrix build doesn't break
1 parent 6447edf commit e1edbd9

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@ jobs:
3333

3434
- name: Run tests ${{ matrix.scala }}
3535
if: success()
36-
run: sbt ++${{ matrix.scala }} clean coverage test docs/mdoc versionPolicyCheck
36+
run: sbt clean coverage "++${{ matrix.scala }} test" docs/mdoc "++${{ matrix.scala }} versionPolicyCheck"
3737

3838
- name: Report test coverage
3939
if: success() && github.repository == 'evolution-gaming/kafka-flow'
4040
env:
4141
COVERALLS_REPO_TOKEN: ${{ secrets.COVERALLS_REPO_TOKEN }}
42-
run: sbt ++${{ matrix.scala }} coverageReport coverageAggregate coveralls
42+
run: sbt "++${{ matrix.scala }} coverageReport" coverageAggregate coveralls
4343

4444
- name: Publish documentation / Setup Node
4545
if: success()

build.sbt

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ lazy val commonSettings = Seq(
1414
organizationName := "Evolution Gaming",
1515
organizationHomepage := Some(url("https://evolution.com/")),
1616
publishTo := Some(Resolver.evolutionReleases),
17-
scalaVersion := Scala2Version,
17+
crossScalaVersions := Seq(Scala2Version, Scala3Version),
18+
scalaVersion := crossScalaVersions.value.head,
1819
licenses := Seq(("MIT", url("https://opensource.org/licenses/MIT"))),
1920
testFrameworks += new TestFramework("munit.Framework"),
2021
testOptions += Tests.Argument(new TestFramework("munit.Framework"), "+l"),
@@ -33,7 +34,6 @@ lazy val commonSettings = Seq(
3334
if3 = List("-Ykind-projector", "-language:implicitConversions", "-explain", "-deprecation"),
3435
if2 = List("-Xsource:3")
3536
),
36-
crossScalaVersions := Seq(Scala2Version, Scala3Version)
3737
)
3838

3939
def crossSettings[T](scalaVersion: String, if3: List[T], if2: List[T]) =
@@ -59,6 +59,7 @@ lazy val root = (project in file("."))
5959
name := "kafka-flow",
6060
publish / skip := true,
6161
crossScalaVersions := Nil,
62+
scalaVersion := Scala2Version,
6263
)
6364

6465
lazy val core = (project in file("core"))
@@ -85,7 +86,7 @@ lazy val core = (project in file("core"))
8586
scalaVersion.value,
8687
if3 = List(Scodec.coreScala3),
8788
if2 = List(Scodec.coreScala213)
88-
)
89+
),
8990
)
9091

9192
lazy val `core-it-tests` = (project in file("core-it-tests"))
@@ -110,7 +111,7 @@ lazy val metrics = (project in file("metrics"))
110111
libraryDependencies ++= Seq(
111112
smetrics,
112113
Testing.munit % Test,
113-
)
114+
),
114115
)
115116

116117
lazy val `persistence-cassandra` = (project in file("persistence-cassandra"))
@@ -126,7 +127,7 @@ lazy val `persistence-cassandra` = (project in file("persistence-cassandra"))
126127
scalaVersion.value,
127128
if3 = List(PureConfig.GenericScala3),
128129
if2 = Nil,
129-
)
130+
),
130131
)
131132

132133
lazy val `persistence-cassandra-it-tests` = (project in file("persistence-cassandra-it-tests"))
@@ -176,13 +177,15 @@ lazy val journal = (project in file("kafka-journal"))
176177
KafkaJournal.persistence,
177178
Testing.munit % Test,
178179
),
179-
crossScalaVersions := Seq(Scala2Version),
180180
)
181+
.settings(crossScalaVersions -= Scala3Version)
181182

182183
lazy val docs = (project in file("kafka-flow-docs"))
183184
.dependsOn(core, `persistence-cassandra`, `persistence-kafka`, metrics)
184185
.settings(commonSettings)
185186
.enablePlugins(MdocPlugin, DocusaurusPlugin)
186-
.settings(scalacOptions -= "-Xfatal-warnings")
187+
.settings(
188+
scalacOptions -= "-Xfatal-warnings",
189+
)
187190

188191
addCommandAlias("check", "versionPolicyCheck")

0 commit comments

Comments
 (0)