From 0a06e176f8fa1a48873a073b296c77a18bc7478c Mon Sep 17 00:00:00 2001
From: Jolse Maginnis <doolse@gmail.com>
Date: Fri, 25 Jan 2019 15:51:19 +1100
Subject: [PATCH] #709 Ignore compiler.xml and sbt.xml as they can be different
 if you have kaltura

---
 .idea/.gitignore   |  2 ++
 .idea/compiler.xml | 41 -------------------------------------
 .idea/sbt.xml      | 50 ----------------------------------------------
 3 files changed, 2 insertions(+), 91 deletions(-)
 delete mode 100644 .idea/compiler.xml
 delete mode 100644 .idea/sbt.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
index aad594658d..04a3ed3b66 100644
--- a/.idea/.gitignore
+++ b/.idea/.gitignore
@@ -24,6 +24,8 @@
 ## lets ignore them all:
 /modules/
 /modules.xml
+/compiler.xml
+/sbt.xml
 
 /libraries/
 /sonarlint/
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 2cfc0682b0..0000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="8">
-      <module name="adminConsoleJar" target="8" />
-      <module name="adminTool" target="8" />
-      <module name="allPlugins" target="8" />
-      <module name="com_equella_admin" target="8" />
-      <module name="com_equella_base" target="8" />
-      <module name="com_equella_core" target="8" />
-      <module name="com_equella_oai" target="8" />
-      <module name="com_equella_reporting" target="8" />
-      <module name="com_equella_serverbase" target="8" />
-      <module name="com_equella_srw" target="8" />
-      <module name="com_equella_z3950" target="8" />
-      <module name="com_tle_common_applet" target="8" />
-      <module name="com_tle_common_inplaceeditor" target="8" />
-      <module name="com_tle_core_guice" target="8" />
-      <module name="com_tle_core_security" target="8" />
-      <module name="com_tle_log4j" target="8" />
-      <module name="com_tle_platform_common" target="8" />
-      <module name="com_tle_platform_equella" target="8" />
-      <module name="com_tle_platform_swing" target="8" />
-      <module name="com_tle_web_adminconsole" target="8" />
-      <module name="com_tle_web_filemanager_applet" target="8" />
-      <module name="com_tle_web_sections" target="8" />
-      <module name="com_tle_webstart_admin" target="8" />
-      <module name="conversion" target="8" />
-      <module name="Equella" target="8" />
-      <module name="equellaserver" target="8" />
-      <module name="filemanagerApplet" target="8" />
-      <module name="inplaceEditorJar" target="8" />
-      <module name="Installer" target="8" />
-      <module name="learningedge_config" target="8" />
-      <module name="org_eclipse_birt_osgi" target="8" />
-      <module name="org_hibernate" target="8" />
-      <module name="UpgradeInstallation" target="8" />
-      <module name="UpgradeManager" target="8" />
-    </bytecodeTargetLevel>
-  </component>
-</project>
\ No newline at end of file
diff --git a/.idea/sbt.xml b/.idea/sbt.xml
deleted file mode 100644
index 027b46dd70..0000000000
--- a/.idea/sbt.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ScalaSbtSettings">
-    <option name="linkedExternalProjectsSettings">
-      <SbtProjectSettings>
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/Dev/learningedge-config" />
-            <option value="$PROJECT_DIR$/Installer" />
-            <option value="$PROJECT_DIR$/Platform/Plugins/com.tle.core.guice" />
-            <option value="$PROJECT_DIR$/Platform/Plugins/com.tle.platform.common" />
-            <option value="$PROJECT_DIR$/Platform/Plugins/com.tle.web.sections" />
-            <option value="$PROJECT_DIR$/Source/Plugins" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Admin/com.tle.web.adminconsole" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Admin/com.tle.web.adminconsole/jarsrc" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Admin/com.tle.webstart.admin" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Applet/com.tle.common.applet" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Applet/com.tle.common.inplaceeditor" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Applet/com.tle.web.filemanager.applet" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Applet/com.tle.web.filemanager.applet/appletsrc" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Birt/org.eclipse.birt.osgi" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.admin" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.base" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.core" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.core/jarsrc" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.reporting" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Core/com.equella.serverbase" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Generic/org.hibernate" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Logging/com.tle.log4j" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Platform/com.tle.platform.equella" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Platform/com.tle.platform.swing" />
-            <option value="$PROJECT_DIR$/Source/Plugins/RemoteRepositories/com.equella.oai" />
-            <option value="$PROJECT_DIR$/Source/Plugins/RemoteRepositories/com.equella.srw" />
-            <option value="$PROJECT_DIR$/Source/Plugins/RemoteRepositories/com.equella.z3950" />
-            <option value="$PROJECT_DIR$/Source/Plugins/Security/com.tle.core.security" />
-            <option value="$PROJECT_DIR$/Source/Server/adminTool" />
-            <option value="$PROJECT_DIR$/Source/Server/conversion" />
-            <option value="$PROJECT_DIR$/Source/Server/equellaserver" />
-            <option value="$PROJECT_DIR$/Source/Tools/UpgradeInstallation" />
-            <option value="$PROJECT_DIR$/Source/Tools/UpgradeManager" />
-            <option value="$PROJECT_DIR$/project" />
-          </set>
-        </option>
-        <option name="sbtVersion" value="1.1.1" />
-      </SbtProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file