diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 1bcb25826e..5f4afcbea2 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -456,6 +456,7 @@ android { ignoreWarnings = true quiet = true disable += "LintError" + lintConfig = rootProject.file("lint.xml") } androidComponents { diff --git a/build-logic/plugins/src/main/java/signal-library.gradle.kts b/build-logic/plugins/src/main/java/signal-library.gradle.kts index e36cf008b3..ba04071de8 100644 --- a/build-logic/plugins/src/main/java/signal-library.gradle.kts +++ b/build-logic/plugins/src/main/java/signal-library.gradle.kts @@ -37,6 +37,7 @@ android { lint { disable += "InvalidVectorPath" + lintConfig = rootProject.file("lint.xml") } } diff --git a/build.gradle.kts b/build.gradle.kts index c3e881c748..2f65548095 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -135,18 +135,17 @@ tasks.register("checkStopship") { doLast { val excludedFiles = listOf( "build.gradle.kts", - "app/lint.xml" + "lint.xml" ) val excludedDirectories = listOf( - "app/build", - "libsignal-service/build", ".idea" ) val allowedExtensions = setOf("kt", "kts", "java", "xml") val allFiles = cachedProjectDir.walkTopDown() + .onEnter { it.name != "build" || it.relativeTo(cachedProjectDir).path.contains("src") } .asSequence() .filter { it.isFile && it.extension in allowedExtensions } .filterNot { diff --git a/demo/contacts/src/main/res/layout/activity_contact_lookup.xml b/demo/contacts/src/main/res/layout/activity_contact_lookup.xml index f140eba874..35b21f2aab 100644 --- a/demo/contacts/src/main/res/layout/activity_contact_lookup.xml +++ b/demo/contacts/src/main/res/layout/activity_contact_lookup.xml @@ -21,7 +21,8 @@ android:layout_height="wrap_content" android:text="Lookup" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent"/> + app:layout_constraintTop_toTopOf="parent" + tools:ignore="HardcodedText" /> + tools:context=".MainActivity" + tools:ignore="HardcodedText" >