diff --git a/.gitignore b/.gitignore
index 41224fe891fa..4d880eacc7d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,6 @@ build/dependencies/build
/test-config
*.pyc
.idea/libraries/Gradle__*.xml
-.idea/gradle_extensions.xml
\ No newline at end of file
+.idea/gradle_extensions.xml
+python/educational-python/build/dependencies/build
+python/educational-python/build/dependencies/.gradle
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index bb30ded81900..5fce0842d25b 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -245,6 +245,7 @@
+
diff --git a/.idea/runConfigurations/PyCharm_Edu.xml b/.idea/runConfigurations/PyCharm_Edu.xml
index 608ba417457e..2465ef034e51 100644
--- a/.idea/runConfigurations/PyCharm_Edu.xml
+++ b/.idea/runConfigurations/PyCharm_Edu.xml
@@ -12,7 +12,10 @@
-
-
+
+
+
+
+
\ No newline at end of file
diff --git a/python/educational-python/build/dependencies/build.gradle b/python/educational-python/build/dependencies/build.gradle
new file mode 100644
index 000000000000..bbe88c1fda15
--- /dev/null
+++ b/python/educational-python/build/dependencies/build.gradle
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2000-2017 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+buildscript {
+ repositories {
+ maven { url "https://plugins.gradle.org/m2/" }
+ }
+}
+
+
+apply plugin: 'idea'
+apply plugin: 'base'
+idea {
+ module {
+ inheritOutputDirs true
+ }
+}
+
+
+group 'com.jetbrains.edu.dependencies'
+version '1.0'
+
+repositories {
+ maven { url 'http://plugins.jetbrains.com/maven/' }
+}
+
+configurations {
+ eduPlugin
+}
+
+def eduPluginId = "com.jetbrains.edu"
+def eduPluginName = "EduTools"
+
+dependencies {
+ eduPlugin "com.jetbrains.plugins:$eduPluginId:$eduPluginVersion@zip"
+}
+
+task setupEduPlugin(dependsOn: configurations.eduPlugin, type: Sync) {
+ from fileTree(configurations.eduPlugin.singleFile)
+ into "${project.buildDir}/edu/"
+ rename { String fileName ->
+ fileName.replace(eduPluginId, eduPluginName) }
+}
+
+task deployEduPlugin(dependsOn: setupEduPlugin, type: Sync) {
+ from zipTree("${project.buildDir}/edu/$eduPluginName-${eduPluginVersion}.zip")
+ into "${System.getProperty("idea.config.path")}/plugins/"
+ preserve {
+ exclude "$eduPluginName/**"
+ }
+}
\ No newline at end of file
diff --git a/python/educational-python/build/dependencies/gradle.properties b/python/educational-python/build/dependencies/gradle.properties
new file mode 100644
index 000000000000..2b878adbf368
--- /dev/null
+++ b/python/educational-python/build/dependencies/gradle.properties
@@ -0,0 +1 @@
+eduPluginVersion=1.1-2017.3-88
diff --git a/python/educational-python/build/dependencies/gradle/wrapper/gradle-wrapper.jar b/python/educational-python/build/dependencies/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 000000000000..6b6ea3ab4ff4
Binary files /dev/null and b/python/educational-python/build/dependencies/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/python/educational-python/build/dependencies/gradle/wrapper/gradle-wrapper.properties b/python/educational-python/build/dependencies/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 000000000000..0e680f3759f5
--- /dev/null
+++ b/python/educational-python/build/dependencies/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.3.1-bin.zip
diff --git a/python/educational-python/build/dependencies/gradlew b/python/educational-python/build/dependencies/gradlew
new file mode 100755
index 000000000000..cccdd3d517fc
--- /dev/null
+++ b/python/educational-python/build/dependencies/gradlew
@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/python/educational-python/build/dependencies/gradlew.bat b/python/educational-python/build/dependencies/gradlew.bat
new file mode 100644
index 000000000000..f9553162f122
--- /dev/null
+++ b/python/educational-python/build/dependencies/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/python/educational-python/build/dependencies/pycharm-edu-dependencies.iml b/python/educational-python/build/dependencies/pycharm-edu-dependencies.iml
new file mode 100644
index 000000000000..3e934e78d0de
--- /dev/null
+++ b/python/educational-python/build/dependencies/pycharm-edu-dependencies.iml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy b/python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy
index 184d572a57a1..056ef0221db0 100644
--- a/python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy
+++ b/python/educational-python/build/groovy/org/jetbrains/intellij/build/pycharm/edu/PyCharmEduProperties.groovy
@@ -1,5 +1,6 @@
package org.jetbrains.intellij.build.pycharm.edu
+import com.intellij.util.SystemProperties
import org.jetbrains.intellij.build.*
import org.jetbrains.intellij.build.pycharm.PyCharmMacDistributionCustomizer
import org.jetbrains.intellij.build.pycharm.PyCharmPropertiesBase
@@ -36,7 +37,10 @@ class PyCharmEduProperties extends PyCharmPropertiesBase {
fileset(file: "$context.paths.communityHome/NOTICE.txt")
}
- def resourcesDir = new File("$pythonCommunityPath/educational-python/resources/")
+ def dependenciesProjectDir = new File("$pythonCommunityPath/educational-python/build/dependencies")
+ new GradleRunner(dependenciesProjectDir, context.messages, SystemProperties.getJavaHome()).run("Downloading EduTools plugin...", "setupEduPlugin")
+
+ def resourcesDir = new File("${dependenciesProjectDir.absolutePath}/build/edu/")
def files = resourcesDir.listFiles(new FilenameFilter() {
@Override
boolean accept(File dir, String name) {
diff --git a/python/educational-python/build/src/SetupEduPlugin.kt b/python/educational-python/build/src/SetupEduPlugin.kt
deleted file mode 100644
index 0d04581e8c0a..000000000000
--- a/python/educational-python/build/src/SetupEduPlugin.kt
+++ /dev/null
@@ -1,24 +0,0 @@
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.util.io.ZipUtil
-import java.io.File
-import java.io.FileFilter
-
-/**
- * Deploys Educational plugin into config/plugins directory.
- * Plugins directory is specified in "idea.plugins.path" system property.
- */
-fun main(args: Array) {
- var rootPath = File("").absolutePath
- val outputDir = File(rootPath, FileUtil.toSystemDependentName(System.getProperty("idea.plugins.path")))
- val communityPath = FileUtil.join(rootPath, "community")
- if (File(communityPath).exists()) {
- rootPath = communityPath
- }
- val resourcesPath = FileUtil.join(rootPath, "python", "educational-python", "resources")
- val files = File(resourcesPath).listFiles(
- FileFilter { pathname -> pathname.name.matches(Regex("EduTools-[0-9.]+-[0-9.]+-[0-9.]+.zip")) })
- if (files.isEmpty()) {
- throw IllegalStateException("EduTools bundled plugin is not found in $resourcesPath")
- }
- ZipUtil.extract(files[0], outputDir, null)
-}
diff --git a/python/educational-python/resources/EduTools-1.1-2017.3-88.zip b/python/educational-python/resources/EduTools-1.1-2017.3-88.zip
deleted file mode 100644
index 24b5bfd21900..000000000000
Binary files a/python/educational-python/resources/EduTools-1.1-2017.3-88.zip and /dev/null differ