move datastore preferences proguard file to the core artifact
Previously, proguard file was only kept in the datastore android
preferences module which broke it for clients that want to depend
on the core artifact (android free). Given that the proguard
classes are in core, not datastore-preferences, this CL moves
them to the right artifact.
Unfortunately, AndroidX / AGP doesn't support testing proguarded
builds so I could add a test but validated with a local build.
I've also left a note to the build file of core just in case
someone adds an android target in the future.
Fixes: 253554198
Test: local test
Change-Id: Ib09ab300716ef89f125688d875cee35fccd3c5b9
diff --git a/datastore/datastore-preferences-core/build.gradle b/datastore/datastore-preferences-core/build.gradle
index 2c998ab..ce4f663 100644
--- a/datastore/datastore-preferences-core/build.gradle
+++ b/datastore/datastore-preferences-core/build.gradle
@@ -34,6 +34,7 @@
mac()
linux()
ios()
+ // NOTE, if you add android target here, make sure to add the proguard file as well.
defaultPlatform(PlatformIdentifier.JVM)
diff --git a/datastore/datastore-preferences/proguard-rules.pro b/datastore/datastore-preferences-core/src/jvmMain/resources/META-INF/proguard/androidx.datastore_datastore-preferences-core.pro
similarity index 98%
rename from datastore/datastore-preferences/proguard-rules.pro
rename to datastore/datastore-preferences-core/src/jvmMain/resources/META-INF/proguard/androidx.datastore_datastore-preferences-core.pro
index 4433d5f..7441bc4 100644
--- a/datastore/datastore-preferences/proguard-rules.pro
+++ b/datastore/datastore-preferences-core/src/jvmMain/resources/META-INF/proguard/androidx.datastore_datastore-preferences-core.pro
@@ -1,3 +1,3 @@
-keepclassmembers class * extends androidx.datastore.preferences.protobuf.GeneratedMessageLite {
<fields>;
-}
\ No newline at end of file
+}
diff --git a/datastore/datastore-preferences/build.gradle b/datastore/datastore-preferences/build.gradle
index f8de5a6..8750330 100644
--- a/datastore/datastore-preferences/build.gradle
+++ b/datastore/datastore-preferences/build.gradle
@@ -24,9 +24,6 @@
}
android{
- buildTypes.all{
- consumerProguardFiles "proguard-rules.pro"
- }
namespace "androidx.datastore.preferences"
}
androidXMultiplatform {
