Skip to content

Scala 3.3.0: drop cross build and fixup build properties #1719

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 5, 2023
Merged

Scala 3.3.0: drop cross build and fixup build properties #1719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,6 @@ jobs:
- name: Compile and run tests
run: sbt +test
- name: Check formatting
run: sbt ++2.13.8 scalafmtCheck Test/scalafmtCheck
run: sbt scalafmtCheck Test/scalafmtCheck
- run: echo "Previous step failed because code is not formatted. Run 'sbt scalafmt'"
if: ${{ failure() }}
6 changes: 3 additions & 3 deletions .github/workflows/release.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ jobs:
with:
distribution: 'adopt'
java-version: 19
- name: Compile and run tests
run: sbt +test
- name: Check formatting
run: sbt ++2.13.8 scalafmtCheck Test/scalafmtCheck
run: sbt scalafmtCheck Test/scalafmtCheck
- run: echo "Previous step failed because code is not formatted. Run 'sbt scalafmt'"
if: ${{ failure() }}
- name: Compile and run tests
run: sbt +test

release:
concurrency: release
Expand Down
13 changes: 1 addition & 12 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@ val overflowdbCodegenVersion = "2.97"
inThisBuild(
List(
organization := "io.shiftleft",
scalaVersion := "2.13.8",
crossScalaVersions := Seq("2.13.8", "3.3.0"),
scalaVersion := "3.3.0",
resolvers ++= Seq(Resolver.mavenLocal, "Sonatype OSS" at "https://oss.sonatype.org/content/repositories/public"),
packageDoc / publishArtifact := true,
packageSrc / publishArtifact := true,
Expand Down Expand Up @@ -63,16 +62,6 @@ ThisBuild / scalacOptions ++= Seq(
// "-Xfatal-warnings",
"-Wconf:cat=deprecation:w,any:e",
"-language:implicitConversions"
) ++ (
CrossVersion.partialVersion(scalaVersion.value) match {
case Some((3, _)) => Seq()
case _ =>
Seq(
"-Ycache-macro-class-loader:last-modified",
"-Ybackend-parallelism",
"4"
)
}
)

ThisBuild / javacOptions ++= Seq(
Expand Down