Skip to content
Closed
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
13 changes: 9 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ lazy val munitVersion = "1.1.1"
lazy val scalametaVersion = "4.9.9"
lazy val defaultScala212 = "2.12.20"
lazy val defaultScala213 = "2.13.16"
lazy val defaultScala3 = "3.3.0"
lazy val defaultScala3 = "3.3.6"
lazy val bin212 =
Seq(
defaultScala212,
Expand Down Expand Up @@ -107,9 +107,13 @@ lazy val runtime = CrossProject(
.withoutSuffixFor(JVMPlatform)
.settings(
name := "scalac-scoverage-runtime",
crossScalaVersions := Seq(defaultScala212, defaultScala213),
crossScalaVersions := bin212 ++ bin213,
allowUnsafeScalaLibUpgrade := true,
crossTarget := target.value / s"scala-${scalaVersion.value}",
sharedSettings
sharedSettings,
publish / skip := !List(defaultScala212, defaultScala213)
.contains(scalaVersion.value),
publishLocal / skip := (publish / skip).value
)
.jvmSettings(
Test / fork := true
Expand Down Expand Up @@ -139,7 +143,8 @@ lazy val plugin =
crossScalaVersions := bin212 ++ bin213,
crossVersion := CrossVersion.full,
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided,
sharedSettings
sharedSettings,
allowUnsafeScalaLibUpgrade := true
Copy link
Contributor

Choose a reason for hiding this comment

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

We should also set runtime to have allowUnsafeScalaLibUpgrade := true,, we should be ok to do that.

Or alternatively ask Seb to release Scala JS 2.13.17 on 1.19.0

Alternatively, do we need to cross publish JS on every Scala version as well?

Copy link
Contributor

Choose a reason for hiding this comment

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

@ckipp01 if you'd like I can help with day to day maintenance, is it possible to add me to the repo?

Choose a reason for hiding this comment

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

Scala.js 1.20.1 support for 2.13.17 is published.

We will not publish earlier versions, as they predate the Sonatypocalypse. Their build cannot publish to the new Central Portal.

https://contributors.scala-lang.org/t/scala-2-13-17-release-planning/6994/18

Copy link
Contributor

Choose a reason for hiding this comment

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

You can change the build and release manually, though maybe with Scala JS it's much harder.

Copy link
Member

Choose a reason for hiding this comment

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

@ckipp01 if you'd like I can help with day to day maintenance, is it possible to add me to the repo?

Yup, just added you. Everything is set up for creds to publish on a tag, everything just needs to be updated. You should have access to the sbt repo as well, but that one is up to date.

Copy link
Contributor

Choose a reason for hiding this comment

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

If the problem is supporting older Scala 2.13 versions, could we drop support for older versions and support only the latest 2.13.17? People can still use older versions of scoverage (which is very stable) for these older Scala versions and use the latest only if they are on Scala 2.12.20 and 2.13.17.

Copy link
Contributor

Choose a reason for hiding this comment

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

It shouldn't be an issue for now. Let me fix up the PR

Copy link
Contributor

Choose a reason for hiding this comment

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

ech, it seems Scala JS plugin is wrecking havoc now :/

Copy link
Contributor

Choose a reason for hiding this comment

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

Ok, I give up, I will remove the older version support and if we need there is ways to backport fixes. I can take care of that if needed (famous last words)

)
.settings(
Test / unmanagedSourceDirectories += (Test / sourceDirectory).value / "scala-2.12+",
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.6.2
sbt.version=1.11.6
6 changes: 3 additions & 3 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.19.0")
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")

addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.7")
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.8")
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")

addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.3")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")

addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.4")

Expand Down
Loading