Skip to content

Commit 3d46cfa

Browse files
olafurpgjulienrf
authored andcommitted
Depend on collections project in output.
1 parent 29cf22b commit 3d46cfa

File tree

3 files changed

+18
-6
lines changed

3 files changed

+18
-6
lines changed

build.sbt

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
// Use a scala version supported by scalafix.
22
scalaVersion in ThisBuild := org.scalameta.BuildInfo.supportedScalaVersions.last
33

4-
lazy val root = project.aggregate(rewrites, input, output, tests)
4+
lazy val root = project
5+
.in(file("."))
6+
.aggregate(rewrites, input, output, tests)
57

68
lazy val rewrites = project.settings(
79
libraryDependencies += "ch.epfl.scala" %% "scalafix-core" % "0.4.2"
@@ -11,7 +13,17 @@ lazy val input = project.settings(
1113
scalametaSourceroot := sourceDirectory.in(Compile).value
1214
)
1315

16+
val collections = ProjectRef(file(".."), "collections")
17+
1418
lazy val output = project
19+
.settings(
20+
resolvers := resolvers.in(collections).value,
21+
libraryDependencies := libraryDependencies.in(collections).value,
22+
scalaVersion := scalaVersion.in(collections).value,
23+
scalaBinaryVersion := scalaBinaryVersion.in(collections).value
24+
)
25+
.dependsOn(collections) // collections/publishLocal is still necessary.
26+
.disablePlugins(ScalahostSbtPlugin)
1527

1628
lazy val tests = project
1729
.settings(

output/src/main/scala/fix/Collectionstrawman_v0.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package fix
22

33
import scala.{ List => _, Nil => _, Seq => _, Vector => _, :: => _, #:: => _ }
4-
import scala.Predef.{ Map => _, augmentString => _, intArrayOps => _ }
4+
import scala.Predef.{ Map => _, augmentString => _, intArrayOps => _, ArrowAssoc, charWrapper}
55
import strawman.collection.{ stringToStringOps, arrayToArrayOps }
6-
import strawman.collection.immutable.{ LazyList, List, Map, Nil, Range, Seq, Vector, :: }
6+
import strawman.collection.immutable.{ LazyList, List, Map, Nil, Range, Seq, :: }
77
import strawman.collection.immutable.LazyList.#::
88

99
object Collectionstrawman_v0_List {
@@ -18,8 +18,8 @@ object Collectionstrawman_v0_List {
1818
object Collectionstrawman_v0_Stream {
1919
LazyList(1, 2, 3)
2020
1 #:: 2 #:: 3 #:: LazyList.Empty
21-
val isEmpty: Stream[_] => Boolean = {
22-
case Stream.Empty => true
21+
val isEmpty: LazyList[_] => Boolean = {
22+
case LazyList.Empty => true
2323
case x #:: xs => false
2424
}
2525
}

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.13
1+
sbt.version=0.13.15

0 commit comments

Comments
 (0)