Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion io/src/main/scala/sbt/internal/io/MacOSXWatchService.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import java.util.concurrent.{ ConcurrentHashMap, TimeUnit }
import sbt.io.{ Unregisterable, WatchService }

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.collection.{ immutable, mutable }
import scala.concurrent.duration._

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import sbt.nio.file.{ AnyPath, FileAttributes, FileTreeView, Glob, RecursiveGlob
import sbt.nio.file.Glob.GlobOps

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.collection.{ immutable, mutable }
import scala.concurrent.duration._

Expand Down
2 changes: 1 addition & 1 deletion io/src/main/scala/sbt/internal/nio/FileCache.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import sbt.nio.file.FileAttributes.NonExistent
import sbt.nio.file.{ AnyPath, FileAttributes, FileTreeView, Glob, RecursiveGlob }
import sbt.nio.file.Glob.{ GlobOps => GlobGlobOps }

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.collection.mutable

private[nio] class FileCache[+T](converter: Path => T, globs: mutable.Set[Glob]) {
Expand Down
2 changes: 1 addition & 1 deletion io/src/main/scala/sbt/internal/nio/FileEventMonitor.scala
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import java.util.concurrent.{ ArrayBlockingQueue, ConcurrentHashMap, TimeUnit }
import sbt.internal.nio.FileEvent.{ Creation, Deletion, Update }

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.concurrent.duration.{ Deadline => _, _ }

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import sbt.internal.nio.SwovalConverters._
import sbt.nio.file.{ FileAttributes, Glob }
import sbt.nio.file.Glob.GlobOps

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.collection.immutable.VectorBuilder
import scala.util.Properties

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import sbt.io._
import sbt.nio.file.FileAttributes.NonExistent
import sbt.nio.file.{ FileAttributes, FileTreeView, Glob }

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.concurrent.duration._

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import sbt.io._
import sbt.nio.file.{ AnyPath, Glob }

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.collection.immutable
import scala.concurrent.duration.{ Deadline => _, _ }
import scala.util.Random
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import sbt.nio.file.Glob._
import sbt.nio.file.{ AnyPath, FileAttributes, FileTreeView, Glob, RecursiveGlob }

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.concurrent.duration._
import scala.util.control.NonFatal

Expand Down
2 changes: 1 addition & 1 deletion io/src/main/scala/sbt/io/IO.scala
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import sbt.nio.file.FileTreeView

import scala.Function.tupled
import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.collection.immutable
import scala.collection.immutable.TreeSet
import scala.collection.mutable.{ HashMap, HashSet }
Expand Down
4 changes: 2 additions & 2 deletions io/src/main/scala/sbt/io/Path.scala
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import sbt.io.PathFinder.GlobPathFinder
import sbt.nio.file.{ AnyPath, FileAttributes, FileTreeView, Glob }
import sbt.nio.file.Glob.GlobOps

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.collection.mutable

final class RichFile(val asFile: File) extends AnyVal with RichNioPath {
Expand Down Expand Up @@ -599,7 +599,7 @@ private abstract class PathFinderImpl extends PathFinder {
* If the filesystem changes, two calls to this method might be different.
*/
override final def get(): Seq[File] = {
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
val pathSet: mutable.Set[File] = new java.util.LinkedHashSet[File].asScala
addTo(pathSet)
pathSet.toSeq
Expand Down
2 changes: 1 addition & 1 deletion io/src/main/scala/sbt/io/WatchService.scala
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import java.util.concurrent.TimeUnit
import sbt.internal.nio

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.collection.{ immutable, mutable }
import scala.concurrent.duration.{ Duration, FiniteDuration }
import scala.util.Properties
Expand Down
2 changes: 1 addition & 1 deletion io/src/main/scala/sbt/nio/file/FileTreeView.scala
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import sbt.nio.file.Glob.GlobOps
import sbt.nio.file.Glob.Root

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._

/**
* Provides a view into the file system that allows retrieval of the children of a particular path.
Expand Down
2 changes: 1 addition & 1 deletion io/src/main/scala/sbt/nio/file/Glob.scala
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import sbt.nio.file.PathFilter.PathFilterExtensions
import sbt.nio.file.RelativeGlob.{ PathComponent, SingleComponentMatcher }

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.util.Properties
import scala.util.matching.Regex

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import sbt.io._
import sbt.nio.file._
import sbt.nio.file.syntax._

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.concurrent.duration._

class WatchServiceBackedObservableSpec extends AnyFlatSpec {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import sbt.io.IO
import sbt.nio.file.syntax.pathToPathOps
import sbt.nio.file.{ AnyPath, FileAttributes, Glob, RecursiveGlob }

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.concurrent.duration._

object FileTreeRepositorySpec {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import sbt.internal.io.MacOSXWatchService
import sbt.io.{ IO, WatchService }

import scala.annotation.tailrec
import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._
import scala.concurrent.duration.{ Deadline => SDeadline, _ }
import scala.util.Properties

Expand Down
2 changes: 1 addition & 1 deletion io/src/test/scala/sbt/nio/GlobOrderingSpec.scala
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import sbt.nio.file.RelativeGlob.Matcher
import sbt.nio.file._
import sbt.nio.file.syntax._

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._

class GlobOrderingSpec extends AnyFlatSpec {
"Globs" should "be ordered" in IO.withTemporaryDirectory { dir =>
Expand Down
2 changes: 1 addition & 1 deletion io/src/test/scala/sbt/nio/TestHelpers.scala
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ package sbt.nio

import java.nio.file.FileSystems

import scala.collection.JavaConverters._
import scala.jdk.CollectionConverters._

object TestHelpers {
val root = FileSystems.getDefault.getRootDirectories.asScala.head
Expand Down