validation: Add plugins resolve validation (#151)

Co-authored-by: Yuriy Elistratov <[email protected]>
RedMadRobot · Oct 28, 2024 · a472176 · a472176
1 parent 131bc3e
commit a472176
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,7 +17,7 @@
 
 ### Stack
 
-- *No changes*
+- :x: `org.jetbrains.dokka-android` removed, use `org.jetbrains.dokka`, because they were merged in [version 0.10.0](https://github.com/Kotlin/dokka/releases/tag/0.10.0)
 
 ## [2024.09.04]
 

diff --git a/version-catalog-extensions/src/main/kotlin/ValidateVersionCatalogTask.kt b/version-catalog-extensions/src/main/kotlin/ValidateVersionCatalogTask.kt
@@ -26,9 +26,10 @@ abstract class ValidateVersionCatalogTask : DefaultTask() {
     fun validate() {
         val catalog = dependenciesModel.get()
 
-        // Check libraries in catalog are resolvable
+        // Check libraries and plugins in catalog are resolvable
         val configuration = createConfiguration()
         configuration.addLibraries(catalog)
+        configuration.addPlugins(catalog)
         logger.debug("Resolved dependencies:")
         configuration.resolvedConfiguration
             .firstLevelModuleDependencies
@@ -61,6 +62,15 @@ abstract class ValidateVersionCatalogTask : DefaultTask() {
             }
     }
 
+    private fun Configuration.addPlugins(catalog: DefaultVersionCatalog) {
+        catalog.plugins
+            .forEach { plugin ->
+                // Used plugin marker https://docs.gradle.org/current/userguide/plugins.html#sec:plugin_markers
+                val pluginNotation = "${plugin.id}:${plugin.id}.gradle.plugin:${plugin.version}"
+                project.dependencies.add(name, pluginNotation)
+            }
+    }
+
     private fun DefaultVersionCatalog.checkVersionsUsed() {
         val librariesVersions = libraries.map { it.versionRef }.toSet()
         val pluginsVersions = plugins.map { it.versionRef }.toSet()

diff --git a/versions-stack/libs.versions.toml b/versions-stack/libs.versions.toml
@@ -290,7 +290,6 @@ kotlin-scripting = { id = "org.jetbrains.kotlin.plugin.scripting", version.ref =
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
 
 dokka = { id = "org.jetbrains.dokka", version.ref = "dokka" }
-dokka-android = { id = "org.jetbrains.dokka-android", version.ref = "dokka" }
 
 dagger-hilt-android = { id = "com.google.dagger.hilt.android" , version.ref = "dagger" }
 ksp = { id = "com.google.devtools.ksp", version.ref = "ksp"}