Rename manifest.properties to kotlinManifest.properties to avoid clashing with other resources.

This commit is contained in:
Zalim Bashorov
2014-12-18 14:27:43 +03:00
parent 543141c564
commit 465c4a397e
6 changed files with 7 additions and 7 deletions
+1 -1
View File
@@ -12,7 +12,7 @@
<element id="module-output" name="preloader" />
<element id="module-output" name="util" />
<element id="module-output" name="util.runtime" />
<element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
<element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
</root>
</artifact>
</component>
+1 -1
View File
@@ -30,7 +30,7 @@
<element id="module-output" name="eval4j" />
<element id="module-output" name="idea-analysis" />
<element id="module-output" name="ide-common" />
<element id="file-copy" path="$PROJECT_DIR$/resources/manifest.properties" />
<element id="file-copy" path="$PROJECT_DIR$/resources/kotlinManifest.properties" />
<element id="module-output" name="kotlin-android-plugin" />
</element>
<element id="library" level="project" name="javax.inject" />