Created
January 20, 2014 16:06
-
-
Save Stebalien/8522936 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/.idea/misc.xml b/.idea/misc.xml | |
index 7a5217f..bbf4120 100644 | |
--- a/.idea/misc.xml | |
+++ b/.idea/misc.xml | |
@@ -51,7 +51,7 @@ | |
<component name="ProjectResources"> | |
<default-html-doctype>http://www.w3.org/1999/xhtml</default-html-doctype> | |
</component> | |
- <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK"> | |
+ <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK"> | |
<output url="file://$PROJECT_DIR$/out" /> | |
</component> | |
<component name="WebServicesPlugin" addRequiredLibraries="true" /> | |
diff --git a/generators/generators.iml b/generators/generators.iml | |
index e6927ce..d474d7b 100644 | |
--- a/generators/generators.iml | |
+++ b/generators/generators.iml | |
@@ -6,7 +6,7 @@ | |
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="true" /> | |
<sourceFolder url="file://$MODULE_DIR$/tests" isTestSource="true" /> | |
</content> | |
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" /> | |
+ <orderEntry type="inheritedJdk" /> | |
<orderEntry type="sourceFolder" forTests="false" /> | |
<orderEntry type="module" module-name="idea" scope="TEST" /> | |
<orderEntry type="module" module-name="compiler-tests" scope="TEST" /> | |
diff --git a/ide-compiler-runner/ide-compiler-runner.iml b/ide-compiler-runner/ide-compiler-runner.iml | |
index 6b04cf3..2526e0c 100644 | |
--- a/ide-compiler-runner/ide-compiler-runner.iml | |
+++ b/ide-compiler-runner/ide-compiler-runner.iml | |
@@ -5,7 +5,7 @@ | |
<content url="file://$MODULE_DIR$"> | |
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> | |
</content> | |
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" /> | |
+ <orderEntry type="inheritedJdk" /> | |
<orderEntry type="sourceFolder" forTests="false" /> | |
<orderEntry type="library" name="idea-full" level="project" /> | |
<orderEntry type="module" module-name="cli-common" /> | |
diff --git a/jps-plugin/jps-plugin.iml b/jps-plugin/jps-plugin.iml | |
index c3a0677..4f321f1 100644 | |
--- a/jps-plugin/jps-plugin.iml | |
+++ b/jps-plugin/jps-plugin.iml | |
@@ -6,7 +6,7 @@ | |
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> | |
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> | |
</content> | |
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" /> | |
+ <orderEntry type="inheritedJdk" /> | |
<orderEntry type="sourceFolder" forTests="false" /> | |
<orderEntry type="module" module-name="ide-compiler-runner" /> | |
<orderEntry type="module" module-name="cli-common" /> | |
diff --git a/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml b/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml | |
index 59b1954..e99b5a3 100644 | |
--- a/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml | |
+++ b/jps-plugin/kannotator-jps-plugin-test/kannotator-jps-plugin-test.iml | |
@@ -5,7 +5,7 @@ | |
<content url="file://$MODULE_DIR$"> | |
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" /> | |
</content> | |
- <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" /> | |
+ <orderEntry type="inheritedJdk" /> | |
<orderEntry type="sourceFolder" forTests="false" /> | |
<orderEntry type="module" module-name="jps-plugin" scope="TEST" /> | |
<orderEntry type="library" scope="TEST" name="jps" level="project" /> |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment