Skip to content

Gradle Kotlin DSL: Add Support for Named URL Parameter in Maven Repository #3032

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jurre merged 5 commits into from
Jan 27, 2021
Merged

Gradle Kotlin DSL: Add Support for Named URL Parameter in Maven Repository #3032

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7a03c13
Support named url parameter in Kotlin Gradle
hfhbd Jan 24, 2021
e35ecba
Support space between parameter name
hfhbd Jan 24, 2021
7b9736a
Add named parameter in repository url
hfhbd Jan 24, 2021
b58105f
Add repo without named url parameter
hfhbd Jan 27, 2021
ea4f0b3
Add repo without named url parameter to test
hfhbd Jan 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gradle/lib/dependabot/gradle/file_parser/repositories_finder.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ class RepositoriesFinder
/maven\s*\{[^\}]*\surl[\s\(]=?\s*['"](?<url>[^'"]+)['"]/.freeze

KOTLIN_MAVEN_REPO_REGEX =
/maven\(['"](?<url>[^'"]+)['"]\)/.freeze
/maven\((url\s?\=\s?)?["](?<url>[^"]+)["]\)/.freeze

MAVEN_REPO_REGEX =
/(#{KOTLIN_MAVEN_REPO_REGEX}|#{GROOVY_MAVEN_REPO_REGEX})/.freeze
Expand Down
1 change: 1 addition & 0 deletions gradle/spec/dependabot/gradle/file_parser/repositories_finder_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,7 @@
%w(
https://jcenter.bintray.com
https://dl.bintray.com/magnusja/maven
https://kotlin.bintray.com/kotlinx
https://maven.google.com
)
)
Expand Down
3 changes: 2 additions & 1 deletion gradle/spec/fixtures/buildfiles/root_build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@ buildscript {

repositories {
jcenter()
maven("https://dl.bintray.com/magnusja/maven")
maven(url = "https://dl.bintray.com/magnusja/maven")
maven("https://kotlin.bintray.com/kotlinx/")
google()
}
dependencies {
Expand Down