Merge pull request #133 from flipkart-incubator/keep

Keep Annotation Support
flipkart-incubator · Jan 20, 2017 · ebec40f · ebec40f
2 parents 86e4b10 + 5bbc1cf
commit ebec40f
Show file tree

Hide file tree

Showing 17 changed files with 44 additions and 8 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -29,8 +29,9 @@ dependencies {
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:appcompat-v7:25.1.0'
     compile 'com.android.support:design:25.1.0'
-    compile 'com.github.flipkart-incubator.batchman:batching:1.3.3'
-    compile 'com.github.flipkart-incubator.batchman:batching-gson:1.3.3'
+    compile project(':batching')
+    compile project(':batching-core')
+    compile project(':batching-gson')
 }
 
 android {

diff --git a/app/src/main/java/com/flipkart/batchdemo/CustomTagData.java b/app/src/main/java/com/flipkart/batchdemo/CustomTagData.java
@@ -24,12 +24,15 @@
 
 package com.flipkart.batchdemo;
 
+import android.support.annotation.Keep;
+
 import com.flipkart.batching.core.data.Tag;
 import com.flipkart.batching.core.data.TagData;
 import com.google.gson.annotations.SerializedName;
 
 import org.json.JSONObject;
 
+@Keep
 public class CustomTagData extends TagData {
     @SerializedName("event")
     public JSONObject event;

diff --git a/batching-core/build.gradle b/batching-core/build.gradle
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    compile 'com.android.support:support-annotations:25.1.0'
     testCompile 'junit:junit:4.12'
 }
 

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/Batch.java b/batching-core/src/main/java/com/flipkart/batching/core/Batch.java
@@ -24,8 +24,11 @@
 
 package com.flipkart.batching.core;
 
+import android.support.annotation.Keep;
+
 import java.util.Collection;
 
+@Keep
 public interface Batch<T extends Data> {
     Collection<T> getDataCollection();
 }
diff --git a/batching-core/src/main/java/com/flipkart/batching/core/BatchImpl.java b/batching-core/src/main/java/com/flipkart/batching/core/BatchImpl.java
@@ -24,12 +24,14 @@
 
 package com.flipkart.batching.core;
 
+import android.support.annotation.Keep;
+
 import java.util.Collection;
 
 /**
  * A simple implementation of Batch interface
  */
-
+@Keep
 public class BatchImpl<T extends Data> implements Batch<T> {
 
     public DataCollection<T> dataCollection;

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/Data.java b/batching-core/src/main/java/com/flipkart/batching/core/Data.java
@@ -25,6 +25,8 @@
 package com.flipkart.batching.core;
 
 
+import android.support.annotation.Keep;
+
 import com.flipkart.batching.core.data.Tag;
 
 import java.io.Serializable;
@@ -38,7 +40,7 @@
  * @see Tag
  * @see Object
  */
-
+@Keep
 public abstract class Data implements Serializable {
     private long eventId;
 

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/DataCollection.java b/batching-core/src/main/java/com/flipkart/batching/core/DataCollection.java
@@ -24,12 +24,14 @@
 
 package com.flipkart.batching.core;
 
+import android.support.annotation.Keep;
+
 import java.util.Collection;
 
 /**
  * DataCollection class
  */
-
+@Keep
 public class DataCollection<T extends Data> {
     public Collection<T> dataCollection;
 

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/SerializationStrategy.java b/batching-core/src/main/java/com/flipkart/batching/core/SerializationStrategy.java
@@ -25,13 +25,16 @@
 package com.flipkart.batching.core;
 
 
+import android.support.annotation.Keep;
+
 import java.io.IOException;
 import java.util.Collection;
 
 /**
  * This is an interface for serialization strategy. An implementation of this class
  * must override all it's methods.
  */
+@Keep
 public interface SerializationStrategy<E extends Data, T extends Batch> {
 
     /**

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/batch/SizeBatch.java b/batching-core/src/main/java/com/flipkart/batching/core/batch/SizeBatch.java
@@ -1,11 +1,13 @@
 package com.flipkart.batching.core.batch;
 
+import android.support.annotation.Keep;
 
 import com.flipkart.batching.core.BatchImpl;
 import com.flipkart.batching.core.Data;
 
 import java.util.Collection;
 
+@Keep
 public class SizeBatch<T extends Data> extends BatchImpl<T> {
     private int maxBatchSize;
 

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/batch/SizeTimeBatch.java b/batching-core/src/main/java/com/flipkart/batching/core/batch/SizeTimeBatch.java
@@ -1,10 +1,13 @@
 package com.flipkart.batching.core.batch;
 
+import android.support.annotation.Keep;
+
 import com.flipkart.batching.core.BatchImpl;
 import com.flipkart.batching.core.Data;
 
 import java.util.Collection;
 
+@Keep
 public class SizeTimeBatch<T extends Data> extends BatchImpl<T> {
     private int maxBatchSize;
     private long timeOut;

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/batch/TagBatch.java b/batching-core/src/main/java/com/flipkart/batching/core/batch/TagBatch.java
@@ -1,10 +1,13 @@
 package com.flipkart.batching.core.batch;
 
+import android.support.annotation.Keep;
+
 import com.flipkart.batching.core.Batch;
 import com.flipkart.batching.core.BatchImpl;
 import com.flipkart.batching.core.data.Tag;
 import com.flipkart.batching.core.data.TagData;
 
+@Keep
 public class TagBatch<T extends TagData> extends BatchImpl<T> {
     private Tag tag;
 

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/batch/TimeBatch.java b/batching-core/src/main/java/com/flipkart/batching/core/batch/TimeBatch.java
@@ -1,10 +1,13 @@
 package com.flipkart.batching.core.batch;
 
+import android.support.annotation.Keep;
+
 import com.flipkart.batching.core.BatchImpl;
 import com.flipkart.batching.core.Data;
 
 import java.util.Collection;
 
+@Keep
 public class TimeBatch<D extends Data> extends BatchImpl<D> {
     private long timeOut;
 

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/data/EventData.java b/batching-core/src/main/java/com/flipkart/batching/core/data/EventData.java
@@ -24,11 +24,14 @@
 
 package com.flipkart.batching.core.data;
 
+import android.support.annotation.Keep;
+
 import com.flipkart.batching.core.Data;
 
 /**
  * EventData class that extends {@link Data}.
  */
+@Keep
 public class EventData extends Data {
     public EventData() {
         super();

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/data/Tag.java b/batching-core/src/main/java/com/flipkart/batching/core/data/Tag.java
@@ -24,6 +24,8 @@
 
 package com.flipkart.batching.core.data;
 
+import android.support.annotation.Keep;
+
 import com.flipkart.batching.core.Data;
 
 import java.io.Serializable;
@@ -32,6 +34,7 @@
  * Tag represents a group of {@link Data} objects to batch together.
  * It takes a {@link String} type ID as parameter in constructor.
  */
+@Keep
 public class Tag implements Serializable {
 
     private String id;

diff --git a/batching-core/src/main/java/com/flipkart/batching/core/data/TagData.java b/batching-core/src/main/java/com/flipkart/batching/core/data/TagData.java
@@ -24,12 +24,15 @@
 
 package com.flipkart.batching.core.data;
 
+import android.support.annotation.Keep;
+
 import com.flipkart.batching.core.Data;
 
 /**
  * TagData Class that extends {@link Data}.
  * It takes {@link Tag} as a parameter in constructor.
  */
+@Keep
 public class TagData extends Data {
 
     private Tag tag;

diff --git a/batching-gson/build.gradle b/batching-gson/build.gradle
@@ -17,7 +17,7 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'com.android.support:support-annotations:25.1.0'
-    compile 'com.github.flipkart-incubator.batchman:batching-core:1.3.3'
+    compile project(':batching-core')
 
     testCompile 'junit:junit:4.12'
     testCompile 'org.robolectric:robolectric:3.2.2'

diff --git a/batching/build.gradle b/batching/build.gradle
@@ -61,7 +61,7 @@ dependencies {
     testCompile project(':batching-gson')
     testCompile 'com.google.code.gson:gson:2.8.0'
 
-    compile 'com.github.flipkart-incubator.batchman:batching-core:1.3.3'
+    compile project(':batching-core')
     compile 'com.android.support:support-annotations:25.1.0'
     errorprone 'com.google.errorprone:error_prone_core:2.0.9'
 }