From b6d84a277541cf296220de8967beae4c230bc117 Mon Sep 17 00:00:00 2001
From: Sergio Zharinov <zharinov@users.noreply.github.com>
Date: Fri, 7 Feb 2020 20:23:29 +0400
Subject: [PATCH] fix: Maven-based update functions (#5405)
---
lib/manager/deps-edn/update.spec.ts | 2 +-
lib/manager/deps-edn/update.ts | 10 +++++++++-
lib/manager/leiningen/update.spec.ts | 5 ++++-
lib/manager/leiningen/update.ts | 10 +++++++++-
4 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/lib/manager/deps-edn/update.spec.ts b/lib/manager/deps-edn/update.spec.ts
index 126a9462f1..45349c6b4a 100644
--- a/lib/manager/deps-edn/update.spec.ts
+++ b/lib/manager/deps-edn/update.spec.ts
@@ -18,7 +18,7 @@ describe('manager/deps-edn/update', () => {
newValue: `${dep.currentValue}-9999`,
};
const { currentValue, newValue } = upgrade;
- const newFileContent = updateDependency(depsEdn, upgrade);
+ const newFileContent = updateDependency({ fileContent: depsEdn, upgrade });
const cmpContent = depsEdn.replace(currentValue, newValue);
expect(newFileContent).toEqual(cmpContent);
});
diff --git a/lib/manager/deps-edn/update.ts b/lib/manager/deps-edn/update.ts
index 0d7226b371..b12e6e44d7 100644
--- a/lib/manager/deps-edn/update.ts
+++ b/lib/manager/deps-edn/update.ts
@@ -1 +1,9 @@
-export { updateAtPosition as updateDependency } from '../maven/update';
+import { UpdateDependencyConfig } from '../common';
+import { updateAtPosition } from '../maven/update';
+
+export function updateDependency({
+ fileContent,
+ upgrade,
+}: UpdateDependencyConfig): string | null {
+ return updateAtPosition(fileContent, upgrade);
+}
diff --git a/lib/manager/leiningen/update.spec.ts b/lib/manager/leiningen/update.spec.ts
index 6a9ae00db5..994a05eb2e 100644
--- a/lib/manager/leiningen/update.spec.ts
+++ b/lib/manager/leiningen/update.spec.ts
@@ -18,7 +18,10 @@ describe('manager/leiningen/update', () => {
newValue: `${dep.currentValue}-9999`,
};
const { currentValue, newValue } = upgrade;
- const newFileContent = updateDependency(leinProjectClj, upgrade);
+ const newFileContent = updateDependency({
+ fileContent: leinProjectClj,
+ upgrade,
+ });
const cmpContent = leinProjectClj.replace(currentValue, newValue);
expect(newFileContent).toEqual(cmpContent);
});
diff --git a/lib/manager/leiningen/update.ts b/lib/manager/leiningen/update.ts
index 0d7226b371..b12e6e44d7 100644
--- a/lib/manager/leiningen/update.ts
+++ b/lib/manager/leiningen/update.ts
@@ -1 +1,9 @@
-export { updateAtPosition as updateDependency } from '../maven/update';
+import { UpdateDependencyConfig } from '../common';
+import { updateAtPosition } from '../maven/update';
+
+export function updateDependency({
+ fileContent,
+ upgrade,
+}: UpdateDependencyConfig): string | null {
+ return updateAtPosition(fileContent, upgrade);
+}
--
GitLab