aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Topolnjak <ivantopo@gmail.com>2013-08-26 23:19:47 -0300
committerIvan Topolnjak <ivantopo@gmail.com>2013-08-26 23:19:47 -0300
commit0b24374b851590d54c3a671ecbc812d2dc3bed3a (patch)
tree3031a6845fbb074e513e98f9e8347590b0e68d91
parent72a16d4396f5f6dc745c2376d4e50475d4714004 (diff)
downloadKamon-0b24374b851590d54c3a671ecbc812d2dc3bed3a.tar.gz
Kamon-0b24374b851590d54c3a671ecbc812d2dc3bed3a.tar.bz2
Kamon-0b24374b851590d54c3a671ecbc812d2dc3bed3a.zip
Remove *.iml files and update idea plugin version
-rw-r--r--kamon-core/src/main/main.iml12
-rw-r--r--kamon-core/src/test/test.iml12
-rw-r--r--kamon-dashboard/src/main/main1.iml12
-rw-r--r--kamon-uow/src/main/main2.iml12
-rw-r--r--project/plugins.sbt4
5 files changed, 2 insertions, 50 deletions
diff --git a/kamon-core/src/main/main.iml b/kamon-core/src/main/main.iml
deleted file mode 100644
index 702d93f1..00000000
--- a/kamon-core/src/main/main.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/scala" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
-
diff --git a/kamon-core/src/test/test.iml b/kamon-core/src/test/test.iml
deleted file mode 100644
index 90381726..00000000
--- a/kamon-core/src/test/test.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/scala" isTestSource="true" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
-
diff --git a/kamon-dashboard/src/main/main1.iml b/kamon-dashboard/src/main/main1.iml
deleted file mode 100644
index 702d93f1..00000000
--- a/kamon-dashboard/src/main/main1.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/scala" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
-
diff --git a/kamon-uow/src/main/main2.iml b/kamon-uow/src/main/main2.iml
deleted file mode 100644
index 702d93f1..00000000
--- a/kamon-uow/src/main/main2.iml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4">
- <component name="NewModuleRootManager" inherit-compiler-output="true">
- <exclude-output />
- <content url="file://$MODULE_DIR$">
- <sourceFolder url="file://$MODULE_DIR$/scala" isTestSource="false" />
- </content>
- <orderEntry type="inheritedJdk" />
- <orderEntry type="sourceFolder" forTests="false" />
- </component>
-</module>
-
diff --git a/project/plugins.sbt b/project/plugins.sbt
index 6d9e3bc1..6dc4b037 100644
--- a/project/plugins.sbt
+++ b/project/plugins.sbt
@@ -1,9 +1,9 @@
resolvers += "Sonatype snapshots" at "http://oss.sonatype.org/content/repositories/snapshots/"
-addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.4.0")
+addSbtPlugin("com.github.mpeltonen" % "sbt-idea" % "1.5.1")
addSbtPlugin("io.spray" % "sbt-revolver" % "0.6.2")
addSbtPlugin("com.typesafe.sbt" % "sbt-aspectj" % "0.9.0")
-addSbtPlugin("com.ivantopo.sbt" % "sbt-newrelic" % "0.0.1") \ No newline at end of file
+addSbtPlugin("com.ivantopo.sbt" % "sbt-newrelic" % "0.0.1")