Update Gradle Plugin and tidy up proguard settings for release build

Author: raruston

app/build.gradle

@@ -58,7 +58,6 @@ android {
         release
     }
 
-
     buildTypes {
         debug {
             applicationIdSuffix ".dbg"
@@ -73,7 +72,6 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
-
     }
 }
 

app/proguard-rules.pro

@@ -16,16 +16,56 @@
 #   public *;
 #}
 
-# Platform calls Class.forName on types which do not exist on Android to determine platform.
--dontnote retrofit2.Platform
-# Platform used when running on RoboVM on iOS. Will not be used at runtime.
--dontnote retrofit2.Platform$IOS$MainThreadExecutor
-# Platform used when running on Java 8 VMs. Will not be used at runtime.
--dontwarn retrofit2.Platform$Java8
-# Retain generic type information for use by reflection by converters and adapters.
+# Application classes that will be serialized/deserialized over Gson
+-keep class com.earthstormsoftware.motecontrol.MoteStatus { *; }
+-keep interface com.earthstormsoftware.motecontrol.MoteAPI { *; }
+
+# Rules for using the Support classes
+-keep public class android.support.v7.widget.** { *; }
+-keep public class android.support.v7.internal.widget.** { *; }
+-keep public class android.support.v7.internal.view.menu.** { *; }
+
+-keep public class * extends android.support.v4.view.ActionProvider {
+    public <init>(android.content.Context);
+}
+
+
+## GSON 2.2.4 specific rules ##
+
+# Gson uses generic type information stored in a class file when working with fields. Proguard
+# removes such information by default, so configure it to keep all of it.
+-keepattributes Signature
+
+# For using GSON @Expose annotation
+-keepattributes *Annotation*
+
+-keepattributes EnclosingMethod
+
+# Gson specific classes
+-keep class sun.misc.Unsafe { *; }
+-keep class com.google.gson.stream.** { *; }
+
+# Retrofit 2.X
+## https://square.github.io/retrofit/ ##
+
+-dontwarn retrofit2.**
+-keep class retrofit2.** { *; }
 -keepattributes Signature
-# Retain declared checked exceptions for use by a Proxy instance.
 -keepattributes Exceptions
 
-# Ignore warnings for okio - safe to do according to https://github.com/square/okio/issues/60
+-keepclasseswithmembers class * {
+    @retrofit2.http.* <methods>;
+}
+
+# OkHttp
+-keepattributes Signature
+-keepattributes *Annotation*
+-keep class okhttp3.** { *; }
+-keep interface okhttp3.** { *; }
+-dontwarn okhttp3.**
+
+# Okio
+-keep class sun.misc.Unsafe { *; }
+-dontwarn java.nio.file.*
+-dontwarn org.codehaus.mojo.animal_sniffer.IgnoreJRERequirement
 -dontwarn okio.**

app/src/main/java/com/earthstormsoftware/motecontrol/MoteStatus.java

@@ -16,14 +16,19 @@
 
 package com.earthstormsoftware.motecontrol;
 
+import com.google.gson.annotations.SerializedName;
+
 /*
  When Retrofit receives the response to the API call, it can parse the response, and map it to an
  object. In our case, the response is in JSON so we use GSON to convert that to a usable object,
  defined here.
  */
 public class MoteStatus {
-    int status;
-    String colour;
+    @SerializedName("status")
+    public int status;
+
+    @SerializedName("colour")
+    public String colour;
 
     public int getStatus() {
         return status;

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.1'
+        classpath 'com.android.tools.build:gradle:2.2.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files