Commit 922be903 authored by Grzegorz Bizon's avatar Grzegorz Bizon

Merge branch '209345-add-ds-detect-kotlin-build-file' into 'master'

Add DS detection of build.gradle.kts

See merge request gitlab-org/gitlab!32727
parents f619fc5b 39a058d7
---
title: Add DS detection of build.gradle.kts
merge_request: !32727
author:
type: fixed
...@@ -61,6 +61,7 @@ describe 'Dependency-Scanning.gitlab-ci.yml' do ...@@ -61,6 +61,7 @@ describe 'Dependency-Scanning.gitlab-ci.yml' do
'Go' | { 'go.sum' => '' } | %w(gemnasium-dependency_scanning) 'Go' | { 'go.sum' => '' } | %w(gemnasium-dependency_scanning)
'Java' | { 'pom.xml' => '' } | %w(gemnasium-maven-dependency_scanning) 'Java' | { 'pom.xml' => '' } | %w(gemnasium-maven-dependency_scanning)
'Java Gradle' | { 'build.gradle' => '' } | %w(gemnasium-maven-dependency_scanning) 'Java Gradle' | { 'build.gradle' => '' } | %w(gemnasium-maven-dependency_scanning)
'Java Gradle Kotlin DSL' | { 'build.gradle.kts' => '' } | %w(gemnasium-maven-dependency_scanning)
'Javascript' | { 'package.json' => '' } | %w(retire-js-dependency_scanning) 'Javascript' | { 'package.json' => '' } | %w(retire-js-dependency_scanning)
'Javascript package-lock.json' | { 'package-lock.json' => '' } | %w(gemnasium-dependency_scanning) 'Javascript package-lock.json' | { 'package-lock.json' => '' } | %w(gemnasium-dependency_scanning)
'Javascript yarn.lock' | { 'yarn.lock' => '' } | %w(gemnasium-dependency_scanning) 'Javascript yarn.lock' | { 'yarn.lock' => '' } | %w(gemnasium-dependency_scanning)
......
...@@ -125,6 +125,7 @@ gemnasium-maven-dependency_scanning: ...@@ -125,6 +125,7 @@ gemnasium-maven-dependency_scanning:
$DS_DEFAULT_ANALYZERS =~ /gemnasium-maven/ $DS_DEFAULT_ANALYZERS =~ /gemnasium-maven/
exists: exists:
- '{build.gradle,*/build.gradle,*/*/build.gradle}' - '{build.gradle,*/build.gradle,*/*/build.gradle}'
- '{build.gradle.kts,*/build.gradle.kts,*/*/build.gradle.kts}'
- '{build.sbt,*/build.sbt,*/*/build.sbt}' - '{build.sbt,*/build.sbt,*/*/build.sbt}'
- '{pom.xml,*/pom.xml,*/*/pom.xml}' - '{pom.xml,*/pom.xml,*/*/pom.xml}'
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment