diff --git a/.idea/libraries/Gradle.xml b/.idea/libraries/Gradle.xml
index 5edf4faa43f1..35d271432636 100644
--- a/.idea/libraries/Gradle.xml
+++ b/.idea/libraries/Gradle.xml
@@ -1,31 +1,35 @@
 <component name="libraryTable">
   <library name="Gradle">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-tooling-api-2.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-core-2.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-messaging-2.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-core-2.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-groovy-2.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-wrapper-2.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-2.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-groovy-2.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-native-2.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-resources-2.13.jar!/" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-cli-2.13.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-tooling-api-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-core-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-messaging-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-core-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-model-groovy-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-wrapper-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-base-services-groovy-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-process-services-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-native-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-resources-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-cli-2.14.1.jar!/" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-logging-2.14.1.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/tooling-api/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/core/src/main/groovy" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/model-core/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/model-groovy/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/messaging/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/wrapper/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/base-services-groovy/src/main/groovy" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/native/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/resources/src/main/java" />
-      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/cli/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/tooling-api/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/core/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/model-core/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/model-groovy/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/messaging/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/wrapper/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/base-services/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/base-services-groovy/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/process-services/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/native/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/resources/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/cli/src/main/java" />
+      <root url="jar://$PROJECT_DIR$/plugins/gradle/lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/logging/src/main/java" />
     </SOURCES>
   </library>
 </component>
