Skip to content

Commit 1d1ff79

Browse files
committed
Revert "Use scala jdk converters."
This reverts commit 209e814.
1 parent 8d1b677 commit 1d1ff79

File tree

7 files changed

+8
-10
lines changed

7 files changed

+8
-10
lines changed

build.mill

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ 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"
3029
def scalaReflect(scalaVersion: String) = ivy"org.scala-lang:scala-reflect:$scalaVersion"
3130
def scalaLibrary(version: String) = ivy"org.scala-lang:scala-library:${version}"
3231
}
@@ -116,7 +115,7 @@ trait OsLibModule
116115
}
117116

118117
trait OsModule extends OsLibModule { outer =>
119-
def ivyDeps = Agg(Deps.geny, Deps.collectionCompact)
118+
def ivyDeps = Agg(Deps.geny)
120119
override def compileIvyDeps = T {
121120
val scalaReflectOpt = Option.when(!ZincWorkerUtil.isDottyOrScala3(scalaVersion()))(
122121
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 scala.jdk.CollectionConverters._
5+
import collection.JavaConverters._
66
import scala.language.implicitConversions
77
import acyclic.skipped
88
import os.PathError.{InvalidSegment, NonCanonicalLiteral}
@@ -212,7 +212,7 @@ object BasePath {
212212
}
213213
}
214214
def chunkify(s: java.nio.file.Path) = {
215-
import scala.jdk.CollectionConverters._
215+
import collection.JavaConverters._
216216
s.iterator().asScala.map(_.toString).filter(_ != ".").filter(_ != "").toArray
217217
}
218218
}

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

os/src/ZipOps.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@ 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.jdk.CollectionConverters._
8-
7+
import scala.collection.JavaConverters._
98
import scala.util.matching.Regex
109

1110
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.jdk.CollectionConverters._
8+
import scala.collection.JavaConverters._
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 scala.jdk.CollectionConverters._
11+
import collection.JavaConverters._
1212
import scala.util.Properties.isWin
1313

1414
class WatchServiceWatcher(

0 commit comments

Comments
 (0)