diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-03-25 18:08:07 -0700 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-03-25 18:08:07 -0700 |
commit | b659cb97f58a3d7be641f94885c940375b1aa23f (patch) | |
tree | 3d3b6a49ec1dac104c01de824dc217a88c0391de /scalalib | |
parent | 664686bf91b076a47efc4ac8c4928f599293ee3b (diff) | |
parent | f45f11b88fe00ea6fecb44e7da0aadbfffd01b25 (diff) | |
download | mill-b659cb97f58a3d7be641f94885c940375b1aa23f.tar.gz mill-b659cb97f58a3d7be641f94885c940375b1aa23f.tar.bz2 mill-b659cb97f58a3d7be641f94885c940375b1aa23f.zip |
Merge branch 'master' of github.com:lihaoyi/mill
Diffstat (limited to 'scalalib')
5 files changed, 13 insertions, 7 deletions
diff --git a/scalalib/src/mill/scalalib/ScalaModule.scala b/scalalib/src/mill/scalalib/ScalaModule.scala index 0a72f4c8..a2ca2214 100644 --- a/scalalib/src/mill/scalalib/ScalaModule.scala +++ b/scalalib/src/mill/scalalib/ScalaModule.scala @@ -235,7 +235,7 @@ trait ScalaModule extends mill.Module with TaskModule { outer => if (files.nonEmpty) subprocess( "scala.tools.nsc.ScalaDoc", - scalaCompilerClasspath().map(_.path) ++ runClasspath().filter(_.path.ext != "pom").map(_.path), + scalaCompilerClasspath().map(_.path) ++ compileClasspath().filter(_.path.ext != "pom").map(_.path), mainArgs = (files ++ options).toSeq ) 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/resources/hello-world/core/src/Main.scala b/scalalib/test/resources/hello-world/core/src/Main.scala index 32706d44..d86f4da8 100644 --- a/scalalib/test/resources/hello-world/core/src/Main.scala +++ b/scalalib/test/resources/hello-world/core/src/Main.scala @@ -1,5 +1,8 @@ import scala.collection._ import java.nio.file.{Files, Paths} +import java.sql.Date +import java.time.LocalDate +import javax.swing.JButton import Main.{args, greeting} object Main0{ @@ -10,7 +13,11 @@ object Main0{ } } object Main extends App { - + // testing correct loading of java standard modules in java 9 + // https://github.com/lihaoyi/mill/issues/251 + new JButton("hello from javax") + val now = Date.valueOf(LocalDate.now()) + println(s"Today is the date: ${now}") val person = Person.fromString("rockjam:25") val greeting = s"hello ${person.name}, your age is: ${person.age}" println(greeting) 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") } } |