Skip to content

Commit 9582eea

Browse files
smartercheeseng
authored andcommitted
Fix dotty dependencies
1 parent a389e79 commit 9582eea

File tree

3 files changed

+13
-4
lines changed

3 files changed

+13
-4
lines changed

project/DottyBuild.scala

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ trait DottyBuild { this: BuildCommons =>
1717
lazy val dottySettings = List(
1818
scalaVersion := dottyVersion,
1919
libraryDependencies := libraryDependencies.value.map(_.withDottyCompat(scalaVersion.value)),
20-
libraryDependencies --= scalaLibraries(scalaVersion.value),
2120
scalacOptions := List("-language:implicitConversions")
2221
)
2322

project/plugins.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,4 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0-M2")
1616

1717
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "0.2.0")
1818

19-
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.3")
19+
addSbtPlugin("ch.epfl.lamp" % "sbt-dotty" % "0.3.4")

project/scalatest.scala

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,12 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
142142
commonSharedSettings ++ Seq(
143143
scalaVersion := "2.13.0",
144144
crossScalaVersions := supportedScalaVersions,
145-
libraryDependencies ++= scalaLibraries(scalaVersion.value)
145+
libraryDependencies ++= {
146+
if (isDotty.value)
147+
Seq()
148+
else
149+
scalaLibraries(scalaVersion.value),
150+
}
146151
)
147152

148153
/*Seq(
@@ -152,7 +157,12 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
152157
version := releaseVersion,
153158
scalacOptions ++= Seq("-feature"),
154159
resolvers += "Sonatype Public" at "https://oss.sonatype.org/content/groups/public",
155-
libraryDependencies ++= scalaLibraries(scalaVersion.value),
160+
libraryDependencies ++= {
161+
if (isDotty.value)
162+
Seq()
163+
else
164+
scalaLibraries(scalaVersion.value),
165+
},
156166
/*publishTo <<= version { v: String =>
157167
val nexus = "https://oss.sonatype.org/"
158168
if (v.trim.endsWith("SNAPSHOT")) Some("publish-snapshots" at nexus + "content/repositories/snapshots")

0 commit comments

Comments
 (0)