diff --git a/app/build.gradle b/app/build.gradle
index 001fce4..007c293 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,9 +1,24 @@
+buildscript {
+    repositories {
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath 'me.tatarka:gradle-retrolambda:3.2.5'
+    }
+}
+
+repositories {
+    mavenCentral()
+}
+
 apply plugin: 'com.android.application'
+apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'me.tatarka.retrolambda'
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.3"
 
     defaultConfig {
         applicationId "it.tiwiz.rxjavacrunch"
@@ -24,20 +39,20 @@ android {
     }
 }
 
-String getJavaHome(String version)
-{
-    def stdout = new ByteArrayOutputStream()
-    exec {
-        commandLine "/usr/libexec/java_home", "-v", version
-        standardOutput = stdout;
-    }
-    return stdout.toString().trim()
-}
+//String getJavaHome(String version)
+//{
+//    def stdout = new ByteArrayOutputStream()
+//    exec {
+//        commandLine "/usr/libexec/java_home", "-v", version
+//        standardOutput = stdout;
+//    }
+//    return stdout.toString().trim()
+//}
 
-retrolambda {
-    jdk System.getenv('JAVA8_HOME') ?: getJavaHome("1.8")
-    oldJdk System.getenv('JAVA7_HOME') ?: getJavaHome("1.7")
-}
+//retrolambda {
+//    jdk System.getenv('JAVA8_HOME') ?: getJavaHome("1.8")
+//    oldJdk System.getenv('JAVA7_HOME') ?: getJavaHome("1.7")
+//}
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
diff --git a/build.gradle b/build.gradle
index b54f9b2..cb2747e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.0'
-        classpath 'me.tatarka:gradle-retrolambda:3.2.2'
+        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }