MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-01-06 03:21:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

[platform] raise minimum target Java version to 1.6 in IntelliJ project modules (IDEA-224536)

Browse Source 
This is needed to simplify migration to Java 11, because it doesn't support cross-compilation to version 1.5 or older. This change means that users won't be able to run processes which use classes from IDE distribution (e.g. run JUnit tests, deploy to an application server, etc) under JDK 1.5 or older, they'll need to use JDK 1.6 for that.

GitOrigin-RevId: 1df45d51af993022778253fa13cd79d56090cd26
This commit is contained in:
nik
2020-04-03 13:42:12 +03:00
committed by intellij-monorepo-bot
parent 9bc9f71a01
commit ca425ec2db
14 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/compiler.xml generated
View File

@@ -25,10 +25,6 @@
<entry name="!*.iml" />
<entry name="!*.gant" />
</wildcardResourcePatterns>
<bytecodeTargetLevel>
<module name="java-runtime" target="1.2" />
<module name="junit_rt" target="1.2" />
</bytecodeTargetLevel>
</component>
<component name="EclipseCompilerSettings">
<option name="GENERATE_NO_WARNINGS" value="true" />

18
build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy
View File

@@ -72,19 +72,19 @@ abstract class BaseIdeaProperties extends JetBrainsProductProperties {
]
protected static final Map<String, String> CE_CLASS_VERSIONS = [
"" : "1.8",
"lib/idea_rt.jar" : "1.3",
"lib/forms_rt.jar" : "1.4",
"lib/annotations.jar" : "1.5",
"lib/idea_rt.jar" : "1.6",
"lib/forms_rt.jar" : "1.6",
"lib/annotations.jar" : "1.6",
"lib/util.jar" : "1.8",
"lib/external-system-rt.jar" : "1.6",
"lib/jshell-frontend.jar" : "1.9",
"plugins/java/lib/sa-jdwp" : "", // ignored
"plugins/java/lib/rt/debugger-agent.jar" : "1.6",
"plugins/java/lib/rt/debugger-agent-storage.jar" : "1.6",
"plugins/Groovy/lib/groovy_rt.jar" : "1.5",
"plugins/Groovy/lib/groovy-rt-constants.jar" : "1.5",
"plugins/coverage/lib/coverage_rt.jar" : "1.5",
"plugins/junit/lib/junit-rt.jar" : "1.3",
"plugins/Groovy/lib/groovy_rt.jar" : "1.6",
"plugins/Groovy/lib/groovy-rt-constants.jar" : "1.6",
"plugins/coverage/lib/coverage_rt.jar" : "1.6",
"plugins/junit/lib/junit-rt.jar" : "1.6",
"plugins/gradle/lib/gradle-tooling-extension-api.jar" : "1.6",
"plugins/gradle/lib/gradle-tooling-extension-impl.jar" : "1.6",
"plugins/maven/lib/maven-server-api.jar" : "1.6",
@@ -95,8 +95,8 @@ abstract class BaseIdeaProperties extends JetBrainsProductProperties {
"plugins/maven/lib/artifact-resolver-m2.jar" : "1.6",
"plugins/maven/lib/artifact-resolver-m3.jar" : "1.6",
"plugins/maven/lib/artifact-resolver-m31.jar" : "1.6",
"plugins/xpath/lib/rt/xslt-rt.jar" : "1.4",
"plugins/xslt-debugger/lib/xslt-debugger-engine.jar" : "1.5",
"plugins/xpath/lib/rt/xslt-rt.jar" : "1.6",
"plugins/xslt-debugger/lib/xslt-debugger-engine.jar" : "1.6",
"plugins/xslt-debugger/lib/rt/xslt-debugger-engine-impl.jar": "1.8",
"plugins/cucumber-java/lib/cucumber-jvmFormatter.jar" : "1.6",
"plugins/android/lib/layoutlib-jre11-26.6.0.2.jar" : "1.9",

2
java/java-runtime/intellij.java.rt.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_3" 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" />

2
platform/forms_rt/intellij.java.guiForms.rt.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_3" 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" />

2
platform/remote-servers/agent-rt/intellij.platform.remoteServers.agent.rt.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" 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" />

2
platform/util-rt/intellij.platform.util.rt.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" inherit-compiler-output="true">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="true">
<exclude-output />
<annotation-paths>
<root url="file://$MODULE_DIR$/anno" />

2
plugins/coverage/coverage_rt/intellij.java.coverage.rt.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" 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" packagePrefix="com.intellij.coverage" />

2
plugins/google-app-engine/runtime/intellij.java.googleAppEngine.runtime.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" 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$/source" isTestSource="false" />

2
plugins/groovy/rt-constants/intellij.groovy.constants.rt.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" 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" />

2
plugins/groovy/rt/intellij.groovy.rt.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" 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" />

2
plugins/junit_rt/intellij.junit.rt.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_3" 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" />

2
plugins/testng_rt/intellij.testng.rt.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" 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" />

2
plugins/xpath/xslt-rt/intellij.xslt.debugger.rt.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_4" 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" />

2
plugins/xslt-debugger/engine/intellij.xslt.debugger.engine.iml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<module relativePaths="true" type="JAVA_MODULE" version="4">
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_5" 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" />