From fc54aec796bcef6181e5c1f8c4e3c6cfcba2f6d2 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 12 Aug 2020 15:34:05 +0200
Subject: [PATCH] fix(swift): handle from value where fromVersion is not in
string (#6963)
Closes #6962
---
lib/versioning/swift/index.spec.ts | 2 +-
lib/versioning/swift/range.ts | 5 +----
2 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/lib/versioning/swift/index.spec.ts b/lib/versioning/swift/index.spec.ts
index 5275d8b8bb..74997e3836 100644
--- a/lib/versioning/swift/index.spec.ts
+++ b/lib/versioning/swift/index.spec.ts
@@ -93,7 +93,7 @@ describe('getNewValue()', () => {
['1.2.3', 'auto', '1.2.3', '1.2.4', '1.2.3'],
['v1.2.3', 'auto', 'v1.2.3', 'v1.2.4', 'v1.2.3'],
['from: "1.2.3"', 'auto', '1.2.3', '1.2.4', 'from: "1.2.4"'],
- ['from: "1.2.2"', 'auto', '1.2.3', '1.2.4', '1.2.4'],
+ ['from: "1.2.2"', 'auto', '1.2.3', '1.2.4', 'from: "1.2.4"'],
['"1.2.3"...', 'auto', '1.2.3', '1.2.4', '"1.2.4"...'],
['"1.2.3"..."1.2.4"', 'auto', '1.2.3', '1.2.5', '"1.2.3"..."1.2.5"'],
['"1.2.3"..<"1.2.4"', 'auto', '1.2.3', '1.2.5', '"1.2.3"..<"1.2.5"'],
diff --git a/lib/versioning/swift/range.ts b/lib/versioning/swift/range.ts
index b936e3430f..f4edebffe5 100644
--- a/lib/versioning/swift/range.ts
+++ b/lib/versioning/swift/range.ts
@@ -40,10 +40,7 @@ function getNewValue({
toVersion,
}: NewValueConfig): string {
if (fromParam.test(currentValue)) {
- if (currentValue.includes(fromVersion)) {
- return currentValue.replace(fromVersion, toVersion.replace(/^v/, ''));
- }
- return toVersion.replace(/^v/, '');
+ return currentValue.replace(/".*?"/, `"${toVersion}"`);
}
if (fromRange.test(currentValue)) {
const [, version] = fromRange.exec(currentValue);
--
GitLab