diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2019-05-19 15:15:24 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-19 15:15:24 +0800 |
| commit | 68505aad4a22686594965bc910e60c8d2b6a95d4 (patch) | |
| tree | 4c2099e21593a840c7119901becc0cbb8682956f /scalanativelib | |
| parent | 7d706641f6f9caa0509903f691d16d78402b4623 (diff) | |
| download | mill-68505aad4a22686594965bc910e60c8d2b6a95d4.tar.gz mill-68505aad4a22686594965bc910e60c8d2b6a95d4.tar.bz2 mill-68505aad4a22686594965bc910e60c8d2b6a95d4.zip | |
Bump ammonite to 1.6.7 (#610)
* bump ammonite to 1.6.7
* upgrade all the things
* add scalaj-http shims for bootstrapping
* wip
* tweak-error-message
* tweak coursier
* .
Diffstat (limited to 'scalanativelib')
| -rw-r--r-- | scalanativelib/src/ScalaNativeModule.scala | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/scalanativelib/src/ScalaNativeModule.scala b/scalanativelib/src/ScalaNativeModule.scala index 38525032..b04b00a1 100644 --- a/scalanativelib/src/ScalaNativeModule.scala +++ b/scalanativelib/src/ScalaNativeModule.scala @@ -3,7 +3,6 @@ package scalanativelib import java.net.URLClassLoader -import coursier.Cache import coursier.maven.MavenRepository import mill.define.{Target, Task} import mill.api.Result @@ -50,7 +49,7 @@ trait ScalaNativeModule extends ScalaModule { outer => Result.Success(Agg(workerPath.split(',').map(p => PathRef(os.Path(p), quick = true)): _*)) else Lib.resolveDependencies( - Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")), + Seq(coursier.LocalRepositories.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")), Lib.depToDependency(_, "2.12.4", ""), Seq(ivy"com.lihaoyi::mill-scalanativelib-worker-${scalaNativeBinaryVersion()}:${sys.props("MILL_VERSION")}"), ctx = Some(implicitly[mill.util.Ctx.Log]) @@ -82,7 +81,7 @@ trait ScalaNativeModule extends ScalaModule { outer => def bridgeFullClassPath = T { Lib.resolveDependencies( - Seq(Cache.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")), + Seq(coursier.LocalRepositories.ivy2Local, MavenRepository("https://repo1.maven.org/maven2")), Lib.depToDependency(_, scalaVersion(), platformSuffix()), toolsIvyDeps(), ctx = Some(implicitly[mill.util.Ctx.Log]) @@ -202,7 +201,7 @@ trait TestScalaNativeModule extends ScalaNativeModule with TestModule { testOute Lib.resolveDependencies( repositories, Lib.depToDependency(_, scalaVersion(), ""), - transitiveIvyDeps().filter(d => d.cross.isBinary && supportedTestFrameworks(d.dep.module.name)), + transitiveIvyDeps().filter(d => d.cross.isBinary && supportedTestFrameworks(d.dep.module.name.value)), ctx = Some(implicitly[mill.util.Ctx.Log]) ) } |