From 0ba2fe599cb14414b3d2cbfd3caf4775ff20ed3f Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 8 Apr 2018 16:23:47 -0700
Subject: Rename `root` IDEA module to `mill-build` to avoid collisions

Fixes https://github.com/lihaoyi/mill/issues/279
---
 scalalib/src/mill/scalalib/GenIdeaImpl.scala                 |  7 +++++--
 scalalib/test/resources/gen-idea/idea/modules.xml            |  2 +-
 scalalib/test/resources/gen-idea/idea_modules/mill-build.iml | 12 ++++++++++++
 scalalib/test/resources/gen-idea/idea_modules/root.iml       | 12 ------------
 scalalib/test/src/mill/scalalib/GenIdeaTests.scala           |  4 ++--
 5 files changed, 20 insertions(+), 17 deletions(-)
 create mode 100644 scalalib/test/resources/gen-idea/idea_modules/mill-build.iml
 delete mode 100644 scalalib/test/resources/gen-idea/idea_modules/root.iml

(limited to 'scalalib')

diff --git a/scalalib/src/mill/scalalib/GenIdeaImpl.scala b/scalalib/src/mill/scalalib/GenIdeaImpl.scala
index 3e90f269..760f2835 100644
--- a/scalalib/src/mill/scalalib/GenIdeaImpl.scala
+++ b/scalalib/src/mill/scalalib/GenIdeaImpl.scala
@@ -166,7 +166,7 @@ object GenIdeaImpl {
         )
       ),
       Tuple2(
-        ".idea_modules"/"root.iml",
+        ".idea_modules"/"mill-build.iml",
         rootXmlTemplate(
           for(path <- buildLibraryPaths)
           yield pathToLibName(path)
@@ -270,7 +270,10 @@ object GenIdeaImpl {
     <project version="4">
       <component name="ProjectModuleManager">
         <modules>
-          <module fileurl="file://$PROJECT_DIR$/.idea_modules/root.iml" filepath="$PROJECT_DIR$/.idea_modules/root.iml" />
+          <module
+            fileurl="file://$PROJECT_DIR$/.idea_modules/mill-build.iml"
+            filepath="$PROJECT_DIR$/.idea_modules/mill-build.iml"
+          />
           {
           for(selector  <- selectors)
           yield {
diff --git a/scalalib/test/resources/gen-idea/idea/modules.xml b/scalalib/test/resources/gen-idea/idea/modules.xml
index 374b9a1f..d7cfbd08 100644
--- a/scalalib/test/resources/gen-idea/idea/modules.xml
+++ b/scalalib/test/resources/gen-idea/idea/modules.xml
@@ -1,7 +1,7 @@
 <project version="4">
     <component name="ProjectModuleManager">
         <modules>
-            <module fileurl="file://$PROJECT_DIR$/.idea_modules/root.iml" filepath="$PROJECT_DIR$/.idea_modules/root.iml"/>
+            <module fileurl="file://$PROJECT_DIR$/.idea_modules/mill-build.iml" filepath="$PROJECT_DIR$/.idea_modules/mill-build.iml"/>
             <module fileurl="file://$PROJECT_DIR$/.idea_modules/.iml" filepath="$PROJECT_DIR$/.idea_modules/.iml"/>
         </modules>
     </component>
diff --git a/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml b/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml
new file mode 100644
index 00000000..46fd8c3b
--- /dev/null
+++ b/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml
@@ -0,0 +1,12 @@
+<module type="JAVA_MODULE" version="4">
+    <component name="NewModuleRootManager">
+        <output url="file://$MODULE_DIR$/../out"/>
+        <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"/>
+    </component>
+</module>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea_modules/root.iml b/scalalib/test/resources/gen-idea/idea_modules/root.iml
deleted file mode 100644
index 46fd8c3b..00000000
--- a/scalalib/test/resources/gen-idea/idea_modules/root.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<module type="JAVA_MODULE" version="4">
-    <component name="NewModuleRootManager">
-        <output url="file://$MODULE_DIR$/../out"/>
-        <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"/>
-    </component>
-</module>
\ No newline at end of file
diff --git a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
index 51665867..dc8faaf4 100644
--- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
+++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
@@ -34,8 +34,8 @@ object GenIdeaTests extends TestSuite {
       Seq(
         "gen-idea/idea_modules/iml" ->
           millSourcePath / "generated" / ".idea_modules" /".iml",
-        "gen-idea/idea_modules/root.iml" ->
-          millSourcePath / "generated" / ".idea_modules" /"root.iml",
+        "gen-idea/idea_modules/mill-build.iml" ->
+          millSourcePath / "generated" / ".idea_modules" /"mill-build.iml",
         "gen-idea/idea/libraries/scala-library-2.12.4.jar.xml" ->
           millSourcePath / "generated" / ".idea" / "libraries" / "scala-library-2.12.4.jar.xml",
         "gen-idea/idea/libraries/scala-library-2.12.4-sources.jar.xml" ->
-- 
cgit v1.2.3