diff --git a/Changelog.md b/Changelog.md index 1c44c99cca..c32ef83f5b 100644 --- a/Changelog.md +++ b/Changelog.md @@ -3,6 +3,7 @@ ## Unreleased - UV: Fix fatal parse error on uv.lock files containing editable/workspace packages with dynamic versions ([#1682](https://github.com/fossas/fossa-cli/pull/1682)) +- Gradle: Add additional development and test configurations for common plugins ([#1684](https://github.com/fossas/fossa-cli/pull/1684)) ## 3.16.7 diff --git a/docs/references/strategies/languages/gradle/gradle.md b/docs/references/strategies/languages/gradle/gradle.md index 41223ceeda..1d8a0828e1 100644 --- a/docs/references/strategies/languages/gradle/gradle.md +++ b/docs/references/strategies/languages/gradle/gradle.md @@ -236,10 +236,17 @@ With newer versions of gradle, some configurations are no longer supported (`com FOSSA classifies any dependencies originating from the following configurations as development dependencies: ``` - compileOnly +- spotbugs +- spotbugsPlugins +- spotbugsSlf4j ``` FOSSA classifies any dependencies originating from the following configurations as test dependencies: ``` +- aggregateCodeCoverageReportResults +- jacocoAgent +- jacocoAggregation +- jacocoAnt - testImplementation - testCompileOnly - testRuntimeOnly diff --git a/src/Strategy/Gradle/Common.hs b/src/Strategy/Gradle/Common.hs index e2d6e055d6..26ca06869f 100644 --- a/src/Strategy/Gradle/Common.hs +++ b/src/Strategy/Gradle/Common.hs @@ -39,7 +39,7 @@ getLinesWithPrefix text prefix = prefixLines configNameToLabel :: Text -> GradleLabel configNameToLabel conf = case conf of - "compileOnly" -> Env EnvDevelopment + x | x `elem` knownDevConfigs -> Env EnvDevelopment x | x `elem` knownTestConfigs -> Env EnvTesting x | isDefaultAndroidDevConfig x -> Env EnvDevelopment x | isDefaultAndroidTestConfig x -> Env EnvTesting @@ -47,7 +47,11 @@ configNameToLabel conf = knownTestConfigs :: [Text] knownTestConfigs = - [ "testImplementation" + [ "aggregateCodeCoverageReportResults" + , "jacocoAgent" + , "jacocoAggregation" + , "jacocoAnt" + , "testImplementation" , "testCompileOnly" , "testRuntimeOnly" , "testCompileClasspath" @@ -61,6 +65,14 @@ knownTestConfigs = , "testFixturesApiElements" ] +knownDevConfigs :: [Text] +knownDevConfigs = + [ "compileOnly" + , "spotbugs" + , "spotbugsPlugins" + , "spotbugsSlf4j" + ] + getDebugMessages :: Text -> [Text] getDebugMessages text = getLogWithPrefix text "FOSSA-DEBUG"