From 4128e5702712610636831668c2ab8194413df307 Mon Sep 17 00:00:00 2001 From: Alex Merritt Date: Wed, 14 Apr 2021 09:35:30 -0400 Subject: [PATCH] Remove sbt-dotty plugin, no longer needed --- build.sbt | 8 ++++---- project/plugins.sbt | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.sbt b/build.sbt index e907d767..30958e67 100755 --- 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 index 0dd6a8bc..dd284efc 100755 --- 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")