[IntelliJ project configuration] migration to Java 11: use JDK 1.8 for modules which...

It isn't possible to use '--add-exports' option with cross-compilation to Java 8 using JDK 11.

GitOrigin-RevId: cf311f8f7fea6d820e95f4f26ef65c9b27fdae4e

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index b4d798926d563b2643a1561f55cefe302b7f3c10..797213d1a81db44392f1e70dd80ce2769dbf736e 100644 (file)
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -44,7 +44,6 @@
       <module name="intellij.platform.ide" options="-Xlint:unchecked --add-exports java.desktop/sun.swing=ALL-UNNAMED --add-exports java.desktop/sun.awt=ALL-UNNAMED" />
       <module name="intellij.platform.ide.impl" options="-Xlint:unchecked --add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.desktop/sun.font=ALL-UNNAMED --add-exports java.desktop/java.awt.peer=ALL-UNNAMED --add-exports jdk.attach/sun.tools.attach=ALL-UNNAMED --add-exports java.desktop/sun.awt.image=ALL-UNNAMED --add-exports java.desktop/sun.awt.datatransfer=ALL-UNNAMED --add-exports java.desktop/sun.swing=ALL-UNNAMED" />
       <module name="intellij.platform.lang.impl" options="-Xlint:unchecked --add-exports java.desktop/sun.awt.image=ALL-UNNAMED --add-exports java.desktop/sun.awt=ALL-UNNAMED" />
-      <module name="intellij.platform.util.ui" options="-Xlint:unchecked --add-exports java.desktop/sun.java2d=ALL-UNNAMED --add-exports java.desktop/sun.awt=ALL-UNNAMED --add-exports java.desktop/java.awt.peer=ALL-UNNAMED" />
     </option>
     <option name="MAXIMUM_HEAP_SIZE" value="400" />
   </component>

diff --git a/platform/core-impl/intellij.platform.core.impl.iml b/platform/core-impl/intellij.platform.core.impl.iml
index e2252ba353409d3eca9d26093904e2f22ea05542..27d0607fb2fadcb2baa2c43421b0157fcc883041 100644 (file)
--- a/platform/core-impl/intellij.platform.core.impl.iml
+++ b/platform/core-impl/intellij.platform.core.impl.iml
@@ -6,7 +6,7 @@
       <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/resources" type="java-resource" />
     </content>
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.core" exported="" />
     <orderEntry type="library" exported="" name="kotlin-stdlib-jdk8" level="project" />

diff --git a/platform/util/intellij.platform.util.ui.iml b/platform/util/intellij.platform.util.ui.iml
index 4cb713b5363cc0c2160aced9624d2b276158255a..0da52dadad17cd295ae724e9791feafae4a569cf 100644 (file)
--- a/platform/util/intellij.platform.util.ui.iml
+++ b/platform/util/intellij.platform.util.ui.iml
@@ -7,7 +7,7 @@
       <sourceFolder url="file://$MODULE_DIR$/ui/resources" type="java-resource" />
     </content>
     <orderEntry type="library" scope="PROVIDED" name="Mac" level="project" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="module" module-name="intellij.platform.util" />
     <orderEntry type="library" name="batik-transcoder" level="project" />