diff --git a/build/scripts/libLicenses.gant b/build/scripts/libLicenses.gant
index d957e73a886f..e31fa37fd63a 100644
--- a/build/scripts/libLicenses.gant
+++ b/build/scripts/libLicenses.gant
@@ -199,8 +199,8 @@ libraryLicense(name: "fxg-utils", libraryName: "fxg-utils", version: "4.9.1", li
 libraryLicense(name: "Gant", version: "1.9.8", libraryName: "gant-1.9.11_groovy-2.3.0.jar", license: "Apache 2.0", url: "https://github.com/codehaus/gant", licenseUrl: "https://github.com/codehaus/gant/blob/master/LICENCE.txt")
 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")
 libraryLicense(name: "Google Feedback", libraryName: "GoogleFeedback.jar", version: "", license: "TBD")
-libraryLicense(name: "gradle-tooling-api-2.9.jar", version: "2.9", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
-libraryLicense(name: "Gradle", version: "2.9", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+libraryLicense(name: "gradle-tooling-api-2.12.jar", version: "2.12", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
+libraryLicense(name: "Gradle", version: "2.12", license: "Apache 2.0", url: "http://gradle.org/", licenseUrl: "http://gradle.org/license")
 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")
 libraryLicense(name: "GradleJnaPosix", version: "1.0.3", license: "LGPL 2.1", url: "http://www.jruby.org/", licenseUrl: "http://www.gnu.org/licenses/lgpl-2.1.txt")
 libraryLicense(name: "Groovy", version: "2.4.6", license: "Apache 2.0", url: "http://groovy-lang.org/")
diff --git a/plugins/gradle/gradle.iml b/plugins/gradle/gradle.iml
index fa96b0de421e..766dcf76987b 100644
--- a/plugins/gradle/gradle.iml
+++ b/plugins/gradle/gradle.iml
@@ -29,31 +29,31 @@
     <orderEntry type="module-library" exported="">
       <library name="Gradle">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/gradle-tooling-api-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-core-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-messaging-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-model-core-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-model-groovy-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-wrapper-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-base-services-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-base-services-groovy-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-native-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-resources-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-cli-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-tooling-api-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-core-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-messaging-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-model-core-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-model-groovy-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-wrapper-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-base-services-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-base-services-groovy-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-native-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-resources-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-cli-2.12.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/model-core/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/model-groovy/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/native/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/resources/src/main/java" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/cli/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/tooling-api/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/core/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/model-core/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/model-groovy/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/messaging/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/wrapper/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/base-services/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/base-services-groovy/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/native/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/resources/src/main/java" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/cli/src/main/java" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -80,7 +80,7 @@
     <orderEntry type="module-library" exported="">
       <library name="commons-io">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/lib/commons-io-1.4.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/commons-io-2.2.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES />
diff --git a/plugins/gradle/jps-plugin/gradle-jps-plugin.iml b/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
index 2c95851a133a..c78060418b3e 100644
--- a/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
+++ b/plugins/gradle/jps-plugin/gradle-jps-plugin.iml
@@ -15,29 +15,29 @@
     <orderEntry type="module-library">
       <library name="Gradle">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-model-core-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-model-groovy-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-resources-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-model-core-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-model-groovy-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-resources-2.12.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/model-core/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/model-groovy/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/native/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/resources/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/tooling-api/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/core/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/model-core/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/model-groovy/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/messaging/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/wrapper/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/base-services/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/base-services-groovy/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/native/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/resources/src/main/java" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/plugins/gradle/lib/commons-io-1.4.jar b/plugins/gradle/lib/commons-io-1.4.jar
deleted file mode 100644
index 133dc6cb35f5..000000000000
Binary files a/plugins/gradle/lib/commons-io-1.4.jar and /dev/null differ
diff --git a/plugins/gradle/lib/commons-io-2.2.jar b/plugins/gradle/lib/commons-io-2.2.jar
new file mode 100644
index 000000000000..84ca565859dc
Binary files /dev/null and b/plugins/gradle/lib/commons-io-2.2.jar differ
diff --git a/plugins/gradle/lib/gradle-2.9-src.zip b/plugins/gradle/lib/gradle-2.12-src.zip
similarity index 70%
rename from plugins/gradle/lib/gradle-2.9-src.zip
rename to plugins/gradle/lib/gradle-2.12-src.zip
index 94a0a2d9c021..4a846ab3a537 100644
Binary files a/plugins/gradle/lib/gradle-2.9-src.zip and b/plugins/gradle/lib/gradle-2.12-src.zip differ
diff --git a/plugins/gradle/lib/gradle-base-services-2.9.jar b/plugins/gradle/lib/gradle-base-services-2.12.jar
similarity index 61%
rename from plugins/gradle/lib/gradle-base-services-2.9.jar
rename to plugins/gradle/lib/gradle-base-services-2.12.jar
index 716feb2793e1..5f69bb361795 100644
Binary files a/plugins/gradle/lib/gradle-base-services-2.9.jar and b/plugins/gradle/lib/gradle-base-services-2.12.jar differ
diff --git a/plugins/gradle/lib/gradle-base-services-groovy-2.9.jar b/plugins/gradle/lib/gradle-base-services-groovy-2.12.jar
similarity index 71%
rename from plugins/gradle/lib/gradle-base-services-groovy-2.9.jar
rename to plugins/gradle/lib/gradle-base-services-groovy-2.12.jar
index 7aa1070e1873..3847d2c2adb3 100644
Binary files a/plugins/gradle/lib/gradle-base-services-groovy-2.9.jar and b/plugins/gradle/lib/gradle-base-services-groovy-2.12.jar differ
diff --git a/plugins/gradle/lib/gradle-cli-2.9.jar b/plugins/gradle/lib/gradle-cli-2.12.jar
similarity index 86%
rename from plugins/gradle/lib/gradle-cli-2.9.jar
rename to plugins/gradle/lib/gradle-cli-2.12.jar
index 7441f20291a9..064c2741d42e 100644
Binary files a/plugins/gradle/lib/gradle-cli-2.9.jar and b/plugins/gradle/lib/gradle-cli-2.12.jar differ
diff --git a/plugins/gradle/lib/gradle-core-2.9.jar b/plugins/gradle/lib/gradle-core-2.12.jar
similarity index 67%
rename from plugins/gradle/lib/gradle-core-2.9.jar
rename to plugins/gradle/lib/gradle-core-2.12.jar
index 2469cfb1b55d..2290def13780 100644
Binary files a/plugins/gradle/lib/gradle-core-2.9.jar and b/plugins/gradle/lib/gradle-core-2.12.jar differ
diff --git a/plugins/gradle/lib/gradle-messaging-2.9.jar b/plugins/gradle/lib/gradle-messaging-2.12.jar
similarity index 86%
rename from plugins/gradle/lib/gradle-messaging-2.9.jar
rename to plugins/gradle/lib/gradle-messaging-2.12.jar
index 51b114acdf19..448171e9ab2f 100644
Binary files a/plugins/gradle/lib/gradle-messaging-2.9.jar and b/plugins/gradle/lib/gradle-messaging-2.12.jar differ
diff --git a/plugins/gradle/lib/gradle-model-core-2.12.jar b/plugins/gradle/lib/gradle-model-core-2.12.jar
new file mode 100644
index 000000000000..14bbf1c2415b
Binary files /dev/null and b/plugins/gradle/lib/gradle-model-core-2.12.jar differ
diff --git a/plugins/gradle/lib/gradle-model-core-2.9.jar b/plugins/gradle/lib/gradle-model-core-2.9.jar
deleted file mode 100644
index 040a045ebec5..000000000000
Binary files a/plugins/gradle/lib/gradle-model-core-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-model-groovy-2.12.jar b/plugins/gradle/lib/gradle-model-groovy-2.12.jar
new file mode 100644
index 000000000000..4be7219dc216
Binary files /dev/null and b/plugins/gradle/lib/gradle-model-groovy-2.12.jar differ
diff --git a/plugins/gradle/lib/gradle-model-groovy-2.9.jar b/plugins/gradle/lib/gradle-model-groovy-2.9.jar
deleted file mode 100644
index 3aef5d31058b..000000000000
Binary files a/plugins/gradle/lib/gradle-model-groovy-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-native-2.12.jar b/plugins/gradle/lib/gradle-native-2.12.jar
new file mode 100644
index 000000000000..80a1fa97e12f
Binary files /dev/null and b/plugins/gradle/lib/gradle-native-2.12.jar differ
diff --git a/plugins/gradle/lib/gradle-native-2.9.jar b/plugins/gradle/lib/gradle-native-2.9.jar
deleted file mode 100644
index 3c55aa2a807a..000000000000
Binary files a/plugins/gradle/lib/gradle-native-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/lib/gradle-resources-2.9.jar b/plugins/gradle/lib/gradle-resources-2.12.jar
similarity index 80%
rename from plugins/gradle/lib/gradle-resources-2.9.jar
rename to plugins/gradle/lib/gradle-resources-2.12.jar
index 2765bd57e82c..10886bd10578 100644
Binary files a/plugins/gradle/lib/gradle-resources-2.9.jar and b/plugins/gradle/lib/gradle-resources-2.12.jar differ
diff --git a/plugins/gradle/lib/gradle-tooling-api-2.9.jar b/plugins/gradle/lib/gradle-tooling-api-2.12.jar
similarity index 65%
rename from plugins/gradle/lib/gradle-tooling-api-2.9.jar
rename to plugins/gradle/lib/gradle-tooling-api-2.12.jar
index e7437491e0f5..a25735987be7 100644
Binary files a/plugins/gradle/lib/gradle-tooling-api-2.9.jar and b/plugins/gradle/lib/gradle-tooling-api-2.12.jar differ
diff --git a/plugins/gradle/lib/gradle-wrapper-2.9.jar b/plugins/gradle/lib/gradle-wrapper-2.12.jar
similarity index 89%
rename from plugins/gradle/lib/gradle-wrapper-2.9.jar
rename to plugins/gradle/lib/gradle-wrapper-2.12.jar
index a71848286023..dc8960e1f475 100644
Binary files a/plugins/gradle/lib/gradle-wrapper-2.9.jar and b/plugins/gradle/lib/gradle-wrapper-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
index a516517a9136..c0ec80df4bc8 100644
--- a/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
+++ b/plugins/gradle/tooling-extension-api/gradle-tooling-extension-api.iml
@@ -15,23 +15,23 @@
     <orderEntry type="module-library" exported="">
       <library name="Gradle">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.12.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/native/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/tooling-api/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/core/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/messaging/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/wrapper/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/base-services/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/base-services-groovy/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/native/src/main/java" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.12.jar
new file mode 100644
index 000000000000..3ad6db1b0b5e
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.9.jar
deleted file mode 100644
index b440e4fd857a..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-build-init-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.12.jar
similarity index 52%
rename from plugins/gradle/tooling-extension-api/lib/gradle-ide-2.9.jar
rename to plugins/gradle/tooling-extension-api/lib/gradle-ide-2.12.jar
index 49c8071ff1a8..3fc917cf9227 100644
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.9.jar and b/plugins/gradle/tooling-extension-api/lib/gradle-ide-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.12.jar
new file mode 100644
index 000000000000..952ba92eeeab
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.9.jar
deleted file mode 100644
index 1754cca8dd99..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-java-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.12.jar
new file mode 100644
index 000000000000..fe1e292563a7
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.9.jar
deleted file mode 100644
index ed797201ca8c..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-jvm-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.12.jar
new file mode 100644
index 000000000000..4a12dffa8098
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.9.jar
deleted file mode 100644
index a4207e10d70a..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-language-scala-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.12.jar
new file mode 100644
index 000000000000..b42768fe3f6d
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.9.jar
deleted file mode 100644
index 7a9dbbdaf4c7..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-platform-base-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.12.jar
new file mode 100644
index 000000000000..9ab119a9a568
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.9.jar
deleted file mode 100644
index 9d8acf7c4812..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-platform-jvm-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.12.jar
new file mode 100644
index 000000000000..9ea5a7c1741f
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.9.jar
deleted file mode 100644
index e9b4de2f403d..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-plugins-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.12.jar
new file mode 100644
index 000000000000..211748d73cb4
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.9.jar b/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.9.jar
deleted file mode 100644
index 38c6d6e377b2..000000000000
Binary files a/plugins/gradle/tooling-extension-api/lib/gradle-scala-2.9.jar and /dev/null differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.12.jar
new file mode 100644
index 000000000000..3ac4eb178e74
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-testing-base-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.12.jar b/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.12.jar
new file mode 100644
index 000000000000..a49e401c3e50
Binary files /dev/null and b/plugins/gradle/tooling-extension-api/lib/gradle-testing-jvm-2.12.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 03860e7888e5..232a3ce5d488 100644
--- a/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
+++ b/plugins/gradle/tooling-extension-impl/gradle-tooling-extension-impl.iml
@@ -13,29 +13,29 @@
     <orderEntry type="module-library">
       <library name="Gradle">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-model-core-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-model-groovy-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-tooling-api-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-core-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-model-core-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-model-groovy-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-messaging-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-wrapper-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-base-services-groovy-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-native-2.12.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/core/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/messaging/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/wrapper/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/base-services-groovy/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/build-init/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/plugins/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/ide/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/ide/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/scala/src/main/groovy" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/reporting/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/core/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/messaging/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/wrapper/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/base-services/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/base-services-groovy/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/build-init/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/plugins/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/ide/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/ide/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/scala/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/reporting/src/main/groovy" />
         </SOURCES>
       </library>
     </orderEntry>
@@ -53,22 +53,24 @@
     <orderEntry type="module-library" scope="PROVIDED">
       <library name="GradleToolingExtension">
         <CLASSES>
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-reporting-2.9.jar!/" />
-          <root url="jar://$MODULE_DIR$/lib/gradle-ear-2.9.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-build-init-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-ide-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-java-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-jvm-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-base-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-platform-jvm-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-plugins-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-base-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-testing-jvm-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-scala-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/../tooling-extension-api/lib/gradle-language-scala-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-reporting-2.12.jar!/" />
+          <root url="jar://$MODULE_DIR$/lib/gradle-ear-2.12.jar!/" />
         </CLASSES>
         <JAVADOC />
         <SOURCES>
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/tooling-api/src/main/java" />
-          <root url="jar://$MODULE_DIR$/../lib/gradle-2.9-src.zip!/gradle-2.9/subprojects/ear/src/main/groovy" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/tooling-api/src/main/java" />
+          <root url="jar://$MODULE_DIR$/../lib/gradle-2.12-src.zip!/gradle-2.12/subprojects/ear/src/main/groovy" />
         </SOURCES>
       </library>
     </orderEntry>
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.9.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.12.jar
similarity index 65%
rename from plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.9.jar
rename to plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.12.jar
index a156d1b40a66..c94e44ba4c62 100644
Binary files a/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.9.jar and b/plugins/gradle/tooling-extension-impl/lib/gradle-ear-2.12.jar differ
diff --git a/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.9.jar b/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.12.jar
similarity index 88%
rename from plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.9.jar
rename to plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.12.jar
index 697043caffd4..a36b34cb2599 100644
Binary files a/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.9.jar and b/plugins/gradle/tooling-extension-impl/lib/gradle-reporting-2.12.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
index 1662240dd368..64cffb6728e6 100644
--- 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
@@ -18,6 +18,7 @@ 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;
@@ -34,6 +35,11 @@ public class StubIdeaModule implements IdeaModule, Serializable {
     this.name = name;
   }
 
+  @Override
+  public IdeaJavaLanguageSettings getJavaLanguageSettings() throws UnsupportedMethodException {
+    throw new UnsupportedOperationException();
+  }
+
   @Override
   public DomainObjectSet<? extends IdeaContentRoot> getContentRoots() {
     throw new UnsupportedOperationException();