Merge pull request #5 from jonnyzzz/master

Polish project setup
TinyMission · Jan 10, 2013 · 74e26d1 · 74e26d1
2 parents 850ad87 + 87a34d0
commit 74e26d1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/KaraDemo/build.xml b/KaraDemo/build.xml
@@ -1,7 +1,5 @@
 <project>
     <target name="restart">
-        <exec executable="touch">
-            <arg value="tmp/restart.txt"/>
-        </exec>
+         <touch file="tmp/restart.txt" />
     </target>
-</project>
+</project>
diff --git a/KaraLib/src/kara/config/AppConfig.kt b/KaraLib/src/kara/config/AppConfig.kt
@@ -61,11 +61,12 @@ public class AppConfig(appRoot : String, val environment : String = "development
         get() = this["kara.sessionDir"]
 
     public val absSessionDir : String
+        //Is you see error here, click "Setup Kotlin JDK Annotations"
         get() = File(appRoot, sessionDir).toString()
 
 
     /** The port to run the server on. */
     public val port : String
         get() = this["kara.port"]
 
-}
+}
diff --git a/KaraTests/KaraTests.iml b/KaraTests/KaraTests.iml
@@ -5,7 +5,7 @@
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
     </content>
-    <orderEntry type="jdk" jdkName="1.7" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="KaraLib" />
     <orderEntry type="library" name="KotlinRuntime" level="project" />