From b36a5301cdb2ed24dd59af67d9afe9a660c8e4de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Istv=C3=A1n=20So=C3=B3s?= <isoos@users.noreply.github.com>
Date: Wed, 6 Dec 2023 09:30:53 +0100
Subject: [PATCH] Upgrade analysis SDKs (#7256)

---
 CHANGELOG.md                 |  5 +++++
 Dockerfile.worker            |  8 ++++----
 app/lib/shared/versions.dart | 12 ++++++------
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecd54be94..255b8a033 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@ 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)
+ * Bumped runtimeVersion to `2023.12.06`.
+ * Upgraded stable Dart analysis SDK to `3.2.2`.
+ * Upgraded stable Flutter analysis SDK to `3.16.2`.
+ * Upgraded preview Dart analysis SDK to `3.3.0-174.2.beta`.
+ * Upgraded preview Flutter analysis SDK to `3.18.0-0.1.pre`.
 
 ## `20231128t115900-all`
  * Bumped runtimeVersion to `2023.11.28`.
diff --git a/Dockerfile.worker b/Dockerfile.worker
index bf98e378d..b4eb823db 100644
--- a/Dockerfile.worker
+++ b/Dockerfile.worker
@@ -18,16 +18,16 @@ COPY --chown=worker:worker . /home/worker/pub-dev
 WORKDIR /home/worker/pub-dev
 
 # Setup Dart SDK into /home/worker/dart/{stable,preview}/
-RUN tool/setup-dart.sh /home/worker/dart 3.2.1
+RUN tool/setup-dart.sh /home/worker/dart 3.2.2
 RUN mv /home/worker/dart/dart-sdk /home/worker/dart/stable
-RUN tool/setup-dart.sh /home/worker/dart 3.3.0-166.0.dev
+RUN tool/setup-dart.sh /home/worker/dart 3.3.0-174.2.beta
 RUN tool/setup-webp.sh /home/worker/bin
 RUN mv /home/worker/dart/dart-sdk /home/worker/dart/preview
 
 # Setup Flutter SDK into /home/worker/flutter/{stable,preview}/
-RUN tool/setup-flutter.sh /home/worker/flutter 3.16.1
+RUN tool/setup-flutter.sh /home/worker/flutter 3.16.2
 RUN mv /home/worker/flutter/flutter /home/worker/flutter/stable
-RUN tool/setup-flutter.sh /home/worker/flutter 3.17.0-0.0.pre
+RUN tool/setup-flutter.sh /home/worker/flutter 3.18.0-0.1.pre
 RUN mv /home/worker/flutter/flutter /home/worker/flutter/preview
 
 # Configure SDKs to be used for analysis
diff --git a/app/lib/shared/versions.dart b/app/lib/shared/versions.dart
index 5143684ae..14687dcc4 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 = <String>[
   // The current [runtimeVersion].
-  '2023.11.28',
+  '2023.12.06',
   // Fallback runtime versions.
+  '2023.11.28',
   '2023.11.21',
-  '2023.11.16',
 ];
 
 /// Sets the current runtime versions.
@@ -62,10 +62,10 @@ bool shouldGCVersion(String version) =>
 
 // keep in-sync with SDK version in .mono_repo.yml and Dockerfile
 final String runtimeSdkVersion = '3.2.0';
-final String toolStableDartSdkVersion = '3.2.1';
-final String toolStableFlutterSdkVersion = '3.16.1';
-final String toolPreviewDartSdkVersion = '3.3.0-166.0.dev';
-final String toolPreviewFlutterSdkVersion = '3.17.0-0.0.pre';
+final String toolStableDartSdkVersion = '3.2.2';
+final String toolStableFlutterSdkVersion = '3.16.2';
+final String toolPreviewDartSdkVersion = '3.3.0-174.2.beta';
+final String toolPreviewFlutterSdkVersion = '3.18.0-0.1.pre';
 
 final semanticToolStableDartSdkVersion =
     Version.parse(toolStableDartSdkVersion);