From 552978e599ca07e857181a3c1336bfbf4dee1983 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Fri, 21 Nov 2025 10:19:09 +0100 Subject: [PATCH 1/4] Upgrade analysis and runtime SDKs + dependencies. --- CHANGELOG.md | 4 ++ Dockerfile.app | 2 +- Dockerfile.worker | 4 +- app/lib/shared/versions.dart | 10 ++-- pubspec.lock | 92 ++++++++++++++++-------------------- 5 files changed, 54 insertions(+), 58 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0062161b4f..1c05950add 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,10 @@ Important changes to data models, configuration, and migrations between each AppEngine version, listed here to ease deployment and troubleshooting. ## Next Release (replace with git tag when deployed) + * Bump runtimeVersion to `2025.11.21`. + * Upgraded runtime Dart SDK to `3.10.1` + * Upgraded stable Dart analysis SDK to `3.10.1` + * Upgraded stable Flutter analysis SDK to `3.38.2`. * Note: accepted uncompressed archive total size is increased to 256 MiB. ## `20251120t084200-all` diff --git a/Dockerfile.app b/Dockerfile.app index e7e3ae8e59..ae2c4c9952 100644 --- a/Dockerfile.app +++ b/Dockerfile.app @@ -1,5 +1,5 @@ # Keep version in-sync with .github/workflows/all-test.yml and app/lib/shared/versions.dart -FROM dart:3.9.0 +FROM dart:3.10.1 # After install we remove the apt-index again to keep the docker image diff small. RUN apt-get update && \ diff --git a/Dockerfile.worker b/Dockerfile.worker index ff87cf3bde..536a6db13b 100644 --- a/Dockerfile.worker +++ b/Dockerfile.worker @@ -23,10 +23,10 @@ RUN mkdir -p /home/worker/config/dart-stable RUN mkdir -p /home/worker/config/flutter-stable # Setup Dart SDK into /home/worker/dart/{stable,preview}/ -RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/stable 3.10.0 +RUN XDG_CONFIG_HOME=/home/worker/config/dart-stable tool/setup-dart.sh /home/worker/dart/stable 3.10.1 # Setup Flutter SDK into /home/worker/flutter/{stable,preview}/ -RUN XDG_CONFIG_HOME=/home/worker/config/flutter-stable tool/setup-flutter.sh /home/worker/flutter/stable 3.38.1 +RUN XDG_CONFIG_HOME=/home/worker/config/flutter-stable tool/setup-flutter.sh /home/worker/flutter/stable 3.38.2 # Setup webp RUN tool/setup-webp.sh /home/worker/bin diff --git a/app/lib/shared/versions.dart b/app/lib/shared/versions.dart index 5b873599a0..f66e2ac72b 100644 --- a/app/lib/shared/versions.dart +++ b/app/lib/shared/versions.dart @@ -24,10 +24,10 @@ final RegExp runtimeVersionPattern = RegExp(r'^\d{4}\.\d{2}\.\d{2}$'); /// when the version switch happens. const _acceptedRuntimeVersions = [ // The current [runtimeVersion]. - '2025.11.18', + '2025.11.21', // Fallback runtime versions. + '2025.11.18', '2025.11.13', - '2025.10.31', ]; /// Sets the current runtime versions. @@ -61,9 +61,9 @@ bool shouldGCVersion(String version) => version.compareTo(gcBeforeRuntimeVersion) < 0; // keep in-sync with SDK version in .github/workflows/all-test.yml and Dockerfile.app -final String runtimeSdkVersion = '3.9.0'; -final String toolStableDartSdkVersion = '3.10.0'; -final String toolStableFlutterSdkVersion = '3.38.1'; +final String runtimeSdkVersion = '3.10.1'; +final String toolStableDartSdkVersion = '3.10.1'; +final String toolStableFlutterSdkVersion = '3.38.2'; final semanticToolStableDartSdkVersion = Version.parse( toolStableDartSdkVersion, diff --git a/pubspec.lock b/pubspec.lock index a993ba8088..cc8c50daa0 100644 --- a/pubspec.lock +++ b/pubspec.lock @@ -85,10 +85,10 @@ packages: dependency: "direct overridden" description: name: build - sha256: dfb67ccc9a78c642193e0c2d94cb9e48c2c818b3178a86097d644acdcde6a8d9 + sha256: c1668065e9ba04752570ad7e038288559d1e2ca5c6d0131c0f5f55e39e777413 url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.0.3" build_config: dependency: transitive description: @@ -101,18 +101,18 @@ packages: dependency: transitive description: name: build_daemon - sha256: "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa" + sha256: bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957 url: "https://pub.dev" source: hosted - version: "4.0.4" + version: "4.1.1" build_runner: dependency: transitive description: name: build_runner - sha256: a9461b8e586bf018dd4afd2e13b49b08c6a844a4b226c8d1d10f3a723cdd78c3 + sha256: "110c56ef29b5eb367b4d17fc79375fa8c18a6cd7acd92c05bb3986c17a079057" url: "https://pub.dev" source: hosted - version: "2.10.1" + version: "2.10.4" build_verify: dependency: transitive description: @@ -133,10 +133,10 @@ packages: dependency: transitive description: name: built_value - sha256: ba95c961bafcd8686d1cf63be864eb59447e795e124d98d6a27d91fcd13602fb + sha256: a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d url: "https://pub.dev" source: hosted - version: "8.11.1" + version: "8.12.0" characters: dependency: transitive description: @@ -181,10 +181,10 @@ packages: dependency: transitive description: name: cli_pkg - sha256: eeeea1e0773c5d53fb80a179f82f12c96c50487a37b3cf0174499eb9884c55b2 + sha256: bbffba7114f20c1deceeec8935f9f2de8abcd1befb479663e9a538ef79a17190 url: "https://pub.dev" source: hosted - version: "2.12.0" + version: "2.15.0" cli_repl: dependency: transitive description: @@ -213,10 +213,10 @@ packages: dependency: transitive description: name: code_builder - sha256: "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e" + sha256: "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243" url: "https://pub.dev" source: hosted - version: "4.10.1" + version: "4.11.0" collection: dependency: transitive description: @@ -245,10 +245,10 @@ packages: dependency: transitive description: name: crypto - sha256: "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855" + sha256: c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf url: "https://pub.dev" source: hosted - version: "3.0.6" + version: "3.0.7" csslib: dependency: transitive description: @@ -261,10 +261,10 @@ packages: dependency: transitive description: name: dart_style - sha256: c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697 + sha256: a9c30492da18ff84efe2422ba2d319a89942d93e58eb0b73d32abe822ef54b7b url: "https://pub.dev" source: hosted - version: "3.1.2" + version: "3.1.3" fake_async: dependency: transitive description: @@ -381,10 +381,10 @@ packages: dependency: transitive description: name: http - sha256: bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007 + sha256: "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412" url: "https://pub.dev" source: hosted - version: "1.5.0" + version: "1.6.0" http2: dependency: transitive description: @@ -453,10 +453,10 @@ packages: dependency: transitive description: name: json_serializable - sha256: "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe" + sha256: c5b2ee75210a0f263c6c7b9eeea80553dbae96ea1bf57f02484e806a3ffdffa3 url: "https://pub.dev" source: hosted - version: "6.11.1" + version: "6.11.2" jsontool: dependency: transitive description: @@ -509,10 +509,10 @@ packages: dependency: transitive description: name: matcher - sha256: dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2 + sha256: "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6" url: "https://pub.dev" source: hosted - version: "0.12.17" + version: "0.12.18" mdc_web: dependency: transitive description: @@ -589,10 +589,10 @@ packages: dependency: transitive description: name: oauth2 - sha256: c84470642cbb2bec450ccab2f8520c079cd1ca546a76ffd5c40589e07f4e8bf4 + sha256: "890a032ba1b44fa8dcfeba500e613df0ecbe16aeace13bb0fe1d25eb42cda5b8" url: "https://pub.dev" source: hosted - version: "2.0.3" + version: "2.0.5" package_config: dependency: transitive description: @@ -621,10 +621,10 @@ packages: dependency: transitive description: name: pem - sha256: "3dfb24524f805ad694ba3cdbb6387ab31ab661fdb8ea873052ed88487fcfef86" + sha256: e66b389cbb007fa5860d511f08ea604ea68e78afc4e1b543dc227a0f0ef4faf9 url: "https://pub.dev" source: hosted - version: "2.0.5" + version: "2.0.6" petitparser: dependency: transitive description: @@ -637,10 +637,10 @@ packages: dependency: transitive description: name: pool - sha256: "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a" + sha256: "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d" url: "https://pub.dev" source: hosted - version: "1.5.1" + version: "1.5.2" postgres: dependency: transitive description: @@ -773,10 +773,10 @@ packages: dependency: transitive description: name: source_gen - sha256: "9098ab86015c4f1d8af6486b547b11100e73b193e1899015033cb3e14ad20243" + sha256: "07b277b67e0096c45196cbddddf2d8c6ffc49342e88bf31d460ce04605ddac75" url: "https://pub.dev" source: hosted - version: "4.0.2" + version: "4.1.1" source_helper: dependency: transitive description: @@ -809,22 +809,14 @@ packages: url: "https://pub.dev" source: hosted version: "1.10.1" - sprintf: - dependency: transitive - description: - name: sprintf - sha256: "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23" - url: "https://pub.dev" - source: hosted - version: "7.0.0" sqlite3: dependency: transitive description: name: sqlite3 - sha256: f18fd9a72d7a1ad2920db61368f2a69368f1cc9b56b8233e9d83b47b0a8435aa + sha256: "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2" url: "https://pub.dev" source: hosted - version: "2.9.3" + version: "2.9.4" stack_trace: dependency: transitive description: @@ -877,26 +869,26 @@ packages: dependency: transitive description: name: test - sha256: "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7" + sha256: "77cc98ea27006c84e71a7356cf3daf9ddbde2d91d84f77dbfe64cf0e4d9611ae" url: "https://pub.dev" source: hosted - version: "1.26.3" + version: "1.28.0" test_api: dependency: transitive description: name: test_api - sha256: ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55 + sha256: "19a78f63e83d3a61f00826d09bc2f60e191bf3504183c001262be6ac75589fb8" url: "https://pub.dev" source: hosted - version: "0.7.7" + version: "0.7.8" test_core: dependency: transitive description: name: test_core - sha256: "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0" + sha256: f1072617a6657e5fc09662e721307f7fb009b4ed89b19f47175d11d5254a62d4 url: "https://pub.dev" source: hosted - version: "0.6.12" + version: "0.6.14" test_process: dependency: transitive description: @@ -933,10 +925,10 @@ packages: dependency: transitive description: name: uuid - sha256: a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff + sha256: a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8 url: "https://pub.dev" source: hosted - version: "4.5.1" + version: "4.5.2" vm_service: dependency: transitive description: @@ -949,10 +941,10 @@ packages: dependency: transitive description: name: watcher - sha256: "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a" + sha256: "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a" url: "https://pub.dev" source: hosted - version: "1.1.2" + version: "1.1.4" web: dependency: transitive description: From 56862840f91f9eee49fd5707f533cc0ab72e5c63 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Fri, 21 Nov 2025 10:35:54 +0100 Subject: [PATCH 2/4] unused import --- app/lib/fake/backend/fake_pub_worker.dart | 1 - 1 file changed, 1 deletion(-) diff --git a/app/lib/fake/backend/fake_pub_worker.dart b/app/lib/fake/backend/fake_pub_worker.dart index 35f49b2e8d..b560fb4212 100644 --- a/app/lib/fake/backend/fake_pub_worker.dart +++ b/app/lib/fake/backend/fake_pub_worker.dart @@ -13,7 +13,6 @@ import 'package:_pub_shared/worker/docker_utils.dart'; import 'package:clock/clock.dart'; import 'package:gcloud/service_scope.dart'; import 'package:http/http.dart'; -import 'package:http_parser/http_parser.dart'; import 'package:indexed_blob/indexed_blob.dart'; import 'package:pana/pana.dart'; import 'package:path/path.dart' as p; From ec10e670f12b4ad1ad14867a3ab57aebcf6b3265 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Fri, 21 Nov 2025 10:36:54 +0100 Subject: [PATCH 3/4] bump CI version --- .github/workflows/all-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/all-test.yml b/.github/workflows/all-test.yml index afe5daf885..c67b9e430f 100644 --- a/.github/workflows/all-test.yml +++ b/.github/workflows/all-test.yml @@ -11,7 +11,7 @@ on: env: PUB_ENVIRONMENT: bot.github - DART_SDK_VERSION: '3.9.0' + DART_SDK_VERSION: '3.10.1' jobs: app_build_only: From aa727a238e2e24323f80cbed88f0c1de009bdfd2 Mon Sep 17 00:00:00 2001 From: Istvan Soos Date: Fri, 21 Nov 2025 11:53:20 +0100 Subject: [PATCH 4/4] also image_proxy's Dockerfile --- pkg/image_proxy/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/image_proxy/Dockerfile b/pkg/image_proxy/Dockerfile index cf0bc8e040..1788db11a4 100644 --- a/pkg/image_proxy/Dockerfile +++ b/pkg/image_proxy/Dockerfile @@ -1,5 +1,5 @@ # Use latest stable channel SDK. -FROM dart:3.9.0 AS build +FROM dart:3.10.1 AS build ENV PUB_ENVIRONMENT="bot" ENV PUB_CACHE="/project/.pub-cache"