Mercurial > hg > mercurial
changeset 943:07a7f22d8954
hg plugin - use jdk8 on server, jdk6 on agent
author | Dmitry.Treskunov@UNIT-412.Labs.IntelliJ.Net |
---|---|
date | Mon, 28 Dec 2015 21:41:06 +0300 |
parents | 944ccd758a6f |
children | 2f876a09cb99 |
files | .idea/compiler.xml .idea/misc.xml mercurial-agent/mercurial-agent.iml mercurial-common/mercurial-common.iml |
diffstat | 4 files changed, 9 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/.idea/compiler.xml Thu Dec 24 15:52:38 2015 +0100 +++ b/.idea/compiler.xml Mon Dec 28 21:41:06 2015 +0300 @@ -27,7 +27,5 @@ <processorPath useClasspath="true" /> </profile> </annotationProcessing> - <bytecodeTargetLevel target="1.5" /> </component> -</project> - +</project> \ No newline at end of file
--- a/.idea/misc.xml Thu Dec 24 15:52:38 2015 +0100 +++ b/.idea/misc.xml Mon Dec 28 21:41:06 2015 +0300 @@ -4,6 +4,5 @@ <entry_points version="2.0" /> </component> <component name="IdProvider" IDEtalkID="C52C76224CD45BEC1DC62428B699D800" /> - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_5" assert-keyword="true" jdk-15="true" project-jdk-name="1.6" project-jdk-type="JavaSDK" /> -</project> - + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="false" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" /> +</project> \ No newline at end of file
--- a/mercurial-agent/mercurial-agent.iml Thu Dec 24 15:52:38 2015 +0100 +++ b/mercurial-agent/mercurial-agent.iml Mon Dec 28 21:41:06 2015 +0300 @@ -5,16 +5,15 @@ <configuration /> </facet> </component> - <component name="NewModuleRootManager" inherit-compiler-output="false"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" name="TeamCityAPI-agent" level="project" /> <orderEntry type="module" module-name="mercurial-common" /> </component> -</module> - +</module> \ No newline at end of file
--- a/mercurial-common/mercurial-common.iml Thu Dec 24 15:52:38 2015 +0100 +++ b/mercurial-common/mercurial-common.iml Mon Dec 28 21:41:06 2015 +0300 @@ -1,17 +1,16 @@ <?xml version="1.0" encoding="UTF-8"?> <module relativePaths="true" type="JAVA_MODULE" version="4"> - <component name="NewModuleRootManager" inherit-compiler-output="false"> + <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false"> <output url="file://$MODULE_DIR$/classes" /> <exclude-output /> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> </content> - <orderEntry type="inheritedJdk" /> + <orderEntry type="jdk" jdkName="1.6" jdkType="JavaSDK" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="library" exported="" name="TeamCityAPI-common" level="project" /> <orderEntry type="library" exported="" name="IDEA-openapi" level="project" /> <orderEntry type="library" name="jdom" level="project" /> <orderEntry type="library" name="commons-codec-1.4" level="project" /> </component> -</module> - +</module> \ No newline at end of file