diff options
| author | rockjam <5min4eq.unity@gmail.com> | 2018-03-24 21:35:20 +0300 |
|---|---|---|
| committer | rockjam <5min4eq.unity@gmail.com> | 2018-03-24 21:35:38 +0300 |
| commit | e6da142ffcaaea55043a1417796a1f032371ee64 (patch) | |
| tree | 54a93a786d8191bea3db409375522c2076c2f91f /scalalib/test | |
| parent | 3f4195a5f06c655647cd00edfbfe3bc3c2e20f83 (diff) | |
| download | mill-e6da142ffcaaea55043a1417796a1f032371ee64.tar.gz mill-e6da142ffcaaea55043a1417796a1f032371ee64.tar.bz2 mill-e6da142ffcaaea55043a1417796a1f032371ee64.zip | |
use Cache.default to determine coursier location(fixes tests on my OS X)
Diffstat (limited to 'scalalib/test')
3 files changed, 4 insertions, 5 deletions
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4-sources.jar.xml index 77b85e64..e8af8eb1 100644 --- a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4-sources.jar.xml +++ b/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4-sources.jar.xml @@ -1,7 +1,7 @@ <component name="libraryTable"> <library name="scala-library-2.12.4-sources.jar" type="Scala"> <CLASSES> - <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar!/"/> + <root url="jar://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar!/"/> </CLASSES> </library> </component> diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml index 27d4e19f..d45f3206 100644 --- a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml +++ b/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml @@ -1,7 +1,7 @@ <component name="libraryTable"> <library name="scala-library-2.12.4.jar" type="Scala"> <CLASSES> - <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar!/"/> + <root url="jar://COURSIER_HOME/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar!/"/> </CLASSES> </library> </component> diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala index 0ce9533f..0f776802 100644 --- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala +++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala @@ -1,8 +1,8 @@ package mill.scalalib import ammonite.ops._ +import coursier.Cache import mill._ -import mill.define.Discover import mill.util.{TestEvaluator, TestUtil} import utest._ @@ -54,8 +54,7 @@ object GenIdeaTests extends TestSuite { } - private val libPathRegex = """([\w/]+)/.coursier""".r private def normaliseLibraryPaths(in: String): String = { - libPathRegex.replaceAllIn(in, "COURSIER_HOME") + in.replaceAll(Cache.default.toPath.toAbsolutePath.toString, "COURSIER_HOME") } } |