From c4a0940049dc43e571bdf5633b4cd712b8f3eb0d Mon Sep 17 00:00:00 2001 From: IKEDA Sho Date: Tue, 16 Jun 2020 23:50:10 +0900 Subject: [PATCH] fix(sbt): split depName and lookupName (#6525) --- .../sbt/__snapshots__/extract.spec.ts.snap | 42 +++++++++++++++---- lib/manager/sbt/extract.ts | 4 +- 2 files changed, 36 insertions(+), 10 deletions(-) diff --git a/lib/manager/sbt/__snapshots__/extract.spec.ts.snap b/lib/manager/sbt/__snapshots__/extract.spec.ts.snap index b8396d08fccec7..8dc5a48769a641 100644 --- a/lib/manager/sbt/__snapshots__/extract.spec.ts.snap +++ b/lib/manager/sbt/__snapshots__/extract.spec.ts.snap @@ -6,7 +6,8 @@ Object { Object { "currentValue": "0.7.1", "datasource": "sbt-package", - "depName": "com.example:foo_2.13.0-RC5", + "depName": "com.example:foo", + "lookupName": "com.example:foo_2.13.0-RC5", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", ], @@ -15,6 +16,7 @@ Object { "currentValue": "1.2.3", "datasource": "sbt-package", "depName": "com.abc:abc", + "lookupName": "com.abc:abc", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", ], @@ -30,6 +32,7 @@ Object { "currentValue": "0.0.1", "datasource": "sbt-package", "depName": "org.example:foo", + "lookupName": "org.example:foo", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -42,7 +45,8 @@ Object { Object { "currentValue": "0.0.2", "datasource": "sbt-package", - "depName": "org.example:bar_2.9.10", + "depName": "org.example:bar", + "lookupName": "org.example:bar_2.9.10", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -55,7 +59,8 @@ Object { Object { "currentValue": "0.0.3", "datasource": "sbt-package", - "depName": "org.example:baz_2.9.10", + "depName": "org.example:baz", + "lookupName": "org.example:baz_2.9.10", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -69,6 +74,7 @@ Object { "currentValue": "0.0.4", "datasource": "sbt-package", "depName": "org.example:qux", + "lookupName": "org.example:qux", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -82,6 +88,7 @@ Object { "currentValue": "0.0.5", "datasource": "sbt-package", "depName": "org.example:quux", + "lookupName": "org.example:quux", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -94,8 +101,9 @@ Object { Object { "currentValue": "0.0.6", "datasource": "sbt-package", - "depName": "org.example:quuz_2.9.10", + "depName": "org.example:quuz", "depType": "test", + "lookupName": "org.example:quuz_2.9.10", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -110,6 +118,7 @@ Object { "datasource": "sbt-package", "depName": "org.example:corge", "depType": "Provided", + "lookupName": "org.example:corge", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -124,6 +133,7 @@ Object { "datasource": "sbt-package", "depName": "org.example:grault", "depType": "Test", + "lookupName": "org.example:grault", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -138,6 +148,7 @@ Object { "datasource": "sbt-plugin", "depName": "org.example:waldo", "depType": "plugin", + "lookupName": "org.example:waldo", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -158,6 +169,7 @@ Object { "currentValue": "0.0.1", "datasource": "sbt-package", "depName": "org.example:foo", + "lookupName": "org.example:foo", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -170,7 +182,8 @@ Object { Object { "currentValue": "0.0.2", "datasource": "sbt-package", - "depName": "org.example:bar_2.12", + "depName": "org.example:bar", + "lookupName": "org.example:bar_2.12", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -183,7 +196,8 @@ Object { Object { "currentValue": "0.0.3", "datasource": "sbt-package", - "depName": "org.example:baz_2.12", + "depName": "org.example:baz", + "lookupName": "org.example:baz_2.12", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -197,6 +211,7 @@ Object { "currentValue": "0.0.4", "datasource": "sbt-package", "depName": "org.example:qux", + "lookupName": "org.example:qux", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -210,6 +225,7 @@ Object { "currentValue": "0.0.5", "datasource": "sbt-package", "depName": "org.example:quux", + "lookupName": "org.example:quux", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -222,8 +238,9 @@ Object { Object { "currentValue": "0.0.6", "datasource": "sbt-package", - "depName": "org.example:quuz_2.12", + "depName": "org.example:quuz", "depType": "test", + "lookupName": "org.example:quuz_2.12", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -238,6 +255,7 @@ Object { "datasource": "sbt-package", "depName": "org.example:corge", "depType": "Provided", + "lookupName": "org.example:corge", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -252,6 +270,7 @@ Object { "datasource": "sbt-package", "depName": "org.example:grault", "depType": "Test", + "lookupName": "org.example:grault", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -266,6 +285,7 @@ Object { "datasource": "sbt-plugin", "depName": "org.example:waldo", "depType": "plugin", + "lookupName": "org.example:waldo", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", "https://example.com/repos/1/", @@ -285,7 +305,8 @@ Object { Object { "currentValue": "0.0.2", "datasource": "sbt-package", - "depName": "org.example:bar_2.12", + "depName": "org.example:bar", + "lookupName": "org.example:bar_2.12", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", ], @@ -300,7 +321,8 @@ Object { Object { "currentValue": "0.0.2", "datasource": "sbt-package", - "depName": "org.example:bar_2.12", + "depName": "org.example:bar", + "lookupName": "org.example:bar_2.12", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", ], @@ -316,6 +338,7 @@ Object { "currentValue": "3.0.0", "datasource": "sbt-package", "depName": "org.scalatest:scalatest", + "lookupName": "org.scalatest:scalatest", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", ], @@ -325,6 +348,7 @@ Object { "datasource": "sbt-plugin", "depName": "com.github.gseitz:sbt-release", "depType": "plugin", + "lookupName": "com.github.gseitz:sbt-release", "registryUrls": Array [ "https://repo.maven.apache.org/maven2", ], diff --git a/lib/manager/sbt/extract.ts b/lib/manager/sbt/extract.ts index 2b1ba3e8473629..c1336560b8ccf3 100644 --- a/lib/manager/sbt/extract.ts +++ b/lib/manager/sbt/extract.ts @@ -147,11 +147,12 @@ function parseDepExpr( } const groupId = resolveToken(rawGroupId); + const depName = `${groupId}:${resolveToken(rawArtifactId)}`; const artifactId = groupOp === '%%' && scalaVersion ? `${resolveToken(rawArtifactId)}_${scalaVersion}` : resolveToken(rawArtifactId); - const depName = `${groupId}:${artifactId}`; + const lookupName = `${groupId}:${artifactId}`; const currentValue = resolveToken(rawVersion); if (!depType && rawScope) { @@ -160,6 +161,7 @@ function parseDepExpr( const result: PackageDependency = { depName, + lookupName, currentValue, };