wip(workflows): Fix merge_on_main workflow

Resolves: DCMAW-8361 Co-authored-by: Delphine <[email protected]> Co-authored-by: Aamir <[email protected]>
govuk-one-login · Apr 25, 2024 · 3cdaa9c · 3cdaa9c
1 parent dc540c3
commit 3cdaa9c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -8,7 +8,7 @@ detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt-gradle" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin-general" }
 ktlint = { id = "org.jlleitschuh.gradle.ktlint", version.ref = "ktlint-gradle" }
 shellcheck = { id = "com.felipefzdz.gradle.shellcheck", version.ref = "shellcheck-gradle" }
-dependency-check = { id = "org.owasp.dependencycheck", version.ref = "dependency-check-gradle" }
+dependencyCheck = { id = "org.owasp.dependencycheck", version.ref = "dependency-check-gradle" }
 sonarqube = { id = "org.sonarqube", version.ref = "sonarqube-gradle" }
 jacoco = { id = "jacoco" } # Base plugin that comes with gradle by default
 

diff --git a/modules/buildLogic/plugins/build.gradle.kts b/modules/buildLogic/plugins/build.gradle.kts
@@ -2,6 +2,7 @@ plugins {
     `kotlin-dsl`
     alias(libs.plugins.detekt)
     alias(libs.plugins.ktlint)
+    alias(libs.plugins.dependencyCheck)
 }
 
 dependencies {
@@ -24,3 +25,7 @@ ktlint {
         exclude { it.file.absolutePath.contains("/build/") }
     }
 }
+
+dependencyCheck {
+    analyzers.assemblyEnabled = false
+}