Skip to content
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.

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

Address some deprecation warnings in build definition #156

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/workflows/run_it_test_on_comment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,9 @@ jobs:
status: pending

- name: Run Integration Tests
run: sbt -J-Xmx40G cleanBuild it:test
run: sbt -J-Xmx40G "cleanBuild; IntegrationTest / test"
- name: Run Cross Language Tests
run: sbt -J-Xmx40G "project LLVM;it:test;project ValidateCross;it:test"
run: sbt -J-Xmx40G "project LLVM; IntegrationTest / test;project ValidateCross; IntegrationTest / test"

- name: Set latest commit status as ${{ job.status }}
uses: myrotvorets/set-commit-status-action@655d7d2517bab7f5d1b6e74cd7d5e995264184b1
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -82,15 +82,15 @@ ThisBuild / javaOptions ++= Seq(
addCommandAlias(
"compileAll",
"; copyResources ; scalastyle ; " +
"test:compile ; test:scalastyle ; " +
"it:scalariformFormat ; it:scalastyle ; it:compile "
"OPAL / Test / compile ; OPAL / Test / scalastyle ; " +
"OPAL / IntegrationTest / scalariformFormat ; OPAL / IntegrationTest / scalastyle ; OPAL / IntegrationTest / compile "
)

addCommandAlias("buildAll", "; compileAll ; unidoc ; publishLocal ")

addCommandAlias(
"cleanAll",
"; clean ; cleanCache ; cleanLocal ; test:clean ; it:clean ; cleanFiles"
"; clean ; cleanCache ; cleanLocal ; OPAL / Test / clean ; OPAL / IntegrationTest / clean ; cleanFiles"
)

addCommandAlias("cleanBuild", "; project OPAL ; cleanAll ; buildAll ")
Expand All @@ -115,7 +115,7 @@ lazy val buildSettings =
scalariformSettings ++
PublishingOverwrite.onSnapshotOverwriteSettings ++
Seq(libraryDependencies ++= Dependencies.testlibs) ++
Seq(Defaults.itSettings: _*) ++
Seq(inConfig(IntegrationTest)(Defaults.testSettings): _*) ++
Seq(
unmanagedSourceDirectories
.withRank(KeyRanks.Invisible) := (Compile / scalaSource).value :: Nil
Expand Down
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")

addSbtPlugin("com.eed3si9n" % "sbt-unidoc" % "0.4.3")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.15.0")
addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.4")

// Dependency management:
addSbtPlugin("net.vonbuchholtz" % "sbt-dependency-check" % "3.1.1")
Expand Down