\ No newline at end of file
diff --git a/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy b/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
index c3f3e7d6b00b..f160c9cdab99 100644
--- a/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
+++ b/build/groovy/org/jetbrains/intellij/build/CommunityLibraryLicenses.groovy
@@ -125,9 +125,9 @@ class CommunityLibraryLicenses {
     new LibraryLicense(name: "Gherkin", libraryName: "Gherkin", version: "2.12.2", license: "MIT",
                        licenseUrl: "http://www.apache.org/licenses/LICENSE-2.0.txt", url: "https://github.com/cucumber/gherkin"),
     new LibraryLicense(name: "Google Feedback", libraryName: "GoogleFeedback.jar", version: "", license: "TBD"),
-    new LibraryLicense(name: "gradle-tooling-api-2.13.jar", version: "2.13", license: "Apache 2.0", url: "http://gradle.org/",
+    new LibraryLicense(name: "gradle-tooling-api-2.14.1.jar", version: "2.14.1", license: "Apache 2.0", url: "http://gradle.org/",
                        licenseUrl: "http://gradle.org/license"),
-    new LibraryLicense(name: "Gradle", version: "2.13", license: "Apache 2.0", url: "http://gradle.org/",
+    new LibraryLicense(name: "Gradle", version: "2.14.1", license: "Apache 2.0", url: "http://gradle.org/",
                        licenseUrl: "http://gradle.org/license"),
     new LibraryLicense(name: "GradleGuava", version: "14.0.1", license: "Apache 2.0", url: "http://code.google.com/p/guava-libraries/",
                        licenseUrl: "http://apache.org/licenses/LICENSE-2.0"),
diff --git a/plugins/gradle/lib/gradle-2.13-src.zip b/plugins/gradle/lib/gradle-2.14.1-src.zip
similarity index 71%
rename from plugins/gradle/lib/gradle-2.13-src.zip
rename to plugins/gradle/lib/gradle-2.14.1-src.zip
index f80d84301b02..6e492dd2ce03 100644
Binary files a/plugins/gradle/lib/gradle-2.13-src.zip and b/plugins/gradle/lib/gradle-2.14.1-src.zip differ
diff --git a/plugins/gradle/lib/gradle-base-services-2.13.jar b/plugins/gradle/lib/gradle-base-services-2.14.1.jar
similarity index 52%
rename from plugins/gradle/lib/gradle-base-services-2.13.jar
rename to plugins/gradle/lib/gradle-base-services-2.14.1.jar
index 4630ecae9962..a7da31a33a5a 100644
Binary files a/plugins/gradle/lib/gradle-base-services-2.13.jar and b/plugins/gradle/lib/gradle-base-services-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-base-services-groovy-2.13.jar b/plugins/gradle/lib/gradle-base-services-groovy-2.14.1.jar
similarity index 81%
rename from plugins/gradle/lib/gradle-base-services-groovy-2.13.jar
rename to plugins/gradle/lib/gradle-base-services-groovy-2.14.1.jar
index 6309eb3c6238..555584c393e1 100644
Binary files a/plugins/gradle/lib/gradle-base-services-groovy-2.13.jar and b/plugins/gradle/lib/gradle-base-services-groovy-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-cli-2.13.jar b/plugins/gradle/lib/gradle-cli-2.14.1.jar
similarity index 86%
rename from plugins/gradle/lib/gradle-cli-2.13.jar
rename to plugins/gradle/lib/gradle-cli-2.14.1.jar
index 792270433a99..f758d17c0cdb 100644
Binary files a/plugins/gradle/lib/gradle-cli-2.13.jar and b/plugins/gradle/lib/gradle-cli-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-core-2.13.jar b/plugins/gradle/lib/gradle-core-2.14.1.jar
similarity index 58%
rename from plugins/gradle/lib/gradle-core-2.13.jar
rename to plugins/gradle/lib/gradle-core-2.14.1.jar
index e5e712c2bffb..152abf46c8ed 100644
Binary files a/plugins/gradle/lib/gradle-core-2.13.jar and b/plugins/gradle/lib/gradle-core-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-logging-2.14.1.jar b/plugins/gradle/lib/gradle-logging-2.14.1.jar
new file mode 100644
index 000000000000..d248a048ce66
Binary files /dev/null and b/plugins/gradle/lib/gradle-logging-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-messaging-2.13.jar b/plugins/gradle/lib/gradle-messaging-2.13.jar
deleted file mode 100644
index cd06de63d49b..000000000000
Binary files a/plugins/gradle/lib/gradle-messaging-2.13.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-messaging-2.14.1.jar b/plugins/gradle/lib/gradle-messaging-2.14.1.jar
new file mode 100644
index 000000000000..413970869049
Binary files /dev/null and b/plugins/gradle/lib/gradle-messaging-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-model-core-2.13.jar b/plugins/gradle/lib/gradle-model-core-2.14.1.jar
similarity index 59%
rename from plugins/gradle/lib/gradle-model-core-2.13.jar
rename to plugins/gradle/lib/gradle-model-core-2.14.1.jar
index d9c21f9cada8..a5ce28ea2742 100644
Binary files a/plugins/gradle/lib/gradle-model-core-2.13.jar and b/plugins/gradle/lib/gradle-model-core-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-model-groovy-2.13.jar b/plugins/gradle/lib/gradle-model-groovy-2.14.1.jar
similarity index 79%
rename from plugins/gradle/lib/gradle-model-groovy-2.13.jar
rename to plugins/gradle/lib/gradle-model-groovy-2.14.1.jar
index e07927857087..48a31bfc77c7 100644
Binary files a/plugins/gradle/lib/gradle-model-groovy-2.13.jar and b/plugins/gradle/lib/gradle-model-groovy-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-native-2.13.jar b/plugins/gradle/lib/gradle-native-2.14.1.jar
similarity index 74%
rename from plugins/gradle/lib/gradle-native-2.13.jar
rename to plugins/gradle/lib/gradle-native-2.14.1.jar
index b13f5c5e9427..825b53228aad 100644
Binary files a/plugins/gradle/lib/gradle-native-2.13.jar and b/plugins/gradle/lib/gradle-native-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-process-services-2.14.1.jar b/plugins/gradle/lib/gradle-process-services-2.14.1.jar
new file mode 100644
index 000000000000..b8f8957711eb
Binary files /dev/null and b/plugins/gradle/lib/gradle-process-services-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-resources-2.13.jar b/plugins/gradle/lib/gradle-resources-2.14.1.jar
similarity index 66%
rename from plugins/gradle/lib/gradle-resources-2.13.jar
rename to plugins/gradle/lib/gradle-resources-2.14.1.jar
index e79f69c23936..6cfb52700baa 100644
Binary files a/plugins/gradle/lib/gradle-resources-2.13.jar and b/plugins/gradle/lib/gradle-resources-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-tooling-api-2.13.jar b/plugins/gradle/lib/gradle-tooling-api-2.14.1.jar
similarity index 50%
rename from plugins/gradle/lib/gradle-tooling-api-2.13.jar
rename to plugins/gradle/lib/gradle-tooling-api-2.14.1.jar
index 47ae9aa4e17d..e9cb2f2d09d7 100644
Binary files a/plugins/gradle/lib/gradle-tooling-api-2.13.jar and b/plugins/gradle/lib/gradle-tooling-api-2.14.1.jar differ
diff --git a/plugins/gradle/lib/gradle-wrapper-2.13.jar b/plugins/gradle/lib/gradle-wrapper-2.14.1.jar
similarity index 82%
rename from plugins/gradle/lib/gradle-wrapper-2.13.jar
rename to plugins/gradle/lib/gradle-wrapper-2.14.1.jar
index fdae99e29c0a..e0949a01095c 100644
Binary files a/plugins/gradle/lib/gradle-wrapper-2.13.jar and b/plugins/gradle/lib/gradle-wrapper-2.14.1.jar differ
diff --git a/plugins/gradle/resources/fileTemplates/internal/Gradle Build Script with wrapper.gradle.ft b/plugins/gradle/resources/fileTemplates/internal/Gradle Build Script with wrapper.gradle.ft
index 8c8d1e61599f..a3f5075c0a4a 100644
--- a/plugins/gradle/resources/fileTemplates/internal/Gradle Build Script with wrapper.gradle.ft	
+++ b/plugins/gradle/resources/fileTemplates/internal/Gradle Build Script with wrapper.gradle.ft	
@@ -9,7 +9,7 @@ task wrapper(type: Wrapper) {
 #if (${GRADLE_VERSION} && ${GRADLE_VERSION} != "")
   gradleVersion = '${GRADLE_VERSION}'
 #else
-  gradleVersion = '2.3'
+  gradleVersion = '2.14.1'
 #end
   distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
 }
diff --git a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/DistributionFactoryExt.java b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/DistributionFactoryExt.java
index 885515a8ca61..26cab5564dd5 100644
--- a/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/DistributionFactoryExt.java
+++ b/plugins/gradle/src/org/jetbrains/plugins/gradle/service/project/DistributionFactoryExt.java
@@ -20,8 +20,8 @@ import org.gradle.internal.Factory;
 import org.gradle.internal.UncheckedException;
 import org.gradle.internal.classpath.ClassPath;
 import org.gradle.internal.classpath.DefaultClassPath;
-import org.gradle.logging.ProgressLogger;
-import org.gradle.logging.ProgressLoggerFactory;
+import org.gradle.internal.logging.progress.ProgressLogger;
+import org.gradle.internal.logging.progress.ProgressLoggerFactory;
 import org.gradle.tooling.BuildCancelledException;
 import org.gradle.tooling.GradleConnectionException;
 import org.gradle.tooling.internal.consumer.Distribution;
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.14.1.jar
similarity index 63%
rename from plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.13.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.14.1.jar
index 4f8838624a95..140f5ea7a7af 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.13.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.13.jar
deleted file mode 100644
index 2ff995048984..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.13.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.14.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.14.1.jar
new file mode 100644
index 000000000000..c375f7564ebd
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.14.1.jar
similarity index 77%
rename from plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.13.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.14.1.jar
index 55cd5f0d1f17..7c55cde6470b 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.13.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.14.1.jar
similarity index 63%
rename from plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.13.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.14.1.jar
index 8abe3499486c..ffca68013cc5 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.13.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.14.1.jar
similarity index 62%
rename from plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.13.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.14.1.jar
index 529c56b15a8b..d9a4f602575a 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.13.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.14.1.jar
similarity index 66%
rename from plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.13.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.14.1.jar
index 36a6ee681885..753c518aa7d2 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.13.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.14.1.jar
similarity index 61%
rename from plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.13.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.14.1.jar
index b775514c7529..b81d426cb6b5 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.13.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.13.jar
deleted file mode 100644
index 80048c52f84d..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.13.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.14.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.14.1.jar
new file mode 100644
index 000000000000..295f5f40e7fa
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.13.jar
deleted file mode 100644
index 2d6c6b212abf..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.13.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.14.1.jar b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.14.1.jar
new file mode 100644
index 000000000000..f4a3348ce62c
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.14.1.jar
similarity index 65%
rename from plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.13.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.14.1.jar
index 263446382894..0a2e1ded6fde 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.13.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.13.jar b/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.14.1.jar
similarity index 63%
rename from plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.13.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.14.1.jar
index 98f0c5985e34..8f893402dc00 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.13.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
index 6fa4f7c53e8d..b9d59105ec97 100644
--- a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
+++ b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
@@ -25,24 +25,24 @@
     <orderEntry type="module-library" scope="PROVIDED">
       <library name="GradleToolingExtension">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-base-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-jvm-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-reporting-2.13.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-ear-2.13.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-base-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-jvm-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-reporting-2.14.1.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-ear-2.14.1.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.13-src.zip!/gradle-2.13/subprojects/ear/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/tooling-api/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.14.1-src.zip!/gradle-2.14.1/subprojects/ear/src/main/groovy" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.13.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.13.jar
deleted file mode 100644
index 8b329f88fa18..000000000000
Binary files a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.13.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.14.1.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.14.1.jar
new file mode 100644
index 000000000000..7c8ba4588e9e
Binary files /dev/null and b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.13.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.14.1.jar
similarity index 80%
rename from plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.13.jar
rename to plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.14.1.jar
index 21ede409d436..cb30e5b26550 100644
Binary files a/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.13.jar and b/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.14.1.jar differ
diff --git a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/StubIdeaModule.java b/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/StubIdeaModule.java
deleted file mode 100644
index 64cffb6728e6..000000000000
--- a/plugins/gradle/tooling-extension-impl/src/org/jetbrains/plugins/gradle/tooling/internal/StubIdeaModule.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright 2000-2014 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.
- */
-package org.jetbrains.plugins.gradle.tooling.internal;
-
-import org.gradle.tooling.model.DomainObjectSet;
-import org.gradle.tooling.model.GradleProject;
-import org.gradle.tooling.model.HierarchicalElement;
-import org.gradle.tooling.model.UnsupportedMethodException;
-import org.gradle.tooling.model.idea.*;
-
-import java.io.Serializable;
-
-/**
- * @author Vladislav.Soroka
- * @since 11/25/13
- */
-public class StubIdeaModule implements IdeaModule, Serializable {
-
-  private final String name;
-
-  public StubIdeaModule(String name) {
-    this.name = name;
-  }
-
-  @Override
-  public IdeaJavaLanguageSettings getJavaLanguageSettings() throws UnsupportedMethodException {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public DomainObjectSet<? extends IdeaContentRoot> getContentRoots() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public GradleProject getGradleProject() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public IdeaProject getParent() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public DomainObjectSet<? extends HierarchicalElement> getChildren() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public IdeaProject getProject() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public IdeaCompilerOutput getCompilerOutput() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public DomainObjectSet<? extends IdeaDependency> getDependencies() {
-    throw new UnsupportedOperationException();
-  }
-
-  @Override
-  public String getName() {
-    return name;
-  }
-
-  @Override
-  public String getDescription() {
-    throw new UnsupportedOperationException();
-  }
-}
diff --git a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
index a96fa48f15af..251bc4fabfb0 100644
--- a/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
+++ b/plugins/gradle/tooling-extension-impl/testSources/org/jetbrains/plugins/gradle/tooling/builder/AbstractModelBuilderTest.java
@@ -69,7 +69,7 @@ public abstract class AbstractModelBuilderTest {
 
   public static final Object[][] SUPPORTED_GRADLE_VERSIONS = {
     {"1.9"}, /*{"1.10"}, {"1.11"},*/ {"1.12"},
-    {"2.0"}, /*{"2.1"}, {"2.2"} , {"2.3"}, {"2.4"}, */{"2.5"}, /*{"2.6"}, {"2.7"}, {"2.8"},*/ {"2.9"}, /*{"2.10"}, {"2.11"}, {"2.12"},*/ {"2.13"}
+    {"2.0"}, /*{"2.1"}, {"2.2"} , {"2.3"}, {"2.4"}, */{"2.5"}, /*{"2.6"}, {"2.7"}, {"2.8"},*/ {"2.9"}, /*{"2.10"}, {"2.11"}, {"2.12"}, {"2.13"}, */{"2.14.1"}
   };
   public static final String BASE_GRADLE_VERSION = String.valueOf(SUPPORTED_GRADLE_VERSIONS[SUPPORTED_GRADLE_VERSIONS.length - 1][0]);