fix: version detection when using arguments (#258)

Signed-off-by: Ilona Shishov <[email protected]>
fabric8-analytics · May 19, 2024 · 928110e · 928110e
1 parent f5d3d82
commit 928110e
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/src/providers/build.gradle.ts b/src/providers/build.gradle.ts
@@ -141,7 +141,7 @@ export class DependencyProvider extends EcosystemDependencyResolver implements I
         // determine dependency version
         const depVersion: string = myClassObj.version;
         if (depVersion) {
-         dep.version = { value: depVersion, position: { line: index + 1, column: line.indexOf(depVersion) + 1 } };
+         dep.version = { value: depVersion.includes('$') ? this.replaceArgsInString(depVersion) : depVersion, position: { line: index + 1, column: line.indexOf(depVersion) + 1 } };
         } else {
             // if version is not specified, generate placeholder template
             if (keyValuePairs) {

diff --git a/test/providers/build.gradle.test.ts b/test/providers/build.gradle.test.ts
@@ -186,11 +186,11 @@ dependencies {
         expect(deps).is.eql([
             {
                 name: {value: 'log4j/log4j', position: {line: 0, column: 0}},
-                version: {value: '${versionArg}', position: {line: 30, column: 44}}
+                version: {value: '1.2.3', position: {line: 30, column: 44}}
             },
             {
                 name: {value: 'log4j/log4j', position: {line: 0, column: 0}},
-                version: {value: '${versionArg}', position: {line: 31, column: 66}}
+                version: {value: '1.2.3', position: {line: 31, column: 66}}
             }
         ]);
     });