From 04590b50ee0017e85c10947b55db80c993dadd89 Mon Sep 17 00:00:00 2001
From: Li Haoyi <haoyi.sg@gmail.com>
Date: Sun, 11 Feb 2018 02:12:09 -0800
Subject: fix GenIdea tests

---
 ...l_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml |  7 -------
 ...scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml |  7 -------
 ...iler_2.12.4_scala-compiler-2.12.4-sources.jar.xml |  7 -------
 ...ala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml |  7 -------
 .../libraries/scala-library-2.12.4-sources.jar.xml   |  7 +++++++
 .../idea/libraries/scala-library-2.12.4.jar.xml      |  7 +++++++
 ...brary_2.12.4_scala-library-2.12.4-sources.jar.xml |  7 -------
 ...scala-library_2.12.4_scala-library-2.12.4.jar.xml |  7 -------
 ...flect_2.12.4_scala-reflect-2.12.4-sources.jar.xml |  7 -------
 ...scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml |  7 -------
 scalalib/test/resources/gen-idea/idea_modules/iml    | 10 ++--------
 scalalib/test/src/mill/scalalib/GenIdeaTests.scala   | 20 ++++----------------
 12 files changed, 20 insertions(+), 80 deletions(-)
 delete mode 100644 scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml
 delete mode 100644 scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml
 delete mode 100644 scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml
 delete mode 100644 scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml
 create mode 100644 scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4-sources.jar.xml
 create mode 100644 scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml
 delete mode 100644 scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml
 delete mode 100644 scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml
 delete mode 100644 scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml
 delete mode 100644 scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml

(limited to 'scalalib/test')

diff --git a/scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml
deleted file mode 100644
index a6398d46..00000000
--- a/scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6-sources.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml
deleted file mode 100644
index 5e21f3f3..00000000
--- a/scalalib/test/resources/gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/modules/scala-xml_2.12/1.0.6/scala-xml_2.12-1.0.6.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml
deleted file mode 100644
index fe9d533a..00000000
--- a/scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.4/scala-compiler-2.12.4-sources.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml
deleted file mode 100644
index ec0460d7..00000000
--- a/scalalib/test/resources/gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-compiler_2.12.4_scala-compiler-2.12.4.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-compiler/2.12.4/scala-compiler-2.12.4.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4-sources.jar.xml
new file mode 100644
index 00000000..049400fd
--- /dev/null
+++ b/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4-sources.jar.xml
@@ -0,0 +1,7 @@
+<component name="libraryTable">
+    <library name="scala-library-2.12.4-sources.jar">
+        <CLASSES>
+            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar!/"/>
+        </CLASSES>
+    </library>
+</component>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml
new file mode 100644
index 00000000..cc087b65
--- /dev/null
+++ b/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4.jar.xml
@@ -0,0 +1,7 @@
+<component name="libraryTable">
+    <library name="scala-library-2.12.4.jar">
+        <CLASSES>
+            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar!/"/>
+        </CLASSES>
+    </library>
+</component>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml
deleted file mode 100644
index a1278e29..00000000
--- a/scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-library_2.12.4_scala-library-2.12.4-sources.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4-sources.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml
deleted file mode 100644
index bbd957f0..00000000
--- a/scalalib/test/resources/gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-library_2.12.4_scala-library-2.12.4.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-library/2.12.4/scala-library-2.12.4.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml
deleted file mode 100644
index 09db75bb..00000000
--- a/scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.4/scala-reflect-2.12.4-sources.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml
deleted file mode 100644
index f23b80f6..00000000
--- a/scalalib/test/resources/gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<component name="libraryTable">
-    <library name="scala-reflect_2.12.4_scala-reflect-2.12.4.jar">
-        <CLASSES>
-            <root url="jar:COURSIER_HOME/cache/v1/https/repo1.maven.org/maven2/org/scala-lang/scala-reflect/2.12.4/scala-reflect-2.12.4.jar!/"/>
-        </CLASSES>
-    </library>
-</component>
\ No newline at end of file
diff --git a/scalalib/test/resources/gen-idea/idea_modules/iml b/scalalib/test/resources/gen-idea/idea_modules/iml
index c221343e..10c9fe26 100644
--- a/scalalib/test/resources/gen-idea/idea_modules/iml
+++ b/scalalib/test/resources/gen-idea/idea_modules/iml
@@ -10,13 +10,7 @@
         </content>
         <orderEntry type="inheritedJdk"/>
         <orderEntry type="sourceFolder" forTests="false"/>
-        <orderEntry type="library" name="modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar" level="project"/>
-        <orderEntry type="library" name="modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar" level="project"/>
-        <orderEntry type="library" name="scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar" level="project"/>
-        <orderEntry type="library" name="scala-compiler_2.12.4_scala-compiler-2.12.4.jar" level="project"/>
-        <orderEntry type="library" name="scala-library_2.12.4_scala-library-2.12.4-sources.jar" level="project"/>
-        <orderEntry type="library" name="scala-library_2.12.4_scala-library-2.12.4.jar" level="project"/>
-        <orderEntry type="library" name="scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar" level="project"/>
-        <orderEntry type="library" name="scala-reflect_2.12.4_scala-reflect-2.12.4.jar" level="project"/>
+        <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>
 </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 e5183c49..4f40bc5a 100644
--- a/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
+++ b/scalalib/test/src/mill/scalalib/GenIdeaTests.scala
@@ -33,22 +33,10 @@ object GenIdeaTests extends TestSuite {
           millSourcePath / "generated" / ".idea_modules" /".iml",
         "gen-idea/idea_modules/root.iml" ->
           millSourcePath / "generated" / ".idea_modules" /"root.iml",
-        "gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml" ->
-          millSourcePath / "generated" / ".idea" / "libraries" / "scala-reflect_2.12.4_scala-reflect-2.12.4-sources.jar.xml",
-        "gen-idea/idea/libraries/scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml" ->
-          millSourcePath / "generated" / ".idea" / "libraries" / "scala-reflect_2.12.4_scala-reflect-2.12.4.jar.xml",
-        "gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4.jar.xml" ->
-          millSourcePath / "generated" / ".idea" / "libraries" / "scala-library_2.12.4_scala-library-2.12.4.jar.xml",
-        "gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml" ->
-          millSourcePath / "generated" / ".idea" / "libraries" / "modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6.jar.xml",
-        "gen-idea/idea/libraries/modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml" ->
-          millSourcePath / "generated" / ".idea" / "libraries" / "modules_scala-xml_2.12_1.0.6_scala-xml_2.12-1.0.6-sources.jar.xml",
-        "gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml" ->
-          millSourcePath / "generated" / ".idea" / "libraries" / "scala-compiler_2.12.4_scala-compiler-2.12.4-sources.jar.xml",
-        "gen-idea/idea/libraries/scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml" ->
-          millSourcePath / "generated" / ".idea" / "libraries" / "scala-library_2.12.4_scala-library-2.12.4-sources.jar.xml",
-        "gen-idea/idea/libraries/scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml" ->
-          millSourcePath / "generated" / ".idea" / "libraries" / "scala-compiler_2.12.4_scala-compiler-2.12.4.jar.xml",
+        "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" ->
+          millSourcePath / "generated" / ".idea" / "libraries" / "scala-library-2.12.4-sources.jar.xml",
         "gen-idea/idea/modules.xml" ->
           millSourcePath / "generated" / ".idea" / "modules.xml",
         "gen-idea/idea/misc.xml" ->
-- 
cgit v1.2.3