diff --git a/Android-Studio-Plugin/build.gradle b/Android-Studio-Plugin/build.gradle
index 81dfe53e..9234ea8c 100644
--- a/Android-Studio-Plugin/build.gradle
+++ b/Android-Studio-Plugin/build.gradle
@@ -1,6 +1,6 @@
 plugins {
-    id 'java-library'
-    id 'org.jetbrains.intellij' version '0.4.21'
+    id 'java'
+    id 'org.jetbrains.intellij' version '0.6.5'
     id "org.sonarqube" version "2.8"
 }
 
@@ -29,9 +29,7 @@ intellij {
     // https://www.jetbrains.org/intellij/sdk/docs/products/android_studio.html
     // Needs to be defined in the Gradle installation directory
     version project.hasProperty('nappaAndroidStudioVersion') ? nappaAndroidStudioVersion : 'LATEST-EAP-SNAPSHOT'
-
-    plugins 'android',
-            'java'
+    plugins = ['com.intellij.java']
 
     updateSinceUntilBuild false
 }
diff --git a/Android-Studio-Plugin/src/main/resources/META-INF/plugin.xml b/Android-Studio-Plugin/src/main/resources/META-INF/plugin.xml
index 507d9ce9..ae1906df 100644
--- a/Android-Studio-Plugin/src/main/resources/META-INF/plugin.xml
+++ b/Android-Studio-Plugin/src/main/resources/META-INF/plugin.xml
@@ -19,7 +19,8 @@
         <!-- Add your extensions here -->
         <moduleBuilder/>
     </extensions>
-
+    <depends>com.intellij.modules.platform</depends>
+    <depends>com.intellij.modules.java</depends>
     <actions>
         <group id="nappa"
                text="NAPPA"