From ffce2f26e02997546511e258f45f1a4554a882ca Mon Sep 17 00:00:00 2001 From: Li Haoyi Date: Mon, 1 Jan 2018 02:12:36 -0800 Subject: Properly handle `isModule` flag on `sbt.testing.FingerPrint` --- integration/src/test/resource/jawn/build.sc | 5 +++-- integration/src/test/scala/mill/integration/JawnTests.scala | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'integration/src') diff --git a/integration/src/test/resource/jawn/build.sc b/integration/src/test/resource/jawn/build.sc index 167407bd..c23a4ec7 100644 --- a/integration/src/test/resource/jawn/build.sc +++ b/integration/src/test/resource/jawn/build.sc @@ -2,8 +2,9 @@ import mill.scalalib import mill.define.Cross import mill.scalalib.{Dep, TestModule, Module} -val jawn = Cross("2.10.6", "2.11.11", "2.12.3").map(new Jawn(_)) -class Jawn(crossVersion: String) extends mill.Module{ +val jawn = for{ + crossVersion <- Cross("2.10.6", "2.11.11", "2.12.3") +} yield new mill.Module{ trait JawnModule extends scalalib.SbtModule{ outer => def scalaVersion = crossVersion def scalacOptions = Seq( diff --git a/integration/src/test/scala/mill/integration/JawnTests.scala b/integration/src/test/scala/mill/integration/JawnTests.scala index adf6e688..6071113d 100644 --- a/integration/src/test/scala/mill/integration/JawnTests.scala +++ b/integration/src/test/scala/mill/integration/JawnTests.scala @@ -16,8 +16,6 @@ object JawnTests extends IntegrationTestSuite("MILL_JAWN_REPO", "jawn") { ls.rec(workspacePath).exists(_.last == "CharBuilderSpec.class") ) - pprint.log(ls.rec(workspacePath).map(_.toString), height=9999) - pprint.log(ls.rec(workspacePath).find(_.ext == "scala")) for(scalaFile <- ls.rec(workspacePath).filter(_.ext == "scala")){ write.append(scalaFile, "\n}") } -- cgit v1.2.3