Non transitive R

AdevintaSpain · Oct 24, 2023 · 48b8fb1 · 48b8fb1
1 parent f04f6b3
commit 48b8fb1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -19,3 +19,4 @@ org.gradle.vfs.watch=true
 #org.gradle.unsafe.configuration-cache-problems=warn
 #org.gradle.unsafe.configuration-cache.max-problems=100
 signing.gnupg.executable=gpg
+android.nonTransitiveRClass=false
diff --git a/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorResourceTypeTest.kt b/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorResourceTypeTest.kt
@@ -16,7 +16,7 @@ class ColorResourceTypeTest {
 
   @Test
   fun color_resource_type_color_attr() {
-    val type = com.google.android.material.R.attr.colorPrimary.colorResourceType
+    val type = R.attr.colorPrimary.colorResourceType
     assertEquals(type, ColorResourceType.COLOR_ATTR)
   }
 

diff --git a/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorsTest.java b/sample/src/androidTest/java/com/adevinta/android/barista/sample/ColorsTest.java
@@ -31,8 +31,8 @@ public void checkColorList_whenDefault() {
 
   @Test
   public void checkColorAttribute() {
-    assertTextColorIs(R.id.textColorAttribute, com.google.android.material.R.attr.colorPrimary);
-    assertTextColorIsNot(R.id.textColorAttribute, com.google.android.material.R.attr.colorError);
+    assertTextColorIs(R.id.textColorAttribute, R.attr.colorPrimary);
+    assertTextColorIsNot(R.id.textColorAttribute, R.attr.colorError);
   }
 
   @Test
@@ -84,7 +84,7 @@ public void checkSimpleColor_fails() {
 
   @Test(expected = BaristaException.class)
   public void checkColorAttr_fails() {
-    assertTextColorIs(R.id.textColorAttribute, com.google.android.material.R.attr.colorError);
+    assertTextColorIs(R.id.textColorAttribute, R.attr.colorError);
   }
 
   @Test(expected = BaristaException.class)
@@ -99,7 +99,7 @@ public void checkNotSimpleColor_fails() {
 
   @Test(expected = BaristaException.class)
   public void checkNotColorAttr_fails() {
-    assertTextColorIsNot(R.id.textColorAttribute, com.google.android.material.R.attr.colorPrimary);
+    assertTextColorIsNot(R.id.textColorAttribute, R.attr.colorPrimary);
   }
 
   @Test(expected = BaristaException.class)