diff options
| author | Andrew Richards <richards.aj@gmail.com> | 2018-02-22 04:15:42 +0000 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-21 20:15:42 -0800 |
| commit | 107ba88754673e08b030b9ba1c8f4e6f1eefd13d (patch) | |
| tree | 7ad9ebe2131309d99572108e033a3fc3db527b25 /scalalib/test/resources | |
| parent | a286ec2473e09ea53bb9e811511378c56ed7e5c4 (diff) | |
| download | mill-107ba88754673e08b030b9ba1c8f4e6f1eefd13d.tar.gz mill-107ba88754673e08b030b9ba1c8f4e6f1eefd13d.tar.bz2 mill-107ba88754673e08b030b9ba1c8f4e6f1eefd13d.zip | |
GenIdea updates including a fix for #147 (#149)
* extract JDK version so you don't have to keep resetting it
* give modules a base path
looks much nicer in IntelliJ - the module is now in bold
* exclude sbt target directories
stops sbt artifacts appearing in search
* Fix #147 - add IntelliJ scala library
* exclude root sbt project and target folders from IJ search
* only resort to full long path names for jars if the name is a duplicate
duplicates are hard to find unless you are pulling the same thing from different repos (therefore different path)
* update GenIdea tests
* tidy GenIdea
Diffstat (limited to 'scalalib/test/resources')
| -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 |
2 files changed, 7 insertions, 4 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"/> |