diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-11-05 21:35:31 +0800 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-11-05 23:31:01 +0800 |
| commit | 2e2296fc47453785dd5a3e3ca3086584ea290194 (patch) | |
| tree | 73c2a08f1d2197abb3b7cf3332489768747bc41c /integration | |
| parent | bc9dc386625021fec517f2dbf0644ccafe1e32c2 (diff) | |
| download | mill-2e2296fc47453785dd5a3e3ca3086584ea290194.tar.gz mill-2e2296fc47453785dd5a3e3ca3086584ea290194.tar.bz2 mill-2e2296fc47453785dd5a3e3ca3086584ea290194.zip | |
fix assembly path handling, swap out Jvm.scala's custom subprocess handling with os.proc
Diffstat (limited to 'integration')
| -rw-r--r-- | integration/test/resources/caffeine/build.sc | 2 | ||||
| -rw-r--r-- | integration/test/resources/play-json/jmh.sc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/integration/test/resources/caffeine/build.sc b/integration/test/resources/caffeine/build.sc index a4967f31..3defeb50 100644 --- a/integration/test/resources/caffeine/build.sc +++ b/integration/test/resources/caffeine/build.sc @@ -44,7 +44,7 @@ object caffeine extends CaffeineModule { "com.github.benmanes.caffeine.cache.NodeFactoryGenerator", "com.github.benmanes.caffeine.cache.LocalCacheFactoryGenerator", ) - for(mainCls <- mains) Jvm.interactiveSubprocess( + for(mainCls <- mains) Jvm.runSubprocess( mainCls, javaPoet.runClasspath().map(_.path), javaPoet.forkArgs(), diff --git a/integration/test/resources/play-json/jmh.sc b/integration/test/resources/play-json/jmh.sc index 3c2c8411..d67e14d1 100644 --- a/integration/test/resources/play-json/jmh.sc +++ b/integration/test/resources/play-json/jmh.sc @@ -7,7 +7,7 @@ trait Jmh extends ScalaModule { def runJmh(args: String*) = T.command { val (_, resources) = generateBenchmarkSources() - Jvm.interactiveSubprocess( + Jvm.runSubprocess( "org.openjdk.jmh.Main", classPath = (runClasspath() ++ generatorDeps()).map(_.path) ++ Seq(compileGeneratedSources().path, resources), @@ -41,7 +41,7 @@ trait Jmh extends ScalaModule { os.remove.all(resourcesDir) os.makeDir.all(resourcesDir) - Jvm.subprocess( + Jvm.runSubprocess( "org.openjdk.jmh.generators.bytecode.JmhBytecodeGenerator", (runClasspath() ++ generatorDeps()).map(_.path), mainArgs = Array( |