Merge pull request #231 from eatkins/private-sbt

Private sbt
sbt · Mar 21, 2019 · c2668e7 · c2668e7
2 parents 0ae8142 + daaca44
commit c2668e7
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 13 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,7 +10,7 @@ matrix:
   include:
    - scala: 2.12.8
      env:
-         CMD="mimaReportBinaryIssues scalafmtCheck test whitesourceCheckPolicies"
+         CMD="mimaReportBinaryIssues scalafmtCheck test whitesourceCheckPolicies doc"
          TRAVIS_SCALA_VERSION=2.12.8
      os: linux
      dist: trusty

diff --git a/io/src/main/scala/sbt/internal/io/SourceModificationWatch.scala b/io/src/main/scala/sbt/internal/io/SourceModificationWatch.scala
@@ -176,7 +176,6 @@ private[sbt] class NewWatchState(private[sbt] val globs: mutable.Set[Glob],
  * @param excludeFilter Filter to apply to determine whether to ignore a file.
  * @param recursive     Whether the lists is recursive or immediate children.
  */
-@deprecated("Source has been replaced by glob", "1.3.0")
 final class Source(
     val base: File,
     val includeFilter: FileFilter,

diff --git a/io/src/main/scala/sbt/io/FileEventMonitor.scala b/io/src/main/scala/sbt/io/FileEventMonitor.scala
@@ -20,10 +20,10 @@ import scala.collection.JavaConverters._
 import scala.concurrent.duration._
 
 /**
- * Provides a blocking interface for awaiting events from an [[FileTreeDataView.Observable]].
+ * Provides a blocking interface for awaiting file events.
  * @tparam T the type of [[FileTreeDataView.Entry.value]] instances
  */
-trait FileEventMonitor[+T] extends AutoCloseable {
+private[sbt] trait FileEventMonitor[+T] extends AutoCloseable {
 
   /**
    * Block for the specified duration until an event is emitted or a timeout occurs.
@@ -32,7 +32,7 @@ trait FileEventMonitor[+T] extends AutoCloseable {
    */
   def poll(duration: Duration): Seq[FileEventMonitor.Event[T]]
 }
-object FileEventMonitor {
+private[sbt] object FileEventMonitor {
   sealed trait Event[+T] {
     def entry: Entry[T]
     def occurredAt: Deadline
@@ -73,8 +73,8 @@ object FileEventMonitor {
     override def hashCode(): Int = entry.hashCode()
   }
 
-  def apply[T](observable: Observable[T],
-               logger: WatchLogger = NullWatchLogger): FileEventMonitor[T] =
+  private[sbt] def apply[T](observable: Observable[T],
+                            logger: WatchLogger = NullWatchLogger): FileEventMonitor[T] =
     new FileEventMonitorImpl[T](observable, logger)
 
   /**
@@ -100,11 +100,11 @@ object FileEventMonitor {
    * @tparam T the generic type for the [[FileTreeDataView.Observable]] that we're monitoring
    * @return the [[FileEventMonitor]] instance.
    */
-  def antiEntropy[T](observable: Observable[T],
-                     period: FiniteDuration,
-                     logger: WatchLogger,
-                     quarantinePeriod: FiniteDuration,
-                     retentionPeriod: FiniteDuration): FileEventMonitor[T] = {
+  private[sbt] def antiEntropy[T](observable: Observable[T],
+                                  period: FiniteDuration,
+                                  logger: WatchLogger,
+                                  quarantinePeriod: FiniteDuration,
+                                  retentionPeriod: FiniteDuration): FileEventMonitor[T] = {
     new AntiEntropyFileEventMonitor(period,
                                     new FileEventMonitorImpl[T](observable, logger),
                                     logger,

diff --git a/io/src/main/scala/sbt/io/Glob.scala b/io/src/main/scala/sbt/io/Glob.scala
@@ -188,7 +188,7 @@ object Glob {
    * @param t the collection of [[Glob]]s
    * @tparam T the generic collection type
    */
-  implicit class TraversableGlobOps[T <: Traversable[Glob]](val t: T) extends AnyVal {
+  private[sbt] implicit class TraversableGlobOps[T <: Traversable[Glob]](val t: T) extends AnyVal {
 
     /**
      * Returns a [[FileFilter]] that accepts a file if any glob in the collection accepts the file.