diff --git a/.gitignore b/.gitignore
index 44a0c691d1c44d4dae375102e98e907090f89b25..7c3fce7fde322e959a7f0c222a6ed848bcbe9662 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ bin
 .settings
 *.iml
 .idea
+local.properties
diff --git a/build.gradle b/build.gradle
index 4bf3d5a6500bab603995e3be248796a98ef90dbd..e2d4f8fdce3c99f0bb4ff197e84902755bd4df4e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,7 +15,7 @@
  */
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '1.11'
+  gradleVersion = '2.2.1'
 }
 
 allprojects {
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index f856181f5999b5ca9353e3b5fcbd6b466c5206f9..c5f49969f17a4d6eb5ff7cd2d2601451558656f7 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradle_plugins/build.gradle b/gradle_plugins/build.gradle
index f9ca5fa034beeb4d28930187c6f2cc06ded8a63a..f1dd481287ad136f3f1231ec9e53aa82daa3cbbb 100644
--- a/gradle_plugins/build.gradle
+++ b/gradle_plugins/build.gradle
@@ -16,6 +16,7 @@
 
 apply plugin: 'groovy'
 
+//noinspection GroovyAssignabilityCheck
 dependencies {
     compile gradleApi()
     compile localGroovy()
diff --git a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy
index 0eb2297fba985991ea4d5fa919633a214171394d..85cbd7d01dfc3806a9786f17546778d7c3fb4d38 100644
--- a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy
+++ b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy
@@ -11,7 +11,7 @@ class RosAndroidPlugin implements Plugin<Project> {
   void apply(Project project) {
     project.apply plugin: "ros"
     project.extensions.create("rosandroid", RosAndroidPluginExtension)
-    project.rosandroid.buildToolsVersion = "19.1.0"
+    project.rosandroid.buildToolsVersion = "21.1.2"
 
     /********************************************************************** 
      * Publishing - not we're using old style here. Upgrade to maven-publish
diff --git a/message_generation/build.gradle b/message_generation/build.gradle
index 9958016b58d58a1581dccfa22720d309e024f048..3220e35261147bb582d067dd1f8b95ff1d02e59c 100644
--- a/message_generation/build.gradle
+++ b/message_generation/build.gradle
@@ -14,6 +14,7 @@
  * the License.
  */
 
+//noinspection GroovyAssignabilityCheck
 dependencies {
   compile 'io.netty:netty:3.5.2.Final'
   compile 'com.google.guava:guava:12.0'
@@ -26,4 +27,6 @@ dependencies {
 }
 
 apply plugin: "application"
+
+//noinspection GroovyUnusedAssignment
 mainClassName = "org.ros.internal.message.GenerateInterfaces"