Pick up consumer proguard rules correctly (#62)

PostHog · Nov 14, 2023 · 0e1fb69 · 0e1fb69
1 parent 8a905bc
commit 0e1fb69
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 ## Next
 
 - Expose and allow to enable and disable the debug mode at runtime ([#60](https://github.com/PostHog/posthog-android/pull/60))
+- Pick up consumer proguard rules correctly ([#62](https://github.com/PostHog/posthog-android/pull/62))
 
 ## 3.0.0-beta.4 - 2023-11-08
 

diff --git a/gradle.properties b/gradle.properties
@@ -17,15 +17,9 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-# Enables namespacing of each library's R class so that its R class includes only the
-# resources declared in the library itself and none from the library's dependencies,
-# thereby reducing the size of the R class for that library
-android.nonTransitiveRClass=true
 
 android.defaults.buildfeatures.buildconfig=true
-android.defaults.buildfeatures.renderscript=false
 android.defaults.buildfeatures.shaders=false
-android.defaults.buildfeatures.aidl=false
 android.defaults.buildfeatures.resvalues=false
 
 # Release

diff --git a/posthog-android/build.gradle.kts b/posthog-android/build.gradle.kts
@@ -21,7 +21,6 @@ android {
         minSdk = PosthogBuildConfig.Android.MIN_SDK
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        consumerProguardFiles("consumer-rules.pro")
 
         buildFeatures {
             buildConfig = true
@@ -32,7 +31,7 @@ android {
 
     buildTypes {
         release {
-            consumerProguardFiles("proguard-rules.pro")
+            consumerProguardFiles("consumer-rules.pro")
         }
     }
     compileOptions {

diff --git a/posthog-android/consumer-rules.pro b/posthog-android/consumer-rules.pro
@@ -11,10 +11,17 @@
 #-keep class com.google.gson.stream.** { *; }
 
 # Application classes that will be serialized/deserialized over Gson
--keep class com.posthog.PostHogEvent { <fields>; }
--keep class com.posthog.internal.PostHogBatchEvent { <fields>; }
--keep class com.posthog.internal.PostHogDecideRequest { <fields>; }
--keep class com.posthog.internal.PostHogDecideResponse { <fields>; }
+-keep class com.posthog.PostHogEvent { *; }
+-keep class com.posthog.PostHogEvent { <init>(); }
+
+-keep class com.posthog.internal.PostHogBatchEvent { *; }
+-keep class com.posthog.internal.PostHogBatchEvent { <init>(); }
+
+-keep class com.posthog.internal.PostHogDecideRequest { *; }
+-keep class com.posthog.internal.PostHogDecideRequest { <init>(); }
+
+-keep class com.posthog.internal.PostHogDecideResponse { *; }
+-keep class com.posthog.internal.PostHogDecideResponse { <init>(); }
 
 # Prevent proguard from stripping interface information from TypeAdapter, TypeAdapterFactory,
 # JsonSerializer, JsonDeserializer instances (so they can be used in @JsonAdapter)

diff --git a/posthog-samples/posthog-android-sample/build.gradle.kts b/posthog-samples/posthog-android-sample/build.gradle.kts
@@ -21,11 +21,13 @@ android {
 
     buildTypes {
         release {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
+            isShrinkResources = true
             proguardFiles(
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro",
             )
+            signingConfig = signingConfigs.getByName("debug")
         }
     }
     compileOptions {