Skip to content

Commit 4128e57

Browse files
committed
Remove sbt-dotty plugin, no longer needed
1 parent a18274a commit 4128e57

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

build.sbt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ lazy val proto = (crossProject(JSPlatform, JVMPlatform)
4444
scala213Version
4545
),
4646
libraryDependencies -= ("com.thesamet.scalapb" %%% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion),
47-
libraryDependencies += ("com.thesamet.scalapb" %%% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion).withDottyCompat(scalaVersion.value),
47+
libraryDependencies += ("com.thesamet.scalapb" %%% "scalapb-runtime" % scalapb.compiler.Version.scalapbVersion).cross(CrossVersion.for3Use2_13),
4848
PB.targets in Compile := Seq(
4949
scalapb.gen() -> (sourceManaged in Compile).value
5050
),
@@ -73,7 +73,7 @@ lazy val backends = (crossProject(JVMPlatform, JSPlatform)
7373
"Main.scala" | "ONNXJSOperatorBackend.scala"
7474
}
7575
),
76-
scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
76+
// scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
7777
libraryDependencies ++= Seq(
7878
"com.microsoft.onnxruntime" % "onnxruntime" % "1.7.0"
7979
),
@@ -98,7 +98,7 @@ lazy val core = (crossProject(JSPlatform, JVMPlatform)
9898
.settings(
9999
commonSettings,
100100
name := "onnx-scala",
101-
scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
101+
// scalacOptions ++= { if (isDotty.value) Seq("-source:3.0-migration") else Nil },
102102
excludeFilter in unmanagedSources := (CrossVersion
103103
.partialVersion(scalaVersion.value) match {
104104
case Some((2, 13)) => "ONNX.scala" | "OpToONNXBytesConverter.scala" | "Tensors.scala" | "ONNXBytesDataSource.scala"
@@ -117,7 +117,7 @@ lazy val core = (crossProject(JSPlatform, JVMPlatform)
117117
)
118118
case _ =>
119119
Seq(
120-
("org.typelevel" %%% "spire" % spireVersion).withDottyCompat(dottyVersion),
120+
("org.typelevel" %%% "spire" % spireVersion).cross(CrossVersion.for3Use2_13),
121121
)
122122
})
123123
)

project/plugins.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.0.0")
22
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.0.0")
33
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.5.1")
44
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0")
5-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.5.4")
65
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.9.27")
76
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
87
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")

0 commit comments

Comments
 (0)