(fix): this fixes proguard rules when running minifyEnabled (#266)

* this fixes proguard rules when running minifyEnabled

* remove extra compileOnly include

* add compile only for slf4j. also, cleanup organization of gradle file.

* cancel pending after jobscheduler

Author: thomaszurkan-optimizely

android-sdk/build.gradle

@@ -66,6 +66,7 @@ dependencies {
         exclude group: 'com.google.code.findbugs'
     }
 
+    provided "com.fasterxml.jackson.core:jackson-databind:$jacksonversion"
     compile "com.android.support:support-annotations:$support_annotations_ver"
 
     testCompile "junit:junit:$junit_ver"

build.gradle

@@ -55,6 +55,7 @@ ext {
     target_sdk_version = 28
     java_core_ver = "3.0.0"
     android_logger_ver = "1.3.6"
+    jacksonversion= "2.9.8"
     support_annotations_ver = "24.2.1"
     junit_ver = "4.12"
     mockito_ver = "1.9.5"

datafile-handler/build.gradle

@@ -55,6 +55,8 @@ dependencies {
     compile project(':shared')
     compile "com.android.support:support-annotations:$support_annotations_ver"
 
+    provided "com.noveogroup.android:android-logger:$android_logger_ver"
+
     testCompile "junit:junit:$junit_ver"
     testCompile "org.mockito:mockito-core:$mockito_ver"
     testCompile "com.noveogroup.android:android-logger:$android_logger_ver"

event-handler/build.gradle

@@ -56,6 +56,8 @@ dependencies {
     compile project(':shared')
     compile "com.android.support:support-annotations:$support_annotations_ver"
 
+    provided "com.noveogroup.android:android-logger:$android_logger_ver"
+
     testCompile "junit:junit:$junit_ver"
     testCompile "org.mockito:mockito-core:$mockito_ver"
     testCompile "com.noveogroup.android:android-logger:$android_logger_ver"

proguard-rules.txt

@@ -58,3 +58,9 @@
 
 # Android Logger
 -keep class com.noveogroup.android.log.** { *; }
+
+-optimizations !class/unboxing/enum
+
+-dontwarn com.google.gson.**
+-dontwarn com.optimizely.ab.config.parser.**
+

shared/build.gradle

@@ -53,13 +53,13 @@ android {
 }
 
 dependencies {
-    compile "com.noveogroup.android:android-logger:$android_logger_ver"
     compile ("com.optimizely.ab:core-api:$java_core_ver") {
         exclude group: 'com.google.code.findbugs'
     }
     compile "com.google.code.gson:gson:$gson_ver"
 
     provided "com.android.support:support-annotations:$support_annotations_ver"
+    provided "com.noveogroup.android:android-logger:$android_logger_ver"
 
     testCompile "junit:junit:$junit_ver"
     testCompile "org.mockito:mockito-core:$mockito_ver"

shared/src/main/java/com/optimizely/ab/android/shared/ServiceScheduler.java

@@ -157,11 +157,11 @@ private void cancelRepeating(PendingIntent pendingIntent, Intent intent) {
             Integer id = null;
             try {
                 id = (Integer) Class.forName(clazz).getDeclaredField("JOB_ID").get(null);
-                pendingIntent.cancel();
                 // only cancel periodic services
                 if (ServiceScheduler.isScheduled(context, id)) {
                     jobScheduler.cancel(id);
                 }
+                pendingIntent.cancel();
             } catch (Exception e) {
                 logger.error("Error in Cancel ", e);
             }

user-profile/build.gradle

@@ -54,6 +54,7 @@ android {
 dependencies {
     compile project(':shared')
     provided "com.android.support:support-annotations:$support_annotations_ver"
+    provided "com.noveogroup.android:android-logger:$android_logger_ver"
 
     testCompile "junit:junit:$junit_ver"
     testCompile "org.mockito:mockito-core:$mockito_ver"