From 48b8fb1f5fa9b347e1106fc781ad77d8e2957497 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernat=20Borr=C3=A1s?= Date: Tue, 24 Oct 2023 10:01:15 +0200 Subject: [PATCH] Non transitive R --- gradle.properties | 1 + .../android/barista/sample/ColorResourceTypeTest.kt | 2 +- .../com/adevinta/android/barista/sample/ColorsTest.java | 8 ++++---- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/gradle.properties b/gradle.properties index b72dc0a1..32629cb4 100644 --- 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 index 501d0ecf..7186a46e 100644 --- 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 index 342d37ce..d928abde 100644 --- 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)