diff options
author | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 02:12:09 -0800 |
---|---|---|
committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-02-11 02:12:09 -0800 |
commit | 04590b50ee0017e85c10947b55db80c993dadd89 (patch) | |
tree | dbf94c2c84e9915b4af9f6ed059e81b2c4a3fbf5 | |
parent | c820e54a2c5bab47627f9ddcc05252660f9ce8e7 (diff) | |
download | mill-04590b50ee0017e85c10947b55db80c993dadd89.tar.gz mill-04590b50ee0017e85c10947b55db80c993dadd89.tar.bz2 mill-04590b50ee0017e85c10947b55db80c993dadd89.zip |
fix GenIdea tests
10 files changed, 8 insertions, 68 deletions
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_scala-library-2.12.4-sources.jar.xml b/scalalib/test/resources/gen-idea/idea/libraries/scala-library-2.12.4-sources.jar.xml index a1278e29..049400fd 100644 --- 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-sources.jar.xml @@ -1,5 +1,5 @@ <component name="libraryTable"> - <library name="scala-library_2.12.4_scala-library-2.12.4-sources.jar"> + <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> 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.jar.xml index bbd957f0..cc087b65 100644 --- 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.jar.xml @@ -1,5 +1,5 @@ <component name="libraryTable"> - <library name="scala-library_2.12.4_scala-library-2.12.4.jar"> + <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> 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" -> |