From b367f4db99fa5f51ddf1f159576c7d3810db4a4f Mon Sep 17 00:00:00 2001
From: cjtim <47479090+cjtim@users.noreply.github.com>
Date: Sat, 6 Aug 2022 20:34:08 +0700
Subject: [PATCH] fix(manager/sbt): allow star comment (#17005)
* fix: sbt manager allow star comment
* Update lib/modules/manager/sbt/extract.ts
Co-authored-by: Sergei Zharinov <zharinov@users.noreply.github.com>
* add test case
* prettier-fix
Co-authored-by: Sergei Zharinov <zharinov@users.noreply.github.com>
Co-authored-by: Michael Kriese <michael.kriese@visualon.de>
Co-authored-by: Rhys Arkins <rhys@arkins.net>
---
lib/modules/manager/sbt/extract.spec.ts | 40 +++++++++++++++++++++++++
lib/modules/manager/sbt/extract.ts | 2 +-
2 files changed, 41 insertions(+), 1 deletion(-)
diff --git a/lib/modules/manager/sbt/extract.spec.ts b/lib/modules/manager/sbt/extract.spec.ts
index 1cbae8b5ea..7bc496d971 100644
--- a/lib/modules/manager/sbt/extract.spec.ts
+++ b/lib/modules/manager/sbt/extract.spec.ts
@@ -258,5 +258,45 @@ describe('modules/manager/sbt/extract', () => {
packageFileVersion: undefined,
});
});
+
+ it('extract deps with comment', () => {
+ const content = `
+ name := "service"
+ scalaVersion := "2.13.8" // scalaVersion
+
+ lazy val compileDependencies =
+ Seq(
+ "com.typesafe.scala-logging" %% "scala-logging" % "3.9.4", /** critical lib */
+ "ch.qos.logback" % "logback-classic" % "1.2.10" // common lib
+ )
+ `;
+ expect(extractPackageFile(content)).toMatchObject({
+ deps: [
+ {
+ registryUrls: ['https://repo.maven.apache.org/maven2'],
+ datasource: 'maven',
+ depName: 'scala',
+ packageName: 'org.scala-lang:scala-library',
+ currentValue: '2.13.8',
+ separateMinorPatch: true,
+ },
+ {
+ registryUrls: ['https://repo.maven.apache.org/maven2'],
+ depName: 'com.typesafe.scala-logging:scala-logging',
+ packageName: 'com.typesafe.scala-logging:scala-logging_2.13',
+ currentValue: '3.9.4',
+ datasource: 'sbt-package',
+ },
+ {
+ registryUrls: ['https://repo.maven.apache.org/maven2'],
+ depName: 'ch.qos.logback:logback-classic',
+ packageName: 'ch.qos.logback:logback-classic',
+ currentValue: '1.2.10',
+ datasource: 'sbt-package',
+ },
+ ],
+ packageFileVersion: undefined,
+ });
+ });
});
});
diff --git a/lib/modules/manager/sbt/extract.ts b/lib/modules/manager/sbt/extract.ts
index 49029f1699..c034828264 100644
--- a/lib/modules/manager/sbt/extract.ts
+++ b/lib/modules/manager/sbt/extract.ts
@@ -12,7 +12,7 @@ import type { PackageDependency, PackageFile } from '../types';
import type { ParseContext, ParseOptions } from './types';
const stripComment = (str: string): string =>
- str.replace(regEx(/(^|\s+)\/\/.*$/), '');
+ str.replace(regEx(/(?:^|\s+)\/\/.*$/), '').replace(regEx(/\/\*.*?\*\//g), '');
const isSingleLineDep = (str: string): boolean =>
regEx(/^\s*(libraryDependencies|dependencyOverrides)\s*\+=\s*/).test(str);
--
GitLab