mirror of
https://github.com/renovatebot/renovate.git
synced 2025-01-13 15:36:25 +00:00
fix(sbt): Parse version lines with classifier keyword (#6780)
This commit is contained in:
parent
e3da371a0e
commit
1d33e20888
3 changed files with 21 additions and 1 deletions
|
@ -7,6 +7,7 @@ libraryDependencies ++= Seq(
|
||||||
"org.example" %% "baz" % "0.0.3",
|
"org.example" %% "baz" % "0.0.3",
|
||||||
"org.example" % "qux" % "0.0.4"
|
"org.example" % "qux" % "0.0.4"
|
||||||
)
|
)
|
||||||
|
libraryDependencies += ("org.scala-lang" % "scala-library" % "2.13.3" classifier "sources") % Test
|
||||||
|
|
||||||
dependencyOverrides += "org.example" % "quux" % "0.0.5"
|
dependencyOverrides += "org.example" % "quux" % "0.0.5"
|
||||||
dependencyOverrides ++= {
|
dependencyOverrides ++= {
|
||||||
|
|
|
@ -109,6 +109,21 @@ Object {
|
||||||
"https://example.com/repos/5/",
|
"https://example.com/repos/5/",
|
||||||
],
|
],
|
||||||
},
|
},
|
||||||
|
Object {
|
||||||
|
"currentValue": "2.13.3",
|
||||||
|
"datasource": "sbt-package",
|
||||||
|
"depName": "org.scala-lang:scala-library",
|
||||||
|
"depType": "sources",
|
||||||
|
"lookupName": "org.scala-lang:scala-library",
|
||||||
|
"registryUrls": Array [
|
||||||
|
"https://repo.maven.apache.org/maven2",
|
||||||
|
"https://example.com/repos/1/",
|
||||||
|
"https://example.com/repos/2/",
|
||||||
|
"https://example.com/repos/3/",
|
||||||
|
"https://example.com/repos/4/",
|
||||||
|
"https://example.com/repos/5/",
|
||||||
|
],
|
||||||
|
},
|
||||||
Object {
|
Object {
|
||||||
"currentValue": "0.0.5",
|
"currentValue": "0.0.5",
|
||||||
"datasource": "sbt-package",
|
"datasource": "sbt-package",
|
||||||
|
|
|
@ -113,7 +113,11 @@ function parseDepExpr(
|
||||||
? str.replace(/^"/, '').replace(/"$/, '')
|
? str.replace(/^"/, '').replace(/"$/, '')
|
||||||
: variables[str].val;
|
: variables[str].val;
|
||||||
|
|
||||||
const tokens = expr.trim().split(/\s*(%%?)\s*/);
|
const tokens = expr
|
||||||
|
.trim()
|
||||||
|
.replace(/[()]/g, '')
|
||||||
|
.split(/\s*(%%?)\s*|\s*classifier\s*/);
|
||||||
|
|
||||||
const [
|
const [
|
||||||
rawGroupId,
|
rawGroupId,
|
||||||
groupOp,
|
groupOp,
|
||||||
|
|
Loading…
Reference in a new issue