Skip to content
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

Jump to bottom

fix(sbt): split depName and lookupName #6525

Merged
merged 1 commit into from Jun 16, 2020
Merged

fix(sbt): split depName and lookupName #6525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
42 changes: 33 additions & 9 deletions lib/manager/sbt/__snapshots__/extract.spec.ts.snap
View file
Open in desktop
Expand Up @@ -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",
],
Expand All @@ -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",
],
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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/",
Expand All @@ -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",
],
Expand All @@ -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",
],
Expand All @@ -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",
],
Expand All @@ -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",
],
Expand Down
4 changes: 3 additions & 1 deletion lib/manager/sbt/extract.ts
View file
Open in desktop
Expand Up @@ -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) {
Expand All @@ -160,6 +161,7 @@ function parseDepExpr(

const result: PackageDependency = {
depName,
lookupName,
currentValue,
};

Expand Down