File tree Expand file tree Collapse file tree 3 files changed +13
-4
lines changed Expand file tree Collapse file tree 3 files changed +13
-4
lines changed Original file line number Diff line number Diff line change @@ -17,7 +17,6 @@ trait DottyBuild { this: BuildCommons =>
17
17
lazy val dottySettings = List (
18
18
scalaVersion := dottyVersion,
19
19
libraryDependencies := libraryDependencies.value.map(_.withDottyCompat(scalaVersion.value)),
20
- libraryDependencies --= scalaLibraries(scalaVersion.value),
21
20
scalacOptions := List (" -language:implicitConversions" )
22
21
)
23
22
Original file line number Diff line number Diff line change @@ -16,4 +16,4 @@ addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.4.0-M2")
16
16
17
17
addSbtPlugin(" com.typesafe" % " sbt-mima-plugin" % " 0.2.0" )
18
18
19
- addSbtPlugin(" ch.epfl.lamp" % " sbt-dotty" % " 0.3.3 " )
19
+ addSbtPlugin(" ch.epfl.lamp" % " sbt-dotty" % " 0.3.4 " )
Original file line number Diff line number Diff line change @@ -142,7 +142,12 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
142
142
commonSharedSettings ++ Seq (
143
143
scalaVersion := " 2.13.0" ,
144
144
crossScalaVersions := supportedScalaVersions,
145
- libraryDependencies ++= scalaLibraries(scalaVersion.value)
145
+ libraryDependencies ++= {
146
+ if (isDotty.value)
147
+ Seq ()
148
+ else
149
+ scalaLibraries(scalaVersion.value),
150
+ }
146
151
)
147
152
148
153
/* Seq(
@@ -152,7 +157,12 @@ object ScalatestBuild extends BuildCommons with DottyBuild with NativeBuild with
152
157
version := releaseVersion,
153
158
scalacOptions ++= Seq("-feature"),
154
159
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
+ },
156
166
/* publishTo <<= version { v: String =>
157
167
val nexus = "https://oss.sonatype.org/"
158
168
if (v.trim.endsWith("SNAPSHOT")) Some("publish-snapshots" at nexus + "content/repositories/snapshots")
You can’t perform that action at this time.
0 commit comments