Merge pull request #5 from AutSoft/bugfixes

Proguard config fix

Author: gerpetya

build.gradle

@@ -3,17 +3,19 @@
 buildscript {
     repositories {
         jcenter()
+        google()
         maven { url "https://plugins.gradle.org/m2/" }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
+        classpath 'com.android.tools.build:gradle:3.0.1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
     }
 }
 
 allprojects {
     repositories {
         jcenter()
+        google()
     }
 }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Mar 03 15:55:03 CET 2017
+#Tue Dec 05 08:41:30 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip

settings.gradle

@@ -4,14 +4,14 @@ include ':app', ':tasklib', ':taskcompiler', ':tasklib-core', ':compiler-core',
 gradle.ext.githubGroup = "com.github.AutSoft"
 
 
-gradle.ext.buildToolsVersion = "25.0.2"
-gradle.ext.compileSdkVersion = 25
+gradle.ext.buildToolsVersion = "26.0.2"
+gradle.ext.compileSdkVersion = 26
 gradle.ext.minSdkVersion = 14
-gradle.ext.targetSdkVersion = 25
+gradle.ext.targetSdkVersion = 26
 
 gradle.ext.jacoco_version = "0.7.7.201606060606"
 
-gradle.ext.dep_appcompat = 'com.android.support:appcompat-v7:25.2.0'
+gradle.ext.dep_appcompat = 'com.android.support:appcompat-v7:26.1.0'
 gradle.ext.dep_junit = 'junit:junit:4.12'
 gradle.ext.dep_rxjava = 'io.reactivex.rxjava2:rxjava:2.0.2'
 gradle.ext.dep_googleTruth = 'com.google.truth:truth:0.32'

tasklib/proguard-rules.pro

@@ -1,67 +1,3 @@
-# Save the obfuscation mapping to a file, so we can de-obfuscate any stack
-# traces later on. Keep a fixed source file attribute and all line number
-# tables to get line numbers in the stack traces.
-# You can comment this out if you're not interested in stack traces.
-
--printmapping out.map
--keepparameternames
--renamesourcefileattribute SourceFile
--keepattributes Exceptions,InnerClasses,Signature,Deprecated,SourceFile,LineNumberTable,EnclosingMethod
-
-# Preserve all annotations.
-
--keepattributes *Annotation*
-
-# Preserve all public classes, and their public and protected fields and
-# methods.
-
--keep public class * {
-    public protected *;
-}
-
-# Preserve all .class method names.
-
--keepclassmembernames class * {
-    java.lang.Class class$(java.lang.String);
-    java.lang.Class class$(java.lang.String, boolean);
-}
-
-# Preserve all native method names and the names of their classes.
-
--keepclasseswithmembernames class * {
-    native <methods>;
-}
-
-# Preserve the special static methods that are required in all enumeration
-# classes.
-
--keepclassmembers class * extends java.lang.Enum {
-    public static **[] values();
-    public static ** valueOf(java.lang.String);
-}
-
-# Explicitly preserve all serialization members. The Serializable interface
-# is only a marker interface, so it wouldn't save them.
-# You can comment this out if your library doesn't use serialization.
-# If your code contains serializable classes that have to be backward
-# compatible, please refer to the manual.
-
--keepclassmembers class * implements java.io.Serializable {
-    static final long serialVersionUID;
-    static final java.io.ObjectStreamField[] serialPersistentFields;
-    private void writeObject(java.io.ObjectOutputStream);
-    private void readObject(java.io.ObjectInputStream);
-    java.lang.Object writeReplace();
-    java.lang.Object readResolve();
-}
-
-# Your library may contain more items that need to be preserved;
-# typically classes that are dynamically created using Class.forName:
-
-# -keep public class mypackage.MyClass
-# -keep public interface mypackage.MyInterface
-# -keep public class * implements mypackage.MyInterface
-
 # Aut task lib
 -keep class hu.axolotl.tasklib.** { *; }
 -dontwarn hu.axolotl.tasklib.**
@@ -74,4 +10,4 @@
 
 -keepclassmembers class ** {
     *** onTaskProgress*(...);
-}
+}