Migrate to sbt-typelevel-ci-release #63
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,55 +3,24 @@ import com.typesafe.tools.mima.core.{ProblemFilters, ReversedMissingMethodProble | |
| val scala3Version = "3.1.0" | ||
|
|
||
| ThisBuild / organization := "org.typelevel" | ||
| ThisBuild / tlBaseVersion := "3.0" | ||
|
There was a problem hiding this comment. What is this for? Do we have to bump it after releasing 3.1? There was a problem hiding this comment. It's part of the versioning scheme inherited from sbt-spiewak. Actually, you should bump it at the time you introduce "3.1-worthy" changes. E.g. if you follow strict semver and only do bugfixes in 3.0.x, your first PR adding a new feature should bump
There was a problem hiding this comment. Ok, thanks for explaining - I think we should be already on 3.1 (since Scala native forces us to use Scala 3.1) but that can be bumped later as well. |
||
| ThisBuild / scalaVersion := scala3Version | ||
| ThisBuild / crossScalaVersions := Seq(scala3Version) | ||
| ThisBuild / updateOptions := updateOptions.value.withLatestSnapshots(false) | ||
|
|
||
| // GHA configuration | ||
| ThisBuild / tlCiReleaseBranches := Seq("main") | ||
|
There was a problem hiding this comment. This sets up snapshots on main. |
||
| ThisBuild / githubWorkflowBuildMatrixFailFast := Some(false) | ||
|
There was a problem hiding this comment. Do we still need this? It seems like it's the only setting left from There was a problem hiding this comment. The default is |
||
|
|
||
| val jsSettings = Def.settings( | ||
| tlVersionIntroduced := Map("3" -> "3.0.1") | ||
|
There was a problem hiding this comment. "The Scala 3 cross-build was introduced in version 3.0.1 of my project". Most projects are using it to indicate when they added Scala 3. Here, since you added the Scala.js cross in v3.0.1 it goes in JS settings. It tells MiMa how far back to look for artifacts. There was a problem hiding this comment. Ok so when we publish with Scala native we can make it a common setting? There was a problem hiding this comment. No, I don't think this can ever be a common setting. Your JVM cross-build was introduced in 3.0.0, your JS cross-build was introduced in 3.0.1, and your Native cross-build will be introduced in 3.?.?. So they are all different. |
||
| ) | ||
|
|
||
| val nativeSettings = Def.settings( | ||
| libraryDependencies += "org.scala-native" %%% "junit-runtime" % nativeVersion % Test, | ||
| addCompilerPlugin("org.scala-native" % "junit-plugin" % nativeVersion cross CrossVersion.full), | ||
| testOptions += Tests.Argument(TestFrameworks.JUnit, "-a", "-s", "-v"), | ||
| mimaPreviousArtifacts := Set.empty, | ||
| ) | ||
|
|
||
| // Aliases | ||
|
|
@@ -72,20 +41,11 @@ addCommandAlias("testNative", ";derivingNative/test;testNative/test;typeableNati | |
|
|
||
| // Projects | ||
|
|
||
| lazy val root = tlCrossRootProject | ||
|
There was a problem hiding this comment. This automatically sets up the CI matrix for JVM/JS/Native. |
||
| .aggregate( | ||
| deriving, | ||
| test, | ||
| typeable | ||
| ) | ||
|
|
||
| lazy val deriving = crossProject(JSPlatform, JVMPlatform, NativePlatform) | ||
|
|
@@ -98,6 +58,7 @@ lazy val deriving = crossProject(JSPlatform, JVMPlatform, NativePlatform) | |
| .platformsSettings(JVMPlatform, JSPlatform)( | ||
| libraryDependencies += "org.typelevel" %%% "cats-core" % "2.7.0" % "test", | ||
| ) | ||
| .jsSettings(jsSettings) | ||
| .nativeSettings( | ||
| nativeSettings, | ||
| Test / sources := { | ||
|
|
@@ -114,16 +75,14 @@ lazy val deriving = crossProject(JSPlatform, JVMPlatform, NativePlatform) | |
| }, | ||
| ) | ||
| .settings(commonSettings) | ||
| .settings( | ||
| mimaBinaryIssueFilters ++= Seq( | ||
| ProblemFilters.exclude[ReversedMissingMethodProblem]("shapeless3.deriving.internals.ErasedInstances.erasedMapK"), | ||
| ProblemFilters.exclude[ReversedMissingMethodProblem]("shapeless3.deriving.internals.ErasedProductInstances.erasedProject"), | ||
| ProblemFilters.exclude[ReversedMissingMethodProblem]("shapeless3.deriving.internals.ErasedProductInstances.erasedMapK") | ||
| ) | ||
| ) | ||
| .jsEnablePlugins(ScalaJSJUnitPlugin) | ||
|
|
||
| lazy val derivingJVM = deriving.jvm | ||
| lazy val derivingJS = deriving.js | ||
|
|
@@ -136,10 +95,9 @@ lazy val test = crossProject(JSPlatform, JVMPlatform, NativePlatform) | |
| moduleName := "shapeless3-test" | ||
| ) | ||
| .settings(commonSettings) | ||
| .jsSettings(jsSettings) | ||
| .nativeSettings(nativeSettings) | ||
| .jsEnablePlugins(ScalaJSJUnitPlugin) | ||
|
|
||
| lazy val testJVM = test.jvm | ||
| lazy val testJS = test.js | ||
|
|
@@ -153,10 +111,9 @@ lazy val typeable = crossProject(JSPlatform, JVMPlatform, NativePlatform) | |
| moduleName := "shapeless3-typeable" | ||
| ) | ||
| .settings(commonSettings) | ||
| .settings(mimaPreviousArtifacts := Set.empty) // Not yet | ||
| .nativeSettings(nativeSettings) | ||
| .jsEnablePlugins(ScalaJSJUnitPlugin) | ||
|
|
||
| lazy val typeableJVM = typeable.jvm | ||
| lazy val typeableJS = typeable.js | ||
|
|
@@ -174,14 +131,12 @@ lazy val local = crossProject(JSPlatform, JVMPlatform, NativePlatform) | |
| console / initialCommands := """import shapeless3.deriving.* ; import scala.deriving.*""" | ||
| ) | ||
| .settings(commonSettings) | ||
| .enablePlugins(NoPublishPlugin) | ||
| .jsEnablePlugins(ScalaJSJUnitPlugin) | ||
|
|
||
| // Settings | ||
|
|
||
| lazy val commonSettings = Seq( | ||
| scalacOptions ++= Seq( | ||
| "-Xfatal-warnings", | ||
| "-Yexplicit-nulls" | ||
|
|
@@ -191,23 +146,9 @@ lazy val commonSettings = Seq( | |
| libraryDependencies += "com.github.sbt" % "junit-interface" % "0.13.3" % "test", | ||
| ) | ||
|
|
||
|
Comment on lines
-194
to
-204
There was a problem hiding this comment. sbt-typelevel-ci-release sets this automatically. |
||
| ThisBuild / licenses := Seq("Apache 2" -> url("http://www.apache.org/licenses/LICENSE-2.0.txt")) | ||
| ThisBuild / developers := List( | ||
| Developer("milessabin", "Miles Sabin", "miles@milessabin.com", url("http://milessabin.com/blog")), | ||
| Developer("joroKr21", "Georgi Krastev", "joro.kr.21@gmail.com", url("https://twitter.com/Joro_Kr")), | ||
| Developer("TimWSpence", "Tim Spence", "timothywspence@gmail.com", url("https://twitter.com/timwspence")) | ||
| ) | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,5 @@ | ||
| addSbtPlugin("org.typelevel" % "sbt-typelevel-ci-release" % "0.4.0") | ||
| addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.8.0") | ||
| addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.3-RC2") | ||
| addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.1.0") | ||
| addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.1.0") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why is this running on PR?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's a good point. It's not harmful but probably not necessary. We can fix this upstream.