diff --git a/build.mill b/build.mill index bcd232ce..9587de29 100644 --- a/build.mill +++ b/build.mill @@ -26,7 +26,6 @@ object Deps { val sourcecode = ivy"com.lihaoyi::sourcecode::0.4.2" val utest = ivy"com.lihaoyi::utest::0.8.4" val expecty = ivy"com.eed3si9n.expecty::expecty::0.16.0" - val collectionCompact = ivy"org.scala-lang.modules::scala-collection-compat:2.9.0" def scalaReflect(scalaVersion: String) = ivy"org.scala-lang:scala-reflect:$scalaVersion" def scalaLibrary(version: String) = ivy"org.scala-lang:scala-library:${version}" } @@ -116,7 +115,7 @@ trait OsLibModule } trait OsModule extends OsLibModule { outer => - def ivyDeps = Agg(Deps.geny, Deps.collectionCompact) + def ivyDeps = Agg(Deps.geny) override def compileIvyDeps = T { val scalaReflectOpt = Option.when(!ZincWorkerUtil.isDottyOrScala3(scalaVersion()))( Deps.scalaReflect(scalaVersion()) diff --git a/os/src/Path.scala b/os/src/Path.scala index deb8acd7..e135c4c5 100644 --- a/os/src/Path.scala +++ b/os/src/Path.scala @@ -2,7 +2,7 @@ package os import java.net.URI import java.nio.file.Paths -import scala.jdk.CollectionConverters._ +import collection.JavaConverters._ import scala.language.implicitConversions import acyclic.skipped import os.PathError.{InvalidSegment, NonCanonicalLiteral} @@ -212,7 +212,7 @@ object BasePath { } } def chunkify(s: java.nio.file.Path) = { - import scala.jdk.CollectionConverters._ + import collection.JavaConverters._ s.iterator().asScala.map(_.toString).filter(_ != ".").filter(_ != "").toArray } } diff --git a/os/src/ProcessOps.scala b/os/src/ProcessOps.scala index 5bdc3124..6175e87c 100644 --- a/os/src/ProcessOps.scala +++ b/os/src/ProcessOps.scala @@ -1,6 +1,6 @@ package os -import scala.jdk.CollectionConverters._ +import collection.JavaConverters._ import java.lang.ProcessBuilder.Redirect import os.SubProcess.InputStream import java.io.IOException diff --git a/os/src/ReadWriteOps.scala b/os/src/ReadWriteOps.scala index cffdc86b..62b8c0be 100644 --- a/os/src/ReadWriteOps.scala +++ b/os/src/ReadWriteOps.scala @@ -56,7 +56,7 @@ object write { ) = { checker.value.onWrite(target) - import scala.jdk.CollectionConverters._ + import collection.JavaConverters._ val permArray: Array[FileAttribute[_]] = if (perms == null) Array.empty else Array(PosixFilePermissions.asFileAttribute(perms.toSet())) diff --git a/os/src/ZipOps.scala b/os/src/ZipOps.scala index 651a7adf..a1ea11a1 100644 --- a/os/src/ZipOps.scala +++ b/os/src/ZipOps.scala @@ -4,8 +4,7 @@ import java.net.URI import java.nio.file.{FileSystem, FileSystems, Files} import java.nio.file.attribute.{BasicFileAttributeView, FileTime, PosixFilePermissions} import java.util.zip.{ZipEntry, ZipFile, ZipInputStream, ZipOutputStream} -import scala.jdk.CollectionConverters._ - +import scala.collection.JavaConverters._ import scala.util.matching.Regex object zip { diff --git a/os/test/src-jvm/ZipOpJvmTests.scala b/os/test/src-jvm/ZipOpJvmTests.scala index 8ab629db..dfe4bad2 100644 --- a/os/test/src-jvm/ZipOpJvmTests.scala +++ b/os/test/src-jvm/ZipOpJvmTests.scala @@ -5,7 +5,7 @@ import utest._ import java.nio.file.attribute.FileTime import java.nio.file.{Files, Paths} import java.util.zip.ZipFile -import scala.jdk.CollectionConverters._ +import scala.collection.JavaConverters._ object ZipOpJvmTests extends TestSuite { diff --git a/os/watch/src/WatchServiceWatcher.scala b/os/watch/src/WatchServiceWatcher.scala index ec731515..39f22b3d 100644 --- a/os/watch/src/WatchServiceWatcher.scala +++ b/os/watch/src/WatchServiceWatcher.scala @@ -8,7 +8,7 @@ import java.nio.file.StandardWatchEventKinds.{ENTRY_CREATE, ENTRY_DELETE, ENTRY_ import com.sun.nio.file.{ExtendedWatchEventModifier, SensitivityWatchEventModifier} import scala.collection.mutable -import scala.jdk.CollectionConverters._ +import collection.JavaConverters._ import scala.util.Properties.isWin class WatchServiceWatcher(