From 3a0c3feeeeef56154ac44b7d29a958607d17f415 Mon Sep 17 00:00:00 2001 From: Ekaterina Tuzova Date: Thu, 5 May 2016 15:24:14 +0300 Subject: [PATCH] updated build directories and gradle version --- python/educational-core/build.gradle | 3 +++ python/educational-core/course-creator/course-creator.iml | 2 -- python/educational-core/educational-core.iml | 2 +- .../educational-core/gradle/wrapper/gradle-wrapper.properties | 4 ++-- python/educational-core/student/student.iml | 2 -- 5 files changed, 6 insertions(+), 7 deletions(-) diff --git a/python/educational-core/build.gradle b/python/educational-core/build.gradle index e563ad317069..60866e143a52 100644 --- a/python/educational-core/build.gradle +++ b/python/educational-core/build.gradle @@ -25,6 +25,7 @@ subprojects { version ideaVersion updateSinceUntilBuild true downloadSources Boolean.valueOf(downloadIdeaSources) + sandboxDirectory = new File(rootProject.projectDir, "gradleBuild/idea-sandbox") } processResources { @@ -39,6 +40,8 @@ subprojects { archiveName = "$intellij.pluginName-$version-${buildNumber}.zip" } } + + buildDir = new File(rootProject.projectDir, "gradleBuild/" + project.name) } project(':student') { diff --git a/python/educational-core/course-creator/course-creator.iml b/python/educational-core/course-creator/course-creator.iml index e1b3cb0ba27c..fed8cc4ab07d 100644 --- a/python/educational-core/course-creator/course-creator.iml +++ b/python/educational-core/course-creator/course-creator.iml @@ -5,8 +5,6 @@ - - diff --git a/python/educational-core/educational-core.iml b/python/educational-core/educational-core.iml index aa1fa8d39271..388e14658b4a 100644 --- a/python/educational-core/educational-core.iml +++ b/python/educational-core/educational-core.iml @@ -6,7 +6,7 @@ - + diff --git a/python/educational-core/gradle/wrapper/gradle-wrapper.properties b/python/educational-core/gradle/wrapper/gradle-wrapper.properties index 0473c0bf59a5..0f29a88b187b 100644 --- a/python/educational-core/gradle/wrapper/gradle-wrapper.properties +++ b/python/educational-core/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Apr 18 17:06:45 MSK 2016 +#Fri Apr 29 19:52:53 MSK 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.12-bin.zip diff --git a/python/educational-core/student/student.iml b/python/educational-core/student/student.iml index 8702c7849f52..80c21a26244e 100644 --- a/python/educational-core/student/student.iml +++ b/python/educational-core/student/student.iml @@ -5,8 +5,6 @@ - -