diff --git a/build.gradle b/build.gradle
index ceb8dd9ec..3637ee055 100644
--- a/build.gradle
+++ b/build.gradle
@@ -62,18 +62,6 @@ android {
         }
     }
 
-    if (project.hasProperty('keyAlias') &&
-            project.hasProperty('storeFile') &&
-            project.hasProperty('storePassword') &&
-            project.hasProperty('keyPassword')) {
-        android.signingConfigs.release.keyAlias = keyAlias
-        android.signingConfigs.release.storeFile = file(storeFile)
-        android.signingConfigs.release.storePassword = storePassword
-        android.signingConfigs.release.keyPassword = keyPassword
-    } else {
-        buildTypes.release.signingConfig = null
-    }
-
     flavorDimensions 'store', 'env'
 
     productFlavors {
@@ -87,13 +75,25 @@ android {
             dimension 'store'
         }
         dev {
-            dimension 'env'
             minSdkVersion 21
+            dimension 'env'
         }
         prod {
             dimension 'env'
         }
     }
+
+    if (project.hasProperty('keyAlias') &&
+            project.hasProperty('storeFile') &&
+            project.hasProperty('storePassword') &&
+            project.hasProperty('keyPassword')) {
+        android.signingConfigs.release.keyAlias = keyAlias
+        android.signingConfigs.release.storeFile = file(storeFile)
+        android.signingConfigs.release.storePassword = storePassword
+        android.signingConfigs.release.keyPassword = keyPassword
+    } else {
+        buildTypes.release.signingConfig = null
+    }
 }
 
 configurations {
@@ -137,7 +137,7 @@ dependencies {
     }
 
     googleplayCompile 'com.google.android.apps.dashclock:dashclock-api:2.0.0'
-    googleplayCompile 'com.twofortyfouram:android-plugin-api-for-locale:[1.0.1,2.0['
+    googleplayCompile 'com.twofortyfouram:android-plugin-api-for-locale:1.0.2'
     googleplayCompile "com.google.android.gms:play-services-location:${GPS_VERSION}"
     googleplayCompile "com.google.android.gms:play-services-analytics:${GPS_VERSION}"
     googleplayCompile "com.google.android.gms:play-services-auth:${GPS_VERSION}"
diff --git a/src/googleplay/java/com/android/vending/billing/IabHelper.java b/src/googleplay/java/com/android/vending/billing/IabHelper.java
index a39321103..e15b8524e 100644
--- a/src/googleplay/java/com/android/vending/billing/IabHelper.java
+++ b/src/googleplay/java/com/android/vending/billing/IabHelper.java
@@ -15,6 +15,7 @@
 
 package com.android.vending.billing;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.app.PendingIntent;
 import android.content.ComponentName;
@@ -68,6 +69,7 @@ import java.util.concurrent.Executor;
  *
  */
 @SuppressWarnings("ALL")
+@SuppressLint("all")
 public class IabHelper {
 
     private final Executor executor;
diff --git a/src/googleplay/java/com/android/vending/billing/Security.java b/src/googleplay/java/com/android/vending/billing/Security.java
index 88deb4585..38b0d9be5 100644
--- a/src/googleplay/java/com/android/vending/billing/Security.java
+++ b/src/googleplay/java/com/android/vending/billing/Security.java
@@ -15,6 +15,7 @@
 
 package com.android.vending.billing;
 
+import android.annotation.SuppressLint;
 import android.text.TextUtils;
 import android.util.Base64;
 import android.util.Log;
@@ -38,6 +39,7 @@ import java.security.spec.X509EncodedKeySpec;
  * purchases as verified.
  */
 @SuppressWarnings("ALL")
+@SuppressLint("all")
 public class Security {
     private static final String TAG = "IABUtil/Security";