Merge pull request #292 from alexarchambault/updates

Updates

Author: alexarchambault

.github/workflows/ci.yml

@@ -13,15 +13,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        SCALA: [2.12.13, 2.13.5]
+        SCALA: [2.12.13, 2.13.6]
     steps:
     - uses: actions/checkout@v2
     - uses: coursier/cache-action@v6
     - uses: laughedelic/coursier-setup@v1
       with:
         jvm: 8
         apps: sbt-launcher
-    - run: sbt ++$SCALA_VERSION test evictionCheck compatibilityCheck
+    - run: sbt ++$SCALA_VERSION test mimaReportBinaryIssues
       env:
         SCALA_VERSION: ${{ matrix.SCALA_VERSION }}
 

build.sbt

@@ -21,6 +21,10 @@ inThisBuild(List(
   )
 ))
 
+val previousVersions = Set.empty[String]
+lazy val mimaSettings = Def.settings(
+  mimaPreviousArtifacts := previousVersions.map(organization.value %% moduleName.value % _)
+)
 
 lazy val core = crossProject(JVMPlatform, JSPlatform)
   .jsConfigure(_.disablePlugins(MimaPlugin))
@@ -30,9 +34,7 @@ lazy val core = crossProject(JVMPlatform, JSPlatform)
     libraryDependencies += Deps.dataClass % Provided
   )
   .jvmSettings(
-    compatibilitySettings,
-    mimaPreviousArtifacts := mimaPreviousArtifacts.value
-      .filter(!_.revision.startsWith("0.7."))
+    mimaSettings
   )
 
 lazy val coreJvm = core.jvm
@@ -42,7 +44,7 @@ lazy val `joda-time` = project
   .dependsOn(coreJvm)
   .settings(
     shared,
-    compatibilitySettings,
+    mimaSettings,
     plotlyPrefix,
     libraryDependencies += Deps.jodaTime
   )
@@ -56,7 +58,7 @@ lazy val render = crossProject(JVMPlatform, JSPlatform)
     plotlyPrefix
   )
   .jvmSettings(
-    compatibilitySettings,
+    mimaSettings,
     mimaCurrentClassfiles := shadedPackageBin.value,
     Mima.renderFilters,
     shadedModules += Deps.argonautShapeless.value.module,
@@ -170,8 +172,7 @@ lazy val demo = project
         .commonJSName("PrismScala")
         .dependsOn("prism-java.js")
     ),
-    generateCustomSources,
-    evictionRules += "org.scala-js" % "scalajs-dom_*" % "semver"
+    generateCustomSources
   )
 
 lazy val tests = project
@@ -192,7 +193,7 @@ lazy val almond = project
   .dependsOn(coreJvm, renderJvm)
   .settings(
     shared,
-    compatibilitySettings,
+    mimaSettings,
     plotlyPrefix,
     libraryDependencies += Deps.almondScalaApi % "provided"
   )

project/Deps.scala

@@ -8,15 +8,14 @@ object Deps {
   import Def.setting
 
   def almondScalaApi = "sh.almond" %% "jupyter-api" % "0.11.2"
-  def argonautShapeless = setting("com.github.alexarchambault" %%% "argonaut-shapeless_6.2" % "1.2.0")
+  def argonautShapeless = setting("com.github.alexarchambault" %%% "argonaut-shapeless_6.3" % "1.3.0")
   def dataClass = "io.github.alexarchambault" %% "data-class" % "0.2.5"
   def jodaTime = "joda-time" % "joda-time" % "2.10.10"
   def rhino = "org.mozilla" % "rhino" % "1.7.13"
-  def shapeless = setting("com.chuusai" %%% "shapeless" % "2.3.3")
-  def scalacheckShapeless = setting("com.github.alexarchambault" %%% "scalacheck-shapeless_1.14" % "1.2.0-1")
+  def shapeless = setting("com.chuusai" %%% "shapeless" % "2.3.7")
+  def scalacheckShapeless = setting("com.github.alexarchambault" %%% "scalacheck-shapeless_1.15" % "1.3.0")
   def scalajsDom = setting("org.scala-js" %%% "scalajs-dom" % "1.1.0")
-  def scalatags = setting("com.lihaoyi" %%% "scalatags" % "0.9.3")
+  def scalatags = setting("com.lihaoyi" %%% "scalatags" % "0.9.4")
   def scalaTest = "org.scalatest" %% "scalatest" % "3.2.9"
-  def utest = setting("com.lihaoyi" %%% "utest" % "0.6.6")
 
 }

project/Settings.scala

@@ -2,7 +2,6 @@
 import com.jsuereth.sbtpgp._
 import sbt._
 import sbt.Keys._
-import sbtevictionrules.EvictionRulesPlugin.autoImport._
 
 object Settings {
 
@@ -88,7 +87,7 @@ object Settings {
   )
 
   private val scala212 = "2.12.13"
-  private val scala213 = "2.13.5"
+  private val scala213 = "2.13.6"
 
   private lazy val isAtLeastScala213 = Def.setting {
     import Ordering.Implicits._
@@ -98,11 +97,7 @@ object Settings {
   lazy val shared = Def.settings(
     crossScalaVersions := Seq(scala213, scala212),
     scalaVersion := scala213,
-    resolvers ++= Seq(
-      "Webjars Bintray" at "https://dl.bintray.com/webjars/maven/",
-      Resolver.sonatypeRepo("releases"),
-      "jitpack" at "https://jitpack.io"
-    ),
+    resolvers += "jitpack" at "https://jitpack.io",
     libraryDependencies ++= {
       if (isAtLeastScala213.value) Nil
       else Seq(compilerPlugin("org.scalamacros" % "paradise" % "2.1.1" cross CrossVersion.full))
@@ -111,28 +106,13 @@ object Settings {
     scalacOptions ++= {
       if (isAtLeastScala213.value) Seq("-Ymacro-annotations")
       else Nil
-    },
-    evictionRules += "org.scala-js" %% "scalajs-library" % "semver"
-  )
-
-  lazy val compatibilitySettings = Def.settings(
-    sbtcompatibility.SbtCompatibilityPlugin.autoImport.compatibilityIgnored ++= Seq(
-      // former dependency of core, now marked as "provided"
-      "io.github.alexarchambault" %% "data-class",
-      // transitive dependency of data-class
-      "org.scala-lang" % "scala-reflect"
-    )
+    }
   )
 
   lazy val plotlyPrefix = {
     name := "plotly-" + name.value
   }
 
-  lazy val utest = Seq(
-    libraryDependencies += Deps.utest.value % "test",
-    testFrameworks += new TestFramework("utest.runner.Framework")
-  )
-
   val gitLock = new Object
 
   def runCommand(cmd: Seq[String], dir: File): Unit = {

project/plugins.sbt

@@ -1,8 +1,6 @@
 addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.7")
-addSbtPlugin("io.github.alexarchambault.sbt" % "sbt-compatibility" % "0.0.8")
-addSbtPlugin("io.github.alexarchambault.sbt" % "sbt-eviction-rules" % "0.2.0")
 addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.9.1")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
 addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 addSbtPlugin("org.scala-js" % "sbt-jsdependencies" % "1.0.2")
 addSbtPlugin("io.get-coursier" % "sbt-shading" % "2.0.1")