Skip to content
Snippets Groups Projects
Unverified Commit c4a09400 authored by IKEDA Sho's avatar IKEDA Sho Committed by GitHub
Browse files

fix(sbt): split depName and lookupName (#6525)

parent 2d6c12d5
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
lib/manager/sbt/__snapshots__/extract.spec.ts.snap
+ 33
− 9
View file @ c4a09400
......@@ -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",
],
......
lib/manager/sbt/extract.ts
+ 3
− 1
View file @ c4a09400
......@@ -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,
};
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment