Remove sbt-dotty plugin, no longer needed

EmergentOrder · Apr 14, 2021 · 4128e57 · 4128e57
1 parent a18274a
commit 4128e57
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/build.sbt b/build.sbt
@@ -44,7 +44,7 @@ lazy val proto = (crossProject(JSPlatform, JVMPlatform)
       scala213Version
     ),
     libraryDependencies -= ("com.thesamet.scalapb" %%% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion),
-    libraryDependencies += ("com.thesamet.scalapb" %%% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion).withDottyCompat(scalaVersion.value),
+    libraryDependencies += ("com.thesamet.scalapb" %%% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion).cross(CrossVersion.for3Use2_13),
   PB.targets in Compile := Seq(
       scalapb.gen() -> (sourceManaged in Compile).value
     ),
@@ -73,7 +73,7 @@ lazy val backends = (crossProject(JVMPlatform, JSPlatform)
                             "Main.scala" | "ONNXJSOperatorBackend.scala" 
       }
     ),
-    scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
+//    scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
     libraryDependencies ++= Seq(
         "com.microsoft.onnxruntime" % "onnxruntime" % "1.7.0"
     ),
@@ -98,7 +98,7 @@ lazy val core = (crossProject(JSPlatform, JVMPlatform)
   .settings(
     commonSettings,
     name := "onnx-scala",
-    scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
+//    scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
     excludeFilter in unmanagedSources := (CrossVersion
       .partialVersion(scalaVersion.value) match {
       case Some((2, 13)) => "ONNX.scala" | "OpToONNXBytesConverter.scala" | "Tensors.scala" | "ONNXBytesDataSource.scala"
@@ -117,7 +117,7 @@ lazy val core = (crossProject(JSPlatform, JVMPlatform)
         )
       case _ =>
         Seq(
-          ("org.typelevel" %%% "spire" % spireVersion).withDottyCompat(dottyVersion),
+          ("org.typelevel" %%% "spire" % spireVersion).cross(CrossVersion.for3Use2_13),
         )
     })
 )

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -2,7 +2,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
 addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
 addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
 addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0")
-addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4")
 addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27")
 addSbtPlugin("org.scalameta" % "sbt-scalafmt" %  "2.4.2")
 addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")