Skip to content

Commit b25dfaa

Browse files
committed
build with sbt2
1 parent 42dcb6e commit b25dfaa

File tree

4 files changed

+6
-5
lines changed

4 files changed

+6
-5
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
strategy:
2929
fail-fast: false
3030
matrix:
31-
scala: ["2.12", "3.6"]
31+
scala: ["2.12"]
3232
name: Windows / Scala ${{ matrix.scala }}
3333
runs-on: windows-latest
3434
steps:

build.sbt

+2-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ libraryDependencies ++= List(
4545
lazy val scala212 = "2.12.20" // bin/test-release.sh
4646
lazy val scala3 = "3.6.4" // bin/test-release.sh & .github/workflows/ci.yml
4747

48-
scalaVersion := scala212
48+
scalaVersion := scala3
4949
crossScalaVersions := Seq(scala212, scala3)
5050

5151
// keep this as low as possible to avoid running into binary incompatibility such as https://github.com/sbt/sbt/issues/5049
@@ -74,6 +74,7 @@ scalacOptions ++= {
7474
scalaBinaryVersion.value match {
7575
case "2.12" =>
7676
List(
77+
"-Xsource:3",
7778
"-Ywarn-unused",
7879
"-Xlint",
7980
"-Xfatal-warnings"

project/build.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=1.10.7
1+
sbt.version=2.0.0-M4

project/plugins.sbt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
resolvers ++= Resolver.sonatypeOssRepos("public")
2-
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
2+
//addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.2")
33

44
// dogfooding
55
Compile / unmanagedSourceDirectories ++= {
66
val root = (ThisBuild / baseDirectory).value.getParentFile / "src" / "main"
77
List(
88
root / "scala",
9-
root / "scala-2.12"
9+
root / "scala-3"
1010
)
1111
}
1212
libraryDependencies ++= Dependencies.all

0 commit comments

Comments
 (0)