diff options
Diffstat (limited to 'scalalib/test')
| -rw-r--r-- | scalalib/test/resources/gen-idea/idea_modules/iml | 6 | ||||
| -rw-r--r-- | scalalib/test/resources/gen-idea/idea_modules/root.iml | 5 | ||||
| -rw-r--r-- | scalalib/test/src/mill/scalalib/GenIdeaTests.scala | 5 |
3 files changed, 11 insertions, 5 deletions
diff --git a/scalalib/test/resources/gen-idea/idea_modules/iml b/scalalib/test/resources/gen-idea/idea_modules/iml index 10c9fe26..1fe9be83 100644 --- a/scalalib/test/resources/gen-idea/idea_modules/iml +++ b/scalalib/test/resources/gen-idea/idea_modules/iml @@ -2,14 +2,14 @@ <component name="NewModuleRootManager"> <output url="file://$MODULE_DIR$/../target/workspace/mill/scalalib/GenIdeaTests/helloWorldEvaluator/compile/dest/classes"/> <exclude-output/> - <content url="file://$MODULE_DIR$/../target/workspace/gen-idea/src"> + <content url="file://$MODULE_DIR$/../target/workspace/gen-idea"> <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/src" isTestSource="false"/> - </content> - <content url="file://$MODULE_DIR$/../target/workspace/gen-idea/resources"> <sourceFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/resources" isTestSource="false" type="java-resource"/> + <excludeFolder url="file://$MODULE_DIR$/../target/workspace/gen-idea/target"/> </content> <orderEntry type="inheritedJdk"/> <orderEntry type="sourceFolder" forTests="false"/> + <orderEntry type="library" name="scala-sdk-2.12.4" level="application"/> <orderEntry type="library" name="scala-library-2.12.4-sources.jar" level="project"/> <orderEntry type="library" name="scala-library-2.12.4.jar" level="project"/> </component> diff --git a/scalalib/test/resources/gen-idea/idea_modules/root.iml b/scalalib/test/resources/gen-idea/idea_modules/root.iml index dcf5f7fc..46fd8c3b 100644 --- a/scalalib/test/resources/gen-idea/idea_modules/root.iml +++ b/scalalib/test/resources/gen-idea/idea_modules/root.iml @@ -1,7 +1,10 @@ <module type="JAVA_MODULE" version="4"> <component name="NewModuleRootManager"> <output url="file://$MODULE_DIR$/../out"/> - <content url="file://$MODULE_DIR$/.."/> + <content url="file://$MODULE_DIR$/.."> + <excludeFolder url="file://$MODULE_DIR$/../project"/> + <excludeFolder url="file://$MODULE_DIR$/../target"/> + </content> <exclude-output/> <orderEntry type="inheritedJdk"/> <orderEntry type="sourceFolder" forTests="false"/> diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala index a6700824..0ce9533f 100644 --- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala +++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala @@ -23,7 +23,10 @@ object GenIdeaTests extends TestSuite { 'genIdeaTests - { val pp = new scala.xml.PrettyPrinter(999, 4) - val layout = GenIdea.xmlFileLayout(helloWorldEvaluator.evaluator, HelloWorld, fetchMillModules = false) + val layout = GenIdea.xmlFileLayout( + helloWorldEvaluator.evaluator, + HelloWorld, + ("JDK_1_8", "1.8 (1)"), fetchMillModules = false) for((relPath, xml) <- layout){ write.over(millSourcePath/ "generated"/ relPath, pp.format(xml)) } |