aboutsummaryrefslogtreecommitdiffstats
path: root/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
diff options
context:
space:
mode:
authorHarsh Shandilya <me@msfjarvis.dev>2023-11-28 11:49:47 +0530
committerHarsh Shandilya <me@msfjarvis.dev>2023-11-28 11:49:47 +0530
commitf3bc261f37929e683f69a0ea8ba87759d28d596f (patch)
treee78fd99b93168562b7a1ff609864cde9636ce71c /build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
parenta9b0112279bca0f19a2d8756d2fa4498936660dd (diff)
downloadHardenedPass-f3bc261f37929e683f69a0ea8ba87759d28d596f.tar.gz
HardenedPass-f3bc261f37929e683f69a0ea8ba87759d28d596f.zip
refactor(build): use typed catalog in build-logic
Diffstat (limited to 'build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt')
-rw-r--r--build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt12
1 files changed, 5 insertions, 7 deletions
diff --git a/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt b/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
index c1311f41..7157d3ae 100644
--- a/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
+++ b/build-logic/src/main/kotlin/app/passwordstore/gradle/AndroidCommon.kt
@@ -5,12 +5,11 @@ import app.passwordstore.gradle.flavors.configureSlimTests
import com.android.build.api.dsl.ApplicationExtension
import com.android.build.api.dsl.LibraryExtension
import com.android.build.gradle.TestedExtension
+import org.gradle.accessors.dm.LibrariesForLibs
import org.gradle.api.Project
-import org.gradle.api.artifacts.VersionCatalogsExtension
import org.gradle.api.tasks.testing.Test
import org.gradle.kotlin.dsl.configure
import org.gradle.kotlin.dsl.findByType
-import org.gradle.kotlin.dsl.getByType
import org.gradle.kotlin.dsl.withType
object AndroidCommon {
@@ -47,11 +46,10 @@ object AndroidCommon {
}
project.extensions.findByType<ApplicationExtension>()?.run { lint.configureLint(project) }
project.extensions.findByType<LibraryExtension>()?.run { lint.configureLint(project) }
- val lintDepKeys = listOf("thirdparty-compose-lints", "thirdparty-slack-lints")
- val catalog = project.extensions.getByType<VersionCatalogsExtension>()
- val libs = catalog.named("libs")
- lintDepKeys.forEach { key ->
- project.dependencies.addProvider("lintChecks", libs.findLibrary(key).get())
+ val libs = project.extensions.getByName("libs") as LibrariesForLibs
+ project.dependencies.apply {
+ addProvider("lintChecks", libs.thirdparty.compose.lints)
+ addProvider("lintChecks", libs.thirdparty.slack.lints)
}
}
}