Skip to content

Correct build dependencies. #325

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
May 6, 2021
Merged

Correct build dependencies. #325

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
10 changes: 3 additions & 7 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import sbtcrossproject.CrossProject
import sbtcrossproject.CrossType

def localSnapshotVersion = "1.4.5-SNAPSHOT"
def localSnapshotVersion = "1.4.6-SNAPSHOT"
def isCI = System.getenv("CI") != null

val scalatestVersion = "3.2.8"
Expand Down Expand Up @@ -68,18 +68,14 @@ lazy val runtime = CrossProject(
.settings(
name := "scalac-scoverage-runtime",
crossTarget := target.value / s"scala-${scalaVersion.value}",
crossVersion := CrossVersion.full,
libraryDependencies ++= Seq(
"org.scalatest" %%% "scalatest" % scalatestVersion % Test,
"org.scala-lang" % "scala-compiler" % scalaVersion.value % Compile
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@lefou you were totally correct... this doesn't need to be a dependency for the runtime. If you look back at the commits it seems to have slipped in when I refactored the build definition.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What I wonder is, whether we can avoid the CrossVersion.full for the runtime.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So from digging further in, from what I can tell, no this doesn't need a full cross version. I've gone ahead and tested this locally and also with the sbt plugin to verify. I've gone ahead and removed the CrossVersion.full on the runtime and also then could remove the hacky thing we were doing to name the scalaJS artifact correct as well since it's now done correctly automatically.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You should be able to give this a try now wtih 1.4.5+1-775fcaca-SNAPSHOT. Report back if something seems awry. I'd be good to get this more widely tested before a release.

"org.scalatest" %%% "scalatest" % scalatestVersion % Test
)
)
.jvmSettings(
Test / fork := true
)
.jsSettings(
crossVersion := CrossVersion
.fullWith("sjs" + scalaJSVersion.take(1) + "_", ""),
scalaJSStage := FastOptStage
)

Expand All @@ -96,7 +92,7 @@ lazy val plugin =
libraryDependencies ++= Seq(
"org.scala-lang.modules" %% "scala-xml" % "1.3.0",
"org.scalatest" %% "scalatest" % scalatestVersion % Test,
"org.scala-lang" % "scala-compiler" % scalaVersion.value % Compile
"org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
)
)
.settings(
Expand Down