File tree 4 files changed +10
-411
lines changed
4 files changed +10
-411
lines changed Original file line number Diff line number Diff line change @@ -35,6 +35,7 @@ object Deps {
35
35
val acyclic = ivy " com.lihaoyi:::acyclic:0.3.6 "
36
36
val jna = ivy " net.java.dev.jna:jna:5.13.0 "
37
37
val geny = ivy " com.lihaoyi::geny::1.0.0 "
38
+ val scalaCollectionCompat = ivy " org.scala-lang.modules::scala-collection-compat::2.9.0 "
38
39
val sourcecode = ivy " com.lihaoyi::sourcecode::0.3.0 "
39
40
val utest = ivy " com.lihaoyi::utest::0.8.1 "
40
41
def scalaLibrary (version : String ) = ivy " org.scala-lang:scala-library: ${version}"
@@ -173,9 +174,13 @@ trait OsLibTestModule extends ScalaModule with TestModule.Utest with SafeDeps {
173
174
174
175
trait OsModule extends OsLibModule {
175
176
override def artifactName = " os-lib"
176
- override def ivyDeps = Agg (
177
- Deps .geny
178
- )
177
+ override def ivyDeps = T {
178
+ val scalaV = scalaVersion()
179
+ if (scalaV.startsWith(" 2.11" ) || scalaV.startsWith(" 2.12" )) {
180
+ // include collection compat, mostly for a backported scala.util.Using
181
+ Agg (Deps .geny, Deps .scalaCollectionCompat)
182
+ } else Agg (Deps .geny)
183
+ }
179
184
}
180
185
181
186
trait WatchModule extends OsLibModule {
Original file line number Diff line number Diff line change 1
1
package os
2
2
3
3
import java .nio .file .attribute .{FileAttribute , PosixFilePermissions }
4
- import os .util .Using
4
+ import scala .util .Using
5
5
6
6
/**
7
7
* Create temporary files and directories. [[withFile ]] and [[withDir ]]
You can’t perform that action at this time.
0 commit comments