From f31208f6d15308587a9492f9f28e6dc0575b9262 Mon Sep 17 00:00:00 2001 From: ronnnnn Date: Fri, 12 May 2023 20:10:04 +0900 Subject: [PATCH 1/3] update: support channel suffix on asdf flutter --- lib/modules/manager/asdf/extract.spec.ts | 25 ++++++++++++++++++- .../manager/asdf/upgradeable-tooling.ts | 6 +++-- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/lib/modules/manager/asdf/extract.spec.ts b/lib/modules/manager/asdf/extract.spec.ts index 4b9e67bf232326..458326f50dcd6d 100644 --- a/lib/modules/manager/asdf/extract.spec.ts +++ b/lib/modules/manager/asdf/extract.spec.ts @@ -57,7 +57,7 @@ ecspresso 2.1.0 elixir 1.14.1 elm 0.19.1 erlang 25.1.2 -flutter 3.7.6 +flutter 3.7.6-stable gauche 0.9.12 gohugo extended_0.104.3 golang 1.19.2 @@ -437,6 +437,29 @@ dummy 1.2.3 }); }); + it('can handle flutter version channel', () => { + const withChannel = extractPackageFile('flutter 3.10.0-stable'); + expect(withChannel).toEqual({ + deps: [ + { + currentValue: '3.10.0', + datasource: 'flutter-version', + depName: 'flutter', + }, + ], + }); + const withoutChannel = extractPackageFile('flutter 3.10.0'); + expect(withoutChannel).toEqual({ + deps: [ + { + currentValue: '3.10.0', + datasource: 'flutter-version', + depName: 'flutter', + }, + ], + }); + }); + it('can handle java jre / jdk', () => { const jdkRes = extractPackageFile('java adoptopenjdk-16.0.0+36'); expect(jdkRes).toEqual({ diff --git a/lib/modules/manager/asdf/upgradeable-tooling.ts b/lib/modules/manager/asdf/upgradeable-tooling.ts index 921d1274af0276..6c2e08b1215efe 100644 --- a/lib/modules/manager/asdf/upgradeable-tooling.ts +++ b/lib/modules/manager/asdf/upgradeable-tooling.ts @@ -144,9 +144,11 @@ export const upgradeableTooling: Record = { }, flutter: { asdfPluginUrl: 'https://github.com/oae/asdf-flutter', - config: { + config: (version) => ({ datasource: FlutterVersionDatasource.id, - }, + // asdf-flutter plugin supports channel on version suffix. + currentValue: version.replace(/-(stable|beta|dev)$/, ''), + }), }, gauche: { asdfPluginUrl: 'https://github.com/sakuro/asdf-gauche', From 20d49fe47daf6b17debd9c6992efb322b63be980 Mon Sep 17 00:00:00 2001 From: Seiya Kokushi Date: Mon, 15 May 2023 17:31:56 +0900 Subject: [PATCH 2/3] update: use regEx for channel suffix Co-authored-by: Michael Kriese --- lib/modules/manager/asdf/upgradeable-tooling.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/modules/manager/asdf/upgradeable-tooling.ts b/lib/modules/manager/asdf/upgradeable-tooling.ts index 6c2e08b1215efe..6839f197169324 100644 --- a/lib/modules/manager/asdf/upgradeable-tooling.ts +++ b/lib/modules/manager/asdf/upgradeable-tooling.ts @@ -147,7 +147,7 @@ export const upgradeableTooling: Record = { config: (version) => ({ datasource: FlutterVersionDatasource.id, // asdf-flutter plugin supports channel on version suffix. - currentValue: version.replace(/-(stable|beta|dev)$/, ''), + currentValue: version.replace(regEx(/-(stable|beta|dev)$/), ''), }), }, gauche: { From 6a8abfb0f0e13cc9996eccb119c6741b1c6a4add Mon Sep 17 00:00:00 2001 From: ronnnnn Date: Mon, 15 May 2023 18:03:17 +0900 Subject: [PATCH 3/3] fix: add import for regEx --- lib/modules/manager/asdf/upgradeable-tooling.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/modules/manager/asdf/upgradeable-tooling.ts b/lib/modules/manager/asdf/upgradeable-tooling.ts index 6839f197169324..0e280d8e6daa80 100644 --- a/lib/modules/manager/asdf/upgradeable-tooling.ts +++ b/lib/modules/manager/asdf/upgradeable-tooling.ts @@ -1,3 +1,4 @@ +import { regEx } from '../../../util/regex'; import { DartVersionDatasource } from '../../datasource/dart-version'; import { DockerDatasource } from '../../datasource/docker'; import { FlutterVersionDatasource } from '../../datasource/flutter-version';