From 8408c91b96b2acce3d43ce9ca5e39c3a45c4f734 Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Tue, 11 Jun 2019 23:30:51 +0200 Subject: [PATCH] Cleanup (formatting) GitOrigin-RevId: ea1f261ccb2ab6c3a147488470df766258a03406 --- .../jetbrains/intellij/build/BaseIdeaProperties.groovy | 7 +++++-- .../jetbrains/intellij/build/JavaPluginLayout.groovy | 10 ++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy index b53d95c93f9d..ad2092948e97 100644 --- a/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy +++ b/build/groovy/org/jetbrains/intellij/build/BaseIdeaProperties.groovy @@ -97,7 +97,10 @@ abstract class BaseIdeaProperties extends ProductProperties { //for compatibility with generated Ant build.xml files which refer to this file productLayout.additionalPlatformJars. - putAll("javac2.jar", ["intellij.java.compiler.antTasks", "intellij.java.guiForms.compiler", "intellij.java.guiForms.rt", "intellij.java.compiler.instrumentationUtil", "intellij.java.compiler.instrumentationUtil.java8", "intellij.java.jps.javacRefScanner8"]) + putAll("javac2.jar", + ["intellij.java.compiler.antTasks", "intellij.java.guiForms.compiler", "intellij.java.guiForms.rt", + "intellij.java.compiler.instrumentationUtil", "intellij.java.compiler.instrumentationUtil.java8", + "intellij.java.jps.javacRefScanner8"]) productLayout.additionalPlatformJars.put("resources.jar", "intellij.java.ide.resources") productLayout.additionalPlatformJars.put("external-system-rt.jar", "intellij.platform.externalSystem.rt") @@ -140,4 +143,4 @@ abstract class BaseIdeaProperties extends ProductProperties { //for compatibility with users projects which refer to IDEA_HOME/lib/annotations.jar context.ant.move(file: "$targetDirectory/lib/annotations-java5.jar", tofile: "$targetDirectory/lib/annotations.jar") } -} +} \ No newline at end of file diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy index 631978ecdc5e..e7cf1f2cc09d 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/JavaPluginLayout.groovy @@ -17,7 +17,12 @@ class JavaPluginLayout { withModule("intellij.java.resources", "resources.jar") withModule("intellij.java.resources.en", "resources.jar") - ["intellij.java.compiler.antTasks", "intellij.java.guiForms.compiler", "intellij.java.guiForms.rt", "intellij.java.compiler.instrumentationUtil", "intellij.java.compiler.instrumentationUtil.java8", "intellij.java.jps.javacRefScanner8"]. + ["intellij.java.compiler.antTasks", + "intellij.java.guiForms.compiler", + "intellij.java.guiForms.rt", + "intellij.java.compiler.instrumentationUtil", + "intellij.java.compiler.instrumentationUtil.java8", + "intellij.java.jps.javacRefScanner8"]. each { withModule(it, "javac2.jar") } @@ -38,6 +43,7 @@ class JavaPluginLayout { ].each { withModule(it, "java-api.jar", "java_resources_en.jar") } + [ "intellij.java.compiler.impl", "intellij.java.debugger.impl", @@ -81,4 +87,4 @@ class JavaPluginLayout { addition() } } -} +} \ No newline at end of file