diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 41f37d0db..3a2a0bbcf 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -11,7 +11,6 @@ buildscript {
     }
     dependencies {
         classpath 'io.fabric.tools:gradle:1.21.5'
-        classpath 'me.tatarka:gradle-retrolambda:3.3.1'
         classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.6.1'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     }
@@ -100,7 +99,7 @@ dependencies {
         transitive = true
     }
 
-    compile 'fr.avianey.com.viewpagerindicator:library:2.4.1@aar'
+    compile 'fr.avianey.com.viewpagerindicator:library:2.4.1.1@aar'
 
     //RxJava
     compile 'io.reactivex:rxandroid:1.2.1'
diff --git a/Habitica/proguard-rules.pro b/Habitica/proguard-rules.pro
index acbab7595..56e7704b3 100644
--- a/Habitica/proguard-rules.pro
+++ b/Habitica/proguard-rules.pro
@@ -123,6 +123,41 @@
 -keep class com.google.android.gms.ads.** { *; }
 #end amplitude
 
+#playservices
+-keep class * extends java.util.ListResourceBundle {
+    protected Object[][] getContents();
+}
+
+-keep public class com.google.android.gms.common.internal.safeparcel.SafeParcelable {
+    public static final *** NULL;
+}
+
+-keepnames @com.google.android.gms.common.annotation.KeepName class *
+-keepclassmembernames class * {
+    @com.google.android.gms.common.annotation.KeepName *;
+}
+
+-keepnames class * implements android.os.Parcelable {
+    public static final ** CREATOR;
+    }
+    -keep class com.google.android.gms.** { *; }
+    -dontwarn com.google.android.gms.**
+#end playservices
+
+#checkout
+-keep class com.android.vending.billing.**
+
+-assumenosideeffects class org.solovyev.android.checkout.Billing {
+    public static void debug(...);
+    public static void warning(...);
+    public static void error(...);
+}
+
+-assumenosideeffects class org.solovyev.android.checkout.Check {
+    static *;
+}
+#end chekout
+
 #add warnings here, warnings in proguard is normal
 -dontwarn javax.annotation.**
 -dontwarn com.squareup.picasso.**
diff --git a/build.gradle b/build.gradle
index 56bc166c2..ccbf97b2a 100644
--- a/build.gradle
+++ b/build.gradle
@@ -9,7 +9,12 @@ buildscript {
         classpath 'com.android.databinding:dataBinder:1.0-rc4'
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'me.tatarka:gradle-retrolambda:3.3.1'
+        classpath 'me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2'
     }
+
+    // Exclude the version that the android plugin depends on.
+    configurations.classpath.exclude group: 'com.android.tools.external.lombok'
 }
 
 allprojects {