diff options
| author | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-08 16:23:47 -0700 |
|---|---|---|
| committer | Li Haoyi <haoyi.sg@gmail.com> | 2018-04-08 16:23:47 -0700 |
| commit | 0ba2fe599cb14414b3d2cbfd3caf4775ff20ed3f (patch) | |
| tree | 6ac36360036b4ee551e4d7488d335644a588dfc5 /scalalib/test | |
| parent | d94bb5eae6cd5f75d3cac1b69518b80c0a90169b (diff) | |
| download | mill-0ba2fe599cb14414b3d2cbfd3caf4775ff20ed3f.tar.gz mill-0ba2fe599cb14414b3d2cbfd3caf4775ff20ed3f.tar.bz2 mill-0ba2fe599cb14414b3d2cbfd3caf4775ff20ed3f.zip | |
Rename `root` IDEA module to `mill-build` to avoid collisions
Fixes https://github.com/lihaoyi/mill/issues/279
Diffstat (limited to 'scalalib/test')
| -rw-r--r-- | scalalib/test/resources/gen-idea/idea/modules.xml | 2 | ||||
| -rw-r--r-- | scalalib/test/resources/gen-idea/idea_modules/mill-build.iml (renamed from scalalib/test/resources/gen-idea/idea_modules/root.iml) | 0 | ||||
| -rw-r--r-- | scalalib/test/src/mill/scalalib/GenIdeaTests.scala | 4 |
3 files changed, 3 insertions, 3 deletions
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/root.iml b/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml index 46fd8c3b..46fd8c3b 100644 --- a/scalalib/test/resources/gen-idea/idea_modules/root.iml +++ b/scalalib/test/resources/gen-idea/idea_modules/mill-build.iml 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" -> |