Skip to content

Commit 775474b

Browse files
committed
Merge pull request #27 from retronym/ticket/26
Ensure scala.concurrent.java8._ is packaged
2 parents 1b11542 + 274d49e commit 775474b

File tree

1 file changed

+3
-1
lines changed

1 file changed

+3
-1
lines changed

build.sbt

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ scalaModuleOsgiSettings
1919

2020
OsgiKeys.exportPackage := Seq(s"scala.compat.java8.*;version=${version.value}")
2121

22+
OsgiKeys.privatePackage := List("scala.concurrent.java8.*")
23+
2224
libraryDependencies += "junit" % "junit" % "4.11" % "test"
2325

2426
libraryDependencies += "com.novocode" % "junit-interface" % "0.10" % "test"
@@ -96,6 +98,6 @@ initialCommands :=
9698
"""|import scala.concurrent._
9799
|import ExecutionContext.Implicits.global
98100
|import java.util.concurrent.{CompletionStage,CompletableFuture}
99-
|import scala.concurrent.java8.FutureConverter._
101+
|import scala.compat.java8.FutureConverter._
100102
|""".stripMargin
101103

0 commit comments

Comments
 (0)