Skip to content
Snippets Groups Projects
Unverified Commit b4f5f885 authored by Johannes Feichtner's avatar Johannes Feichtner Committed by GitHub
Browse files

fix(manager/gradle): allow dependency classifiers (#18469)

parent cc50beb0
No related branches found
No related tags found
No related merge requests found
...@@ -37,10 +37,10 @@ describe('modules/manager/gradle/utils', () => { ...@@ -37,10 +37,10 @@ describe('modules/manager/gradle/utils', () => {
it('isDependencyString', () => { it('isDependencyString', () => {
expect(isDependencyString('foo:bar:1.2.3')).toBeTrue(); expect(isDependencyString('foo:bar:1.2.3')).toBeTrue();
expect(isDependencyString('foo.foo:bar.bar:1.2.3')).toBeTrue(); expect(isDependencyString('foo.foo:bar.bar:1.2.3')).toBeTrue();
expect(isDependencyString('foo:bar:baz:qux')).toBeFalse(); expect(isDependencyString('foo:bar:baz:qux')).toBeTrue();
expect(isDependencyString('foo.bar:baz:1.2.3')).toBeTrue(); expect(isDependencyString('foo.bar:baz:1.2.3')).toBeTrue();
expect(isDependencyString('foo.bar:baz:1.2.+')).toBeTrue(); expect(isDependencyString('foo.bar:baz:1.2.+')).toBeTrue();
expect(isDependencyString('foo.bar:baz:qux:quux')).toBeFalse(); expect(isDependencyString('foo:bar:baz:qux:quux')).toBeFalse();
expect(isDependencyString("foo:bar:1.2.3'")).toBeFalse(); expect(isDependencyString("foo:bar:1.2.3'")).toBeFalse();
expect(isDependencyString('foo:bar:1.2.3"')).toBeFalse(); expect(isDependencyString('foo:bar:1.2.3"')).toBeFalse();
expect(isDependencyString('-Xep:ParameterName:OFF')).toBeFalse(); expect(isDependencyString('-Xep:ParameterName:OFF')).toBeFalse();
...@@ -56,7 +56,10 @@ describe('modules/manager/gradle/utils', () => { ...@@ -56,7 +56,10 @@ describe('modules/manager/gradle/utils', () => {
depName: 'foo.foo:bar.bar', depName: 'foo.foo:bar.bar',
currentValue: '1.2.3', currentValue: '1.2.3',
}); });
expect(parseDependencyString('foo:bar:baz:qux')).toBeNull(); expect(parseDependencyString('foo:bar:baz:qux')).toMatchObject({
depName: 'foo:bar',
currentValue: 'baz',
});
expect(parseDependencyString('foo.bar:baz:1.2.3')).toMatchObject({ expect(parseDependencyString('foo.bar:baz:1.2.3')).toMatchObject({
depName: 'foo.bar:baz', depName: 'foo.bar:baz',
currentValue: '1.2.3', currentValue: '1.2.3',
...@@ -65,7 +68,7 @@ describe('modules/manager/gradle/utils', () => { ...@@ -65,7 +68,7 @@ describe('modules/manager/gradle/utils', () => {
depName: 'foo:bar', depName: 'foo:bar',
currentValue: '1.2.+', currentValue: '1.2.+',
}); });
expect(parseDependencyString('foo.bar:baz:qux:quux')).toBeNull(); expect(parseDependencyString('foo:bar:baz:qux:quux')).toBeNull();
expect(parseDependencyString("foo:bar:1.2.3'")).toBeNull(); expect(parseDependencyString("foo:bar:1.2.3'")).toBeNull();
expect(parseDependencyString('foo:bar:1.2.3"')).toBeNull(); expect(parseDependencyString('foo:bar:1.2.3"')).toBeNull();
expect(parseDependencyString('-Xep:ParameterName:OFF')).toBeNull(); expect(parseDependencyString('-Xep:ParameterName:OFF')).toBeNull();
......
...@@ -26,7 +26,7 @@ export function versionLikeSubstring( ...@@ -26,7 +26,7 @@ export function versionLikeSubstring(
export function isDependencyString(input: string): boolean { export function isDependencyString(input: string): boolean {
const split = input?.split(':'); const split = input?.split(':');
if (split?.length !== 3) { if (split?.length !== 3 && split?.length !== 4) {
return false; return false;
} }
// eslint-disable-next-line prefer-const // eslint-disable-next-line prefer-const
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment