Skip to content
Snippets Groups Projects
Unverified Commit 3d29b950 authored by Sergio Zharinov's avatar Sergio Zharinov Committed by GitHub
Browse files

feat(sbt): Update scala version (#6816)


* feat(sbt): Update scala version

* Fixes

* Fixes

Co-authored-by: default avatarMichael Kriese <michael.kriese@visualon.de>
parent 8dbf28da
No related merge requests found
......@@ -172,6 +172,7 @@ export interface PackageDependency<T = Record<string, any>> extends Package<T> {
autoReplaceStringTemplate?: string;
depIndex?: number;
editFile?: string;
separateMinorPatch?: boolean;
}
export interface Upgrade<T = Record<string, any>>
......
......@@ -3,6 +3,16 @@
exports[`lib/manager/sbt/extract extractPackageFile() extract deps from native scala file with private variables 1`] = `
Object {
"deps": Array [
Object {
"currentValue": "2.13.0-RC5",
"datasource": "maven",
"depName": "scala",
"lookupName": "org.scala-lang:scala-library",
"registryUrls": Array [
"https://repo.maven.apache.org/maven2",
],
"separateMinorPatch": true,
},
Object {
"currentValue": "0.7.1",
"datasource": "sbt-package",
......@@ -28,6 +38,16 @@ Object {
exports[`lib/manager/sbt/extract extractPackageFile() extract deps from native scala file with variables 1`] = `
Object {
"deps": Array [
Object {
"currentValue": "2.13.0-RC5",
"datasource": "maven",
"depName": "scala",
"lookupName": "org.scala-lang:scala-library",
"registryUrls": Array [
"https://repo.maven.apache.org/maven2",
],
"separateMinorPatch": true,
},
Object {
"currentValue": "0.7.1",
"datasource": "sbt-package",
......@@ -53,6 +73,21 @@ Object {
exports[`lib/manager/sbt/extract extractPackageFile() extracts deps for generic use-cases 1`] = `
Object {
"deps": Array [
Object {
"currentValue": "2.9.10",
"datasource": "maven",
"depName": "scala",
"lookupName": "org.scala-lang:scala-library",
"registryUrls": Array [
"https://repo.maven.apache.org/maven2",
"https://example.com/repos/1/",
"https://example.com/repos/2/",
"https://example.com/repos/3/",
"https://example.com/repos/4/",
"https://example.com/repos/5/",
],
"separateMinorPatch": true,
},
Object {
"currentValue": "0.0.1",
"datasource": "sbt-package",
......@@ -358,6 +393,16 @@ Object {
exports[`lib/manager/sbt/extract extractPackageFile() extracts deps when scala version is defined with a trailing comma 1`] = `
Object {
"deps": Array [
Object {
"currentValue": "2.12.10",
"datasource": "maven",
"depName": "scala",
"lookupName": "org.scala-lang:scala-library",
"registryUrls": Array [
"https://repo.maven.apache.org/maven2",
],
"separateMinorPatch": true,
},
Object {
"currentValue": "0.0.2",
"datasource": "sbt-package",
......
import * as datasourceMaven from '../../datasource/maven';
import { MAVEN_REPO } from '../../datasource/maven/common';
import * as datasourceSbtPackage from '../../datasource/sbt-package';
import * as datasourceSbtPlugin from '../../datasource/sbt-plugin';
......@@ -181,6 +182,7 @@ function parseDepExpr(
return result;
}
interface ParseOptions {
isMultiDeps?: boolean;
scalaVersion?: string;
......@@ -207,7 +209,15 @@ function parseSbtLine(
if (!isComment(line)) {
if (isScalaVersion(line)) {
isMultiDeps = false;
scalaVersion = normalizeScalaVersion(getScalaVersion(line));
const rawScalaVersion = getScalaVersion(line);
scalaVersion = normalizeScalaVersion(rawScalaVersion);
dep = {
datasource: datasourceMaven.id,
depName: 'scala',
lookupName: 'org.scala-lang:scala-library',
currentValue: rawScalaVersion,
separateMinorPatch: true,
};
} else if (isScalaVersionVariable(line)) {
isMultiDeps = false;
scalaVersionVariable = getScalaVersionVariable(line);
......@@ -252,10 +262,12 @@ function parseSbtLine(
}
if (dep) {
if (dep.depType === 'plugin') {
dep.datasource = datasourceSbtPlugin.id;
} else {
dep.datasource = datasourceSbtPackage.id;
if (!dep.datasource) {
if (dep.depType === 'plugin') {
dep.datasource = datasourceSbtPlugin.id;
} else {
dep.datasource = datasourceSbtPackage.id;
}
}
deps.push({
registryUrls,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment