From aa98bac27cfce0eec675ab6d3b84152a79701475 Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 24 Oct 2017 16:30:46 +0200 Subject: [PATCH 1/2] Include dottyLib when custom -classpath is added --- project/Build.scala | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index d3ee4f0d01a0..374fd6950e6f 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -518,8 +518,8 @@ object Build { val args: Seq[String] = spaceDelimited("").parsed val fullArgs = args.span(_ != "-classpath") match { - case (beforeCp, Nil) => beforeCp ++ ("-classpath" :: dottyLib :: Nil) - case (beforeCp, rest) => beforeCp ++ rest + case (beforeCp, "-classpath" :: cp :: rest) => beforeCp ++ List("-classpath", cp + ":" + dottyLib) ++ rest + case (beforeCp, _) => beforeCp ++ ("-classpath" :: dottyLib :: Nil) } (runMain in Compile).toTask( @@ -533,8 +533,8 @@ object Build { val args: Seq[String] = spaceDelimited("").parsed val fullArgs = args.span(_ != "-classpath") match { - case (beforeCp, Nil) => beforeCp ++ ("-classpath" :: dottyLib :: Nil) - case (beforeCp, rest) => beforeCp ++ rest + case (beforeCp, "-classpath" :: cp :: rest) => beforeCp ++ List("-classpath", cp + ":" + dottyLib) ++ rest + case (beforeCp, _) => beforeCp ++ ("-classpath" :: dottyLib :: Nil) } (runMain in Compile).toTask( From 5b43c65a90ae2836b092fb7a825c0c8b54837fcb Mon Sep 17 00:00:00 2001 From: Nicolas Stucki Date: Tue, 24 Oct 2017 17:19:32 +0200 Subject: [PATCH 2/2] Use List(...) syntax --- project/Build.scala | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 374fd6950e6f..3ee7eba76bfe 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -519,7 +519,7 @@ object Build { val fullArgs = args.span(_ != "-classpath") match { case (beforeCp, "-classpath" :: cp :: rest) => beforeCp ++ List("-classpath", cp + ":" + dottyLib) ++ rest - case (beforeCp, _) => beforeCp ++ ("-classpath" :: dottyLib :: Nil) + case (beforeCp, _) => beforeCp ++ List("-classpath", dottyLib) } (runMain in Compile).toTask( @@ -534,7 +534,7 @@ object Build { val fullArgs = args.span(_ != "-classpath") match { case (beforeCp, "-classpath" :: cp :: rest) => beforeCp ++ List("-classpath", cp + ":" + dottyLib) ++ rest - case (beforeCp, _) => beforeCp ++ ("-classpath" :: dottyLib :: Nil) + case (beforeCp, _) => beforeCp ++ List("-classpath", dottyLib) } (runMain in Compile).toTask(