Merge pull request #49 from R3PI/develop

Release 1.1.3

CHANGELOG.md

@@ -1,6 +1,11 @@
 Change Log
 ==========
 
+Version 1.1.3
+----------------------------
+ * Removed dependency on AutoValue
+ * Fixed issue ClassNotFoundException when deserializing custom object.
+
 Version 1.1.2
 ----------------------------
  * Fixed BadParcelException when unmarshalling with RecyclerView or Toolbar Views.

README.md

@@ -9,7 +9,7 @@ Defrag is available in the jCenter repository:
 
 ```java
 dependencies {
-  compile 'com.solera.defrag:defrag:1.1.2'
+  compile 'com.solera.defrag:defrag:1.1.3'
 }
 ```
 

app/build.gradle

@@ -2,13 +2,13 @@ apply plugin: 'com.android.application'
 apply plugin: 'android-apt'
 
 android {
-  compileSdkVersion 23
-  buildToolsVersion '23.0.3'
+  compileSdkVersion 25
+  buildToolsVersion '25.0.1'
 
   defaultConfig {
     applicationId "com.solera.defragsample"
     minSdkVersion 16
-    targetSdkVersion 23
+    targetSdkVersion 25
     versionCode 1
     versionName "1.0"
   }

build.gradle

@@ -5,7 +5,7 @@ buildscript {
     jcenter()
   }
   dependencies {
-    classpath 'com.android.tools.build:gradle:2.2.2'
+    classpath 'com.android.tools.build:gradle:2.2.3'
     classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
     classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
     classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'

defrag/build.gradle

@@ -4,16 +4,16 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'android-apt'
 
 group = 'com.solera.defrag'
-version = '1.1.2'
+version = '1.1.3'
 
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "23.0.3"
+    compileSdkVersion 25
+    buildToolsVersion "25.0.1"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 23
+        targetSdkVersion 25
         versionCode 2
         versionName "${version}"
     }
@@ -31,12 +31,6 @@ dependencies {
 
     compile "com.android.support:appcompat-v7:${android_support_lib_version}"
     compile "com.android.support:support-annotations:${android_support_lib_version}"
-
-    // Auto value
-    provided "com.google.auto.value:auto-value:${auto_value_lib_version}"
-    apt "com.google.auto.value:auto-value:${auto_value_lib_version}"
-    apt "com.ryanharter.auto.value:auto-value-parcel:0.2.5"
-    compile "com.ryanharter.auto.value:auto-value-parcel-adapter:0.2.5"
 }
 
 def siteUrl = 'https://github.com/R3PI/Defrag'

defrag/src/main/java/com/solera/defrag/TraversalAnimation.java

@@ -3,23 +3,55 @@
 import android.animation.Animator;
 import android.support.annotation.IntDef;
 import android.support.annotation.NonNull;
-import com.google.auto.value.AutoValue;
 import java.lang.annotation.Retention;
 
 import static java.lang.annotation.RetentionPolicy.SOURCE;
 
-@AutoValue public abstract class TraversalAnimation {
+public class TraversalAnimation {
 	public static final int ABOVE = 0;
 	public static final int BELOW = 1;
+	private final Animator animator;
+	private final int drawOrder;
 
 	@NonNull public static TraversalAnimation newInstance(@NonNull Animator animator,
 			@AnimateInDrawOrder int drawOrder) {
-		return new AutoValue_TraversalAnimation(animator, drawOrder);
+		return new TraversalAnimation(animator, drawOrder);
 	}
 
-	@NonNull abstract Animator animator();
+	private TraversalAnimation(@NonNull Animator animator, @AnimateInDrawOrder int drawOrder) {
+		this.animator = animator;
+		this.drawOrder = drawOrder;
+	}
+
+	@NonNull Animator animator() {
+		return animator;
+	}
+
+	@AnimateInDrawOrder int drawOrder() {
+		return drawOrder;
+	}
+
+	@Override public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
 
-	@AnimateInDrawOrder abstract int drawOrder();
+		TraversalAnimation that = (TraversalAnimation) o;
+
+		return drawOrder == that.drawOrder && animator.equals(that.animator);
+	}
+
+	@Override public int hashCode() {
+		int result = animator.hashCode();
+		result = 31 * result + drawOrder;
+		return result;
+	}
+
+	@Override public String toString() {
+		return "TraversalAnimation{" +
+				"animator=" + animator +
+				", drawOrder=" + drawOrder +
+				'}';
+	}
 
 	@Retention(SOURCE) @IntDef({ ABOVE, BELOW }) public @interface AnimateInDrawOrder {
 	}