From 2e2296fc47453785dd5a3e3ca3086584ea290194 Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 5 Nov 2018 21:35:31 +0800 Subject: fix assembly path handling, swap out Jvm.scala's custom subprocess handling with os.proc --- integration/test/resources/caffeine/build.sc | 2 +- integration/test/resources/play-json/jmh.sc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'integration') 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( -- cgit v1.2.3