diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 997fe77221..b5f1a3d79c 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -109,12 +109,6 @@ android { } } - lint { - lintConfig = file("../tools/lint/lint.xml") - checkDependencies = true - abortOnError = true - } - // See https://github.com/JLLeitschuh/ktlint-gradle#configuration configure { // See https://github.com/pinterest/ktlint/releases/ diff --git a/plugins/src/main/java/extension/CommonExtension.kt b/plugins/src/main/java/extension/CommonExtension.kt index e1b0e104ce..92ddc8e916 100644 --- a/plugins/src/main/java/extension/CommonExtension.kt +++ b/plugins/src/main/java/extension/CommonExtension.kt @@ -2,8 +2,10 @@ package extension import Versions import com.android.build.api.dsl.CommonExtension +import org.gradle.api.Project +import java.io.File -fun CommonExtension<*, *, *, *>.androidConfig() { +fun CommonExtension<*, *, *, *>.androidConfig(project: Project) { defaultConfig { compileSdk = Versions.compileSdk minSdk = Versions.minSdk @@ -17,6 +19,12 @@ fun CommonExtension<*, *, *, *>.androidConfig() { testOptions { unitTests.isReturnDefaultValues = true } + + lint { + lintConfig = File("${project.rootDir}/tools/lint/lint.xml") + checkDependencies = true + abortOnError = true + } } fun CommonExtension<*, *, *, *>.composeConfig() { diff --git a/plugins/src/main/java/io.element.android-compose-application.gradle.kts b/plugins/src/main/java/io.element.android-compose-application.gradle.kts index 8814bb7682..7f5b450499 100644 --- a/plugins/src/main/java/io.element.android-compose-application.gradle.kts +++ b/plugins/src/main/java/io.element.android-compose-application.gradle.kts @@ -8,7 +8,7 @@ plugins { } android { - androidConfig() + androidConfig(project) composeConfig() } diff --git a/plugins/src/main/java/io.element.android-compose-library.gradle.kts b/plugins/src/main/java/io.element.android-compose-library.gradle.kts index 59d6ff1658..0c1f92abf7 100644 --- a/plugins/src/main/java/io.element.android-compose-library.gradle.kts +++ b/plugins/src/main/java/io.element.android-compose-library.gradle.kts @@ -8,7 +8,7 @@ plugins { } android { - androidConfig() + androidConfig(project) composeConfig() } diff --git a/plugins/src/main/java/io.element.android-library.gradle.kts b/plugins/src/main/java/io.element.android-library.gradle.kts index 4283de3fa2..3def35dba3 100644 --- a/plugins/src/main/java/io.element.android-library.gradle.kts +++ b/plugins/src/main/java/io.element.android-library.gradle.kts @@ -6,5 +6,5 @@ plugins { } android { - androidConfig() + androidConfig(project) }