Fix GenIdeaTests by making the Log context Option[]al

com-lihaoyi · Dec 18, 2018 · 5230d01 · 5230d01
1 parent bf2fe66
commit 5230d01
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/scalalib/src/GenIdeaImpl.scala b/scalalib/src/GenIdeaImpl.scala
@@ -42,7 +42,7 @@ object GenIdeaImpl {
 
     val evaluator = new Evaluator(ctx.home, os.pwd / 'out, os.pwd / 'out, rootModule, ctx.log)
 
-    for((relPath, xml) <- xmlFileLayout(evaluator, rootModule, jdkInfo, ctx)){
+    for((relPath, xml) <- xmlFileLayout(evaluator, rootModule, jdkInfo, Some(ctx))){
       os.write.over(os.pwd/relPath, pp.format(xml), createFolders = true)
     }
   }
@@ -61,7 +61,7 @@ object GenIdeaImpl {
   def xmlFileLayout(evaluator: Evaluator,
                     rootModule: mill.Module,
                     jdkInfo: (String,String),
-                    ctx: Log,
+                    ctx: Option[Log],
                     fetchMillModules: Boolean = true): Seq[(os.RelPath, scala.xml.Node)] = {
 
     val modules = rootModule.millInternal.segmentsToModules.values
@@ -82,7 +82,7 @@ object GenIdeaImpl {
             yield ivy"com.lihaoyi::mill-$name:${sys.props("MILL_VERSION")}",
             false,
             None,
-            Some(ctx)
+            ctx
           )
           res.items.toList.map(_.path)
       }

diff --git a/scalalib/test/src/GenIdeaTests.scala b/scalalib/test/src/GenIdeaTests.scala
@@ -28,7 +28,7 @@ object GenIdeaTests extends TestSuite {
       val layout = GenIdeaImpl.xmlFileLayout(
         helloWorldEvaluator.evaluator,
         HelloWorld,
-        ("JDK_1_8", "1.8 (1)"), fetchMillModules = false)
+        ("JDK_1_8", "1.8 (1)"), None, fetchMillModules = false)
       for((relPath, xml) <- layout){
         os.write.over(millSourcePath/ "generated"/ relPath, pp.format(xml), createFolders = true)
       }