Skip to content

Commit afa541f

Browse files
authored
Scala 3.3.0: drop cross build and fixup build properties (#1719)
1 parent 26e6169 commit afa541f

File tree

3 files changed

+5
-16
lines changed

3 files changed

+5
-16
lines changed

.github/workflows/pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,6 @@ jobs:
2424
- name: Compile and run tests
2525
run: sbt +test
2626
- name: Check formatting
27-
run: sbt ++2.13.8 scalafmtCheck Test/scalafmtCheck
27+
run: sbt scalafmtCheck Test/scalafmtCheck
2828
- run: echo "Previous step failed because code is not formatted. Run 'sbt scalafmt'"
2929
if: ${{ failure() }}

.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,12 +22,12 @@ jobs:
2222
with:
2323
distribution: 'adopt'
2424
java-version: 19
25-
- name: Compile and run tests
26-
run: sbt +test
2725
- name: Check formatting
28-
run: sbt ++2.13.8 scalafmtCheck Test/scalafmtCheck
26+
run: sbt scalafmtCheck Test/scalafmtCheck
2927
- run: echo "Previous step failed because code is not formatted. Run 'sbt scalafmt'"
3028
if: ${{ failure() }}
29+
- name: Compile and run tests
30+
run: sbt +test
3131

3232
release:
3333
concurrency: release

build.sbt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ val overflowdbCodegenVersion = "2.97"
77
inThisBuild(
88
List(
99
organization := "io.shiftleft",
10-
scalaVersion := "2.13.8",
11-
crossScalaVersions := Seq("2.13.8", "3.3.0"),
10+
scalaVersion := "3.3.0",
1211
resolvers ++= Seq(Resolver.mavenLocal, "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/public"),
1312
packageDoc / publishArtifact := true,
1413
packageSrc / publishArtifact := true,
@@ -63,16 +62,6 @@ ThisBuild / scalacOptions ++= Seq(
6362
// "-Xfatal-warnings",
6463
"-Wconf:cat=deprecation:w,any:e",
6564
"-language:implicitConversions"
66-
) ++ (
67-
CrossVersion.partialVersion(scalaVersion.value) match {
68-
case Some((3, _)) => Seq()
69-
case _ =>
70-
Seq(
71-
"-Ycache-macro-class-loader:last-modified",
72-
"-Ybackend-parallelism",
73-
"4"
74-
)
75-
}
7665
)
7766

7867
ThisBuild / javacOptions ++= Seq(

0 commit comments

Comments
 (0)