Merge pull request #141 from rubensousa/r8-rules

Remove consumer proguard rules
rubensousa · May 7, 2023 · 2562617 · 2562617
2 parents 7a88282 + 9382285
commit 2562617
Show file tree

Hide file tree

Showing 18 changed files with 21 additions and 102 deletions.
diff --git a/docs/changelog.md b/docs/changelog.md
@@ -2,6 +2,15 @@
 
 ## Version 1.0.0
 
+### 1.0.0-rc01
+
+2023-05-07
+
+#### Dependency updates
+
+- Removed consumer proguard rules
+- Exposed recyclerview dependency to clients
+
 ### 1.0.0-beta03
 
 2023-05-03

diff --git a/dpadrecyclerview-compose/build.gradle b/dpadrecyclerview-compose/build.gradle
@@ -13,7 +13,6 @@ android {
     defaultConfig {
         minSdk versions.minSdkVersion
         targetSdk versions.targetSdkVersion
-        consumerProguardFiles "consumer-rules.pro"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
         testInstrumentationRunnerArguments listener: 'com.rubensousa.dpadrecyclerview.testfixtures.recording.TestRecordingListener'
@@ -24,8 +23,6 @@ android {
             testCoverageEnabled true
         }
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 

diff --git a/dpadrecyclerview-compose/consumer-rules.pro b/dpadrecyclerview-compose/consumer-rules.pro
diff --git a/dpadrecyclerview-compose/gradle.properties b/dpadrecyclerview-compose/gradle.properties
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-LIBRARY_VERSION=1.0.0-beta03
 LIBRARY_GROUP=com.rubensousa.dpadrecyclerview
 LIBRARY_ARTIFACT=dpadrecyclerview-compose
 # POM info

diff --git a/dpadrecyclerview-compose/proguard-rules.pro b/dpadrecyclerview-compose/proguard-rules.pro
diff --git a/dpadrecyclerview-test-fixtures/build.gradle b/dpadrecyclerview-test-fixtures/build.gradle
@@ -19,8 +19,6 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
     compileOptions {

diff --git a/dpadrecyclerview-test-fixtures/consumer-rules.pro b/dpadrecyclerview-test-fixtures/consumer-rules.pro
diff --git a/dpadrecyclerview-test-fixtures/proguard-rules.pro b/dpadrecyclerview-test-fixtures/proguard-rules.pro
diff --git a/dpadrecyclerview-testing/build.gradle b/dpadrecyclerview-testing/build.gradle
@@ -13,7 +13,6 @@ android {
     defaultConfig {
         minSdk versions.minSdkVersion
         targetSdk versions.targetSdkVersion
-        consumerProguardFiles "consumer-rules.pro"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
         testInstrumentationRunnerArguments listener: 'com.rubensousa.dpadrecyclerview.testfixtures.recording.TestRecordingListener'
@@ -24,8 +23,6 @@ android {
             testCoverageEnabled true
         }
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
 

diff --git a/dpadrecyclerview-testing/gradle.properties b/dpadrecyclerview-testing/gradle.properties
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-LIBRARY_VERSION=1.0.0-beta03
 LIBRARY_GROUP=com.rubensousa.dpadrecyclerview
 LIBRARY_ARTIFACT=dpadrecyclerview-testing
 # POM info

diff --git a/dpadrecyclerview-testing/proguard-rules.pro b/dpadrecyclerview-testing/proguard-rules.pro
diff --git a/dpadrecyclerview/build.gradle b/dpadrecyclerview/build.gradle
@@ -13,7 +13,6 @@ android {
     defaultConfig {
         minSdk versions.minSdkVersion
         targetSdk versions.targetSdkVersion
-        consumerProguardFiles "consumer-rules.pro"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         testInstrumentationRunnerArguments useTestStorageService: 'true'
         testInstrumentationRunnerArguments listener: 'com.rubensousa.dpadrecyclerview.testfixtures.recording.TestRecordingListener'
@@ -24,8 +23,7 @@ android {
             testCoverageEnabled true
         }
         release {
-            minifyEnabled false
-            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+
         }
     }
 
@@ -56,7 +54,7 @@ android {
 }
 
 dependencies {
-    implementation "androidx.recyclerview:recyclerview:$versions.recyclerview"
+    api "androidx.recyclerview:recyclerview:$versions.recyclerview"
     implementation "androidx.collection:collection-ktx:$versions.collection"
     testImplementation "junit:junit:$testVersions.junit"
     testImplementation "com.google.truth:truth:$testVersions.truth"

diff --git a/dpadrecyclerview/consumer-rules.pro b/dpadrecyclerview/consumer-rules.pro
diff --git a/dpadrecyclerview/gradle.properties b/dpadrecyclerview/gradle.properties
@@ -13,7 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-LIBRARY_VERSION=1.0.0-beta03
 LIBRARY_GROUP=com.rubensousa.dpadrecyclerview
 LIBRARY_ARTIFACT=dpadrecyclerview
 # POM info

diff --git a/dpadrecyclerview/proguard-rules.pro b/dpadrecyclerview/proguard-rules.pro
diff --git a/gradle.properties b/gradle.properties
@@ -20,4 +20,6 @@ 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.nonTransitiveRClass=true
+android.enableR8.fullMode=true
+LIBRARY_VERSION=1.0.0-rc01
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -24,7 +24,7 @@ theme:
 
 extra:
   dpadrecyclerview:
-    version: '1.0.0-beta03'
+    version: '1.0.0-rc01'
   social:
     - icon: 'fontawesome/brands/github'
       link: 'https://github.com/rubensousa/DpadRecyclerView'

diff --git a/sample/build.gradle b/sample/build.gradle
@@ -18,8 +18,13 @@ android {
     }
 
     buildTypes {
+        debug {
+
+        }
         release {
-            minifyEnabled false
+            signingConfig signingConfigs.debug
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }