From 89a5af576d96fda8eb5cc59f8a0dc89756b68342 Mon Sep 17 00:00:00 2001 From: Eugen Martynov Date: Thu, 23 May 2019 08:29:23 +0200 Subject: [PATCH 1/4] Keep only package names not obfuscated --- rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro | 4 ++-- .../com/uber/anotherpackage/ObserverHandlerDefaultsTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro b/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro index 98cf6a9..94d4af1 100644 --- a/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro +++ b/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro @@ -1,3 +1,3 @@ # We keep these in order for DogTagObservers to properly work and resolve entries in each of these packages --keepnames class com.uber.rxdogtag.** --keepnames class io.reactivex.** +-keeppackagenames class com.uber.rxdogtag** +-keeppackagenames class io.reactivex** diff --git a/rxdogtag/src/test/java/com/uber/anotherpackage/ObserverHandlerDefaultsTest.java b/rxdogtag/src/test/java/com/uber/anotherpackage/ObserverHandlerDefaultsTest.java index 6640a2f..dc9b3f4 100644 --- a/rxdogtag/src/test/java/com/uber/anotherpackage/ObserverHandlerDefaultsTest.java +++ b/rxdogtag/src/test/java/com/uber/anotherpackage/ObserverHandlerDefaultsTest.java @@ -53,7 +53,7 @@ public void defaultsShouldReturnSameObserver() { * package names. You will see something like this the bundled proguard config. * * 

-   *   -keepnames class io.reactivex.**
+   *   -keeppackagenames class io.reactivex**
    *
* *

This should be updated with the new package name. From cf5fe2ac583b137852010d34106084bcce74af73 Mon Sep 17 00:00:00 2001 From: Eugen Martynov Date: Fri, 14 Jun 2019 13:47:29 +0200 Subject: [PATCH 2/4] Update rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro Co-Authored-By: Shaishav Gandhi --- rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro b/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro index 94d4af1..0d6db77 100644 --- a/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro +++ b/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro @@ -1,3 +1,3 @@ # We keep these in order for DogTagObservers to properly work and resolve entries in each of these packages --keeppackagenames class com.uber.rxdogtag** +-keeppackagenames com.uber.rxdogtag** -keeppackagenames class io.reactivex** From 46602acf0fd786c718a3e6e570f3aa293ec5d112 Mon Sep 17 00:00:00 2001 From: Eugen Martynov Date: Fri, 14 Jun 2019 13:47:40 +0200 Subject: [PATCH 3/4] Update rxdogtag/src/test/java/com/uber/anotherpackage/ObserverHandlerDefaultsTest.java Co-Authored-By: Shaishav Gandhi --- .../com/uber/anotherpackage/ObserverHandlerDefaultsTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rxdogtag/src/test/java/com/uber/anotherpackage/ObserverHandlerDefaultsTest.java b/rxdogtag/src/test/java/com/uber/anotherpackage/ObserverHandlerDefaultsTest.java index dc9b3f4..6974ec7 100644 --- a/rxdogtag/src/test/java/com/uber/anotherpackage/ObserverHandlerDefaultsTest.java +++ b/rxdogtag/src/test/java/com/uber/anotherpackage/ObserverHandlerDefaultsTest.java @@ -53,7 +53,7 @@ public void defaultsShouldReturnSameObserver() { * package names. You will see something like this the bundled proguard config. * * 


-   *   -keeppackagenames class io.reactivex**
+   *   -keeppackagenames io.reactivex**
    *
* *

This should be updated with the new package name. From 2389f3cf47c012f2152e2d69bf260eeafdd4c29c Mon Sep 17 00:00:00 2001 From: Eugen Martynov Date: Fri, 14 Jun 2019 13:47:57 +0200 Subject: [PATCH 4/4] Update rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro Co-Authored-By: Shaishav Gandhi --- rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro b/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro index 0d6db77..1010818 100644 --- a/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro +++ b/rxdogtag/src/main/resources/META-INF/proguard/rxdogtag.pro @@ -1,3 +1,3 @@ # We keep these in order for DogTagObservers to properly work and resolve entries in each of these packages -keeppackagenames com.uber.rxdogtag** --keeppackagenames class io.reactivex** +-keeppackagenames io.reactivex**