From 70f2169249b07fd7afcb7444233521c787f93e89 Mon Sep 17 00:00:00 2001
From: Lukas Rytz <lukas.rytz@gmail.com>
Date: Fri, 1 May 2015 19:52:33 +0200
Subject: Update intellij project files for IDEA 14.1 and latest Scala plugin

Removes the src/intellij-14 folder and moves everything back to
src/intellij.
---
 src/intellij/compiler.iml.SAMPLE | 18 ++++--------------
 1 file changed, 4 insertions(+), 14 deletions(-)

(limited to 'src/intellij/compiler.iml.SAMPLE')

diff --git a/src/intellij/compiler.iml.SAMPLE b/src/intellij/compiler.iml.SAMPLE
index 50253000ab..00f732e255 100644
--- a/src/intellij/compiler.iml.SAMPLE
+++ b/src/intellij/compiler.iml.SAMPLE
@@ -1,27 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="scala" name="Scala">
-      <configuration>
-        <option name="compilerLibraryLevel" value="Project" />
-        <option name="compilerLibraryName" value="starr" />
-        <option name="languageLevel" value="Scala 2.11" />
-        <option name="maximumHeapSize" value="1536" />
-        <option name="vmOptions" value="-Xms1536m -Xss1m -XX:MaxPermSize=512M -XX:ReservedCodeCacheSize=256m -XX:+CMSClassUnloadingEnabled -XX:+UseCompressedOops -XX:+UseParallelGC" />
-      </configuration>
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$/../compiler">
+      <sourceFolder url="file://$MODULE_DIR$/../compiler/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/../compiler" isTestSource="false" />
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="module" module-name="asm" />
     <orderEntry type="module" module-name="library" />
     <orderEntry type="module" module-name="reflect" />
-    <orderEntry type="module" module-name="asm" />
+    <orderEntry type="library" name="starr" level="project" />
     <orderEntry type="library" name="ant" level="project" />
   </component>
-</module>
-
+</module>
\ No newline at end of file
-- 
cgit v1.2.3