Skip to content

Commit 209e814

Browse files
committed
Use scala jdk converters.
1 parent 304997f commit 209e814

File tree

7 files changed

+10
-8
lines changed

7 files changed

+10
-8
lines changed

build.mill

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ object Deps {
2626
val sourcecode = ivy"com.lihaoyi::sourcecode::0.4.2"
2727
val utest = ivy"com.lihaoyi::utest::0.8.4"
2828
val expecty = ivy"com.eed3si9n.expecty::expecty::0.16.0"
29+
val collectionCompact = ivy"org.scala-lang.modules::scala-collection-compat:2.9.0"
2930
def scalaReflect(scalaVersion: String) = ivy"org.scala-lang:scala-reflect:$scalaVersion"
3031
def scalaLibrary(version: String) = ivy"org.scala-lang:scala-library:${version}"
3132
}
@@ -115,7 +116,7 @@ trait OsLibModule
115116
}
116117

117118
trait OsModule extends OsLibModule { outer =>
118-
def ivyDeps = Agg(Deps.geny)
119+
def ivyDeps = Agg(Deps.geny, Deps.collectionCompact)
119120
override def compileIvyDeps = T {
120121
val scalaReflectOpt = Option.when(!ZincWorkerUtil.isDottyOrScala3(scalaVersion()))(
121122
Deps.scalaReflect(scalaVersion())

os/src/Path.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package os
22

33
import java.net.URI
44
import java.nio.file.Paths
5-
import collection.JavaConverters._
5+
import scala.jdk.CollectionConverters._
66
import scala.language.implicitConversions
77
import acyclic.skipped
88
import os.PathError.{InvalidSegment, NonCanonicalLiteral}
@@ -205,7 +205,7 @@ object BasePath {
205205
}
206206
}
207207
def chunkify(s: java.nio.file.Path) = {
208-
import collection.JavaConverters._
208+
import scala.jdk.CollectionConverters._
209209
s.iterator().asScala.map(_.toString).filter(_ != ".").filter(_ != "").toArray
210210
}
211211
}

os/src/ProcessOps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package os
22

3-
import collection.JavaConverters._
3+
import scala.jdk.CollectionConverters._
44
import java.lang.ProcessBuilder.Redirect
55
import os.SubProcess.InputStream
66
import java.io.IOException

os/src/ReadWriteOps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ object write {
5656
) = {
5757
checker.value.onWrite(target)
5858

59-
import collection.JavaConverters._
59+
import scala.jdk.CollectionConverters._
6060
val permArray: Array[FileAttribute[_]] =
6161
if (perms == null) Array.empty
6262
else Array(PosixFilePermissions.asFileAttribute(perms.toSet()))

os/src/ZipOps.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ import java.net.URI
44
import java.nio.file.{FileSystem, FileSystems, Files}
55
import java.nio.file.attribute.{BasicFileAttributeView, FileTime, PosixFilePermissions}
66
import java.util.zip.{ZipEntry, ZipFile, ZipInputStream, ZipOutputStream}
7-
import scala.collection.JavaConverters._
7+
import scala.jdk.CollectionConverters._
8+
89
import scala.util.matching.Regex
910

1011
object zip {

os/test/src-jvm/ZipOpJvmTests.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import utest._
55
import java.nio.file.attribute.FileTime
66
import java.nio.file.{Files, Paths}
77
import java.util.zip.ZipFile
8-
import scala.collection.JavaConverters._
8+
import scala.jdk.CollectionConverters._
99

1010
object ZipOpJvmTests extends TestSuite {
1111

os/watch/src/WatchServiceWatcher.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import java.nio.file.StandardWatchEventKinds.{ENTRY_CREATE, ENTRY_DELETE, ENTRY_
88
import com.sun.nio.file.{ExtendedWatchEventModifier, SensitivityWatchEventModifier}
99

1010
import scala.collection.mutable
11-
import collection.JavaConverters._
11+
import scala.jdk.CollectionConverters._
1212
import scala.util.Properties.isWin
1313

1414
class WatchServiceWatcher(

0 commit comments

Comments
 (0)