From 760c3b6d7f7a1303114bed338e2cf49f9ccbeb06 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Tue, 25 Feb 2014 14:35:47 +0400
Subject: [PATCH] jps plugins to use 1.6 language and bytecode target level

---
 .idea/compiler.xml                                     | 10 ++++++++++
 jps/model-api/jps-model-api.iml                        |  2 +-
 jps/model-impl/jps-model-impl.iml                      |  2 +-
 jps/model-serialization/jps-model-serialization.iml    |  2 +-
 jps/standalone-builder/jps-standalone-builder.iml      |  2 +-
 .../intellilang-jps-plugin/intellilang-jps-plugin.iml  |  2 +-
 6 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index c5db8fc58229..9fe807536f32 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -29,11 +29,21 @@
       <module name="annotations" target="1.5" />
       <module name="groovy-rt-constants" target="1.5" />
       <module name="groovy_rt" target="1.5" />
+      <module name="intellilang-jps-plugin" target="1.6" />
       <module name="java-runtime" target="1.3" />
       <module name="javac2" target="1.5" />
+      <module name="javaFX-jps-plugin" target="1.6" />
+      <module name="jps-builders" target="1.6" />
       <module name="jps-launcher" target="1.6" />
+      <module name="jps-model-api" target="1.6" />
+      <module name="jps-model-impl" target="1.6" />
+      <module name="jps-model-serialization" target="1.6" />
+      <module name="jps-standalone-builder" target="1.6" />
       <module name="junit_rt" target="1.3" />
+      <module name="maven-jps-plugin" target="1.6" />
+      <module name="remote-servers-agent-rt" target="1.5" />
       <module name="testng_rt" target="1.5" />
+      <module name="ui-designer-jps-plugin" target="1.6" />
     </bytecodeTargetLevel>
   </component>
   <component name="EclipseCompilerSettings">
diff --git a/jps/model-api/jps-model-api.iml b/jps/model-api/jps-model-api.iml
index 7e88b0067116..25bf799274f4 100644
--- a/jps/model-api/jps-model-api.iml
+++ b/jps/model-api/jps-model-api.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
diff --git a/jps/model-impl/jps-model-impl.iml b/jps/model-impl/jps-model-impl.iml
index 4a17b3a41db1..5e72944c0f30 100644
--- a/jps/model-impl/jps-model-impl.iml
+++ b/jps/model-impl/jps-model-impl.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
diff --git a/jps/model-serialization/jps-model-serialization.iml b/jps/model-serialization/jps-model-serialization.iml
index 2738e97f2275..988e3c506729 100644
--- a/jps/model-serialization/jps-model-serialization.iml
+++ b/jps/model-serialization/jps-model-serialization.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
diff --git a/jps/standalone-builder/jps-standalone-builder.iml b/jps/standalone-builder/jps-standalone-builder.iml
index 11b03235374e..c5e84924a1da 100644
--- a/jps/standalone-builder/jps-standalone-builder.iml
+++ b/jps/standalone-builder/jps-standalone-builder.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
diff --git a/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml b/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml
index 58257c150340..679a7a3abe30 100644
--- a/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml
+++ b/plugins/IntelliLang/intellilang-jps-plugin/intellilang-jps-plugin.iml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />