From d1ca1a55304f1073046b7690e997e99acffef325 Mon Sep 17 00:00:00 2001 From: "Gregory.Shrago" Date: Wed, 9 Oct 2019 22:50:44 +0300 Subject: [PATCH] IDEA-CR-53226 cleanup GitOrigin-RevId: 9a55589e407dc19405fae480db2532c9b581beb3 --- .../build/python/PythonCommunityPluginModules.groovy | 4 +--- .../build/pycharm/PythonCommunityPluginBuilder.groovy | 10 ++-------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy b/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy index 5676d3c8a9fb..afe82fb38ef1 100644 --- a/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy +++ b/platform/build-scripts/groovy/org/jetbrains/intellij/build/python/PythonCommunityPluginModules.groovy @@ -17,10 +17,8 @@ class PythonCommunityPluginModules { "intellij.python.pydev", "intellij.python.community.impl", ] - public static String PYTHON_COMMUNITY_PLUGIN_MODULE = "intellij.python.community.plugin" - static PluginLayout pythonCommunityPluginLayout(@DelegatesTo(PluginLayout.PluginLayoutSpec) Closure body = {}) { - pythonPlugin(PYTHON_COMMUNITY_PLUGIN_MODULE, "python-ce", COMMUNITY_MODULES) { + pythonPlugin("intellij.python.community.plugin", "python-ce", COMMUNITY_MODULES) { withProjectLibrary("markdown4j") // Required for ipnb body.delegate = delegate body() diff --git a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginBuilder.groovy b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginBuilder.groovy index 31ab2cf1c4ed..6c6ff7dc5a5b 100644 --- a/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginBuilder.groovy +++ b/python/build/groovy/org/jetbrains/intellij/build/pycharm/PythonCommunityPluginBuilder.groovy @@ -16,13 +16,7 @@ package org.jetbrains.intellij.build.pycharm import groovy.io.FileType -import org.jetbrains.intellij.build.BuildContext -import org.jetbrains.intellij.build.BuildOptions -import org.jetbrains.intellij.build.BuildTasks -import org.jetbrains.intellij.build.IdeaCommunityProperties -import org.jetbrains.intellij.build.ProprietaryBuildTools - -import static org.jetbrains.intellij.build.python.PythonCommunityPluginModules.PYTHON_COMMUNITY_PLUGIN_MODULE +import org.jetbrains.intellij.build.* /** * @author vlan @@ -38,7 +32,7 @@ class PythonCommunityPluginBuilder { def build() { def pluginBuildNumber = System.getProperty("build.number", "SNAPSHOT") def pluginsForIdeaCommunity = [ - PYTHON_COMMUNITY_PLUGIN_MODULE, + "intellij.python.community.plugin", "intellij.reStructuredText", ]