From fc8f86ea9f173dc78fd98d877d731f932f73e62e Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Fri, 6 May 2022 13:44:20 -0700 Subject: [PATCH 1/3] always use >= prevVersion --- .../lib/src/commands/update_packages.dart | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index 4ac5b356bf0a3..27e4086852c83 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -1321,8 +1321,17 @@ class PubspecDependency extends PubspecLine { /// This generates the entry for this dependency for the pubspec.yaml for the /// fake package that we'll use to get the version numbers figured out. - void describeForFakePubspec(StringBuffer dependencies, StringBuffer overrides, { bool useAnyVersion = true}) { - final String versionToUse = useAnyVersion || version.isEmpty ? 'any' : version; + void describeForFakePubspec(StringBuffer dependencies, StringBuffer overrides, { bool doUpgrade = true }) { + final String versionToUse; + if (version.isEmpty) { + versionToUse = 'any'; + } else if (doUpgrade) { + // Must wrap in quotes for Yaml parsing + versionToUse = "'>= $version'"; + } else { + versionToUse = version; + } + // final versionToUse = useAnyVersion || version.isEmpty ? 'any' : version; switch (kind) { case DependencyKind.unknown: case DependencyKind.overridden: From 18ff79941aac63898c4461e0cffdccd8e390af93 Mon Sep 17 00:00:00 2001 From: Christopher Fujino Date: Fri, 6 May 2022 14:10:32 -0700 Subject: [PATCH 2/3] fix compile --- .../flutter_tools/lib/src/commands/update_packages.dart | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/flutter_tools/lib/src/commands/update_packages.dart b/packages/flutter_tools/lib/src/commands/update_packages.dart index 27e4086852c83..8451a8c013e5f 100644 --- a/packages/flutter_tools/lib/src/commands/update_packages.dart +++ b/packages/flutter_tools/lib/src/commands/update_packages.dart @@ -384,7 +384,7 @@ class UpdatePackagesCommand extends FlutterCommand { fakePackage.writeAsStringSync( _generateFakePubspec( dependencies, - useAnyVersion: doUpgrade, + doUpgrade: doUpgrade, ), ); // Create a synthetic flutter SDK so that transitive flutter SDK @@ -1394,7 +1394,7 @@ String _generateFakePubspec( }) { final StringBuffer result = StringBuffer(); final StringBuffer overrides = StringBuffer(); - final bool verbose = useAnyVersion; + final bool verbose = doUpgrade; result.writeln('name: flutter_update_packages'); result.writeln('environment:'); result.writeln(" sdk: '>=2.10.0 <3.0.0'"); @@ -1424,7 +1424,7 @@ String _generateFakePubspec( } for (final PubspecDependency dependency in dependencies) { if (!dependency.pointsToSdk) { - dependency.describeForFakePubspec(result, overrides, useAnyVersion: useAnyVersion); + dependency.describeForFakePubspec(result, overrides, doUpgrade: doUpgrade); } } result.write(overrides.toString()); From c3bc5c3567667dc13394d172a153f3e1c94fcad3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 9 Jan 2023 10:15:29 +0000 Subject: [PATCH 3/3] Bump actions/upload-artifact from 3.0.0 to 3.1.2 Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3.0.0 to 3.1.2. - [Release notes](https://github.com/actions/upload-artifact/releases) - [Commits](https://github.com/actions/upload-artifact/compare/6673cd052c4cd6fcf4b4e6e60ea986c889389535...0b7f8abb1508181956e8e162db84b466c27e18ce) --- updated-dependencies: - dependency-name: actions/upload-artifact dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- .github/workflows/scorecards-analysis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/scorecards-analysis.yml b/.github/workflows/scorecards-analysis.yml index d163ac3e94c38..3302968b3ce77 100644 --- a/.github/workflows/scorecards-analysis.yml +++ b/.github/workflows/scorecards-analysis.yml @@ -41,7 +41,7 @@ jobs: # Upload the results as artifacts (optional). - name: "Upload artifact" - uses: actions/upload-artifact@6673cd052c4cd6fcf4b4e6e60ea986c889389535 + uses: actions/upload-artifact@0b7f8abb1508181956e8e162db84b466c27e18ce with: name: SARIF file path: results.sarif