remove support from the backend for the 'old' channel (#2658)

dart-lang · Sep 22, 2023 · 5619c43 · 5619c43
1 parent 4bf228d
commit 5619c43
Show file tree

Hide file tree

Showing 8 changed files with 8 additions and 122 deletions.
diff --git a/.cloud_build/dart-services/old.yaml b/.cloud_build/dart-services/old.yaml
diff --git a/.github/workflows/dart_services.yml b/.github/workflows/dart_services.yml
@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        sdk: [stable, beta, old, main]
+        sdk: [stable, beta, main]
     steps:
       - uses: actions/checkout@f43a0e5ff2bd294095638e18286ca9a3d1956744
       - uses: dart-lang/setup-dart@d6a63dab3335f427404425de0fbfed4686d93c4f

diff --git a/pkgs/dart_pad/lib/util/query_params.dart b/pkgs/dart_pad/lib/util/query_params.dart
@@ -108,6 +108,8 @@ class _QueryParams {
         } else {
           params['channel'] = value;
         }
+      } else {
+        params.remove('channel');
       }
       return params;
     });
@@ -116,7 +118,6 @@ class _QueryParams {
   static const List<String> _validChannels = [
     'stable',
     'beta',
-    'old',
     'master',
   ];
 

diff --git a/pkgs/dart_services/cloud_run_old.Dockerfile b/pkgs/dart_services/cloud_run_old.Dockerfile
diff --git a/pkgs/dart_services/flutter-sdk-version.yaml b/pkgs/dart_services/flutter-sdk-version.yaml
@@ -12,12 +12,6 @@ flutter_sdk:
   beta:
     flutter_version: 3.14.0-0.2.pre
     dart_language_version: 3.2.0-42.2.beta
-  dev:
-    flutter_version: 3.13.4
-    dart_language_version: 3.1.2
-  old:
-    flutter_version: 3.10.6
-    dart_language_version: 3.0.6
   main:
     flutter_version: 5243d18e8db19b29cf4c681256cdae7d525cc80d
     dart_language_version: 3.2.0-140.0.dev
diff --git a/pkgs/dart_services/lib/src/sdk.dart b/pkgs/dart_services/lib/src/sdk.dart
@@ -33,9 +33,6 @@ class Sdk {
   /// The current version of the SDK, not including any `-dev` suffix.
   final String version;
 
-  /// If this is the old channel.
-  bool get oldChannel => _channel == 'old';
-
   /// If this is the stable channel.
   bool get stableChannel => _channel == 'stable';
 
@@ -100,7 +97,7 @@ class Sdk {
       path.join(Directory.current.path, 'flutter-sdks');
 }
 
-const channels = ['stable', 'beta', 'old', 'main'];
+const channels = ['stable', 'beta', 'main'];
 
 class DownloadingSdkManager {
   final String channel;

diff --git a/pkgs/dart_services/test/common_server_api_protobuf_test.dart b/pkgs/dart_services/test/common_server_api_protobuf_test.dart
@@ -376,11 +376,7 @@ main() {
       final data = json.decode(await response.transform(utf8.decoder).join());
       final reply = proto.AssistsResponse()..mergeFromProto3Json(data);
       final assists = reply.assists;
-      if (sdk.oldChannel) {
-        expect(assists, hasLength(2));
-      } else {
-        expect(assists, hasLength(3));
-      }
+      expect(assists, hasLength(3));
       expect(assists.first.edits, isNotNull);
       expect(assists.first.edits, hasLength(1));
       expect(
@@ -733,11 +729,7 @@ main() {
       final data = json.decode(await response.transform(utf8.decoder).join());
       final reply = proto.AssistsResponse()..mergeFromProto3Json(data);
       final assists = reply.assists;
-      if (sdk.oldChannel) {
-        expect(assists, hasLength(2));
-      } else {
-        expect(assists, hasLength(3));
-      }
+      expect(assists, hasLength(3));
       expect(assists.first.edits, isNotNull);
       expect(assists.first.edits, hasLength(1));
       expect(

diff --git a/pkgs/dart_services/test/common_server_api_test.dart b/pkgs/dart_services/test/common_server_api_test.dart
@@ -442,11 +442,7 @@ main() {
       final encoded = await response.transform(utf8.decoder).join();
       final data = json.decode(encoded) as Map<String, dynamic>;
       final assists = data['assists'] as List<dynamic>;
-      if (sdk.oldChannel) {
-        expect(assists, hasLength(2));
-      } else {
-        expect(assists, hasLength(3));
-      }
+      expect(assists, hasLength(3));
       final firstEdit = assists.first as Map<String, dynamic>;
       expect(firstEdit['edits'], isNotNull);
       expect(firstEdit['edits'], hasLength(1));
@@ -1077,11 +1073,7 @@ main() {
       final encoded = await response.transform(utf8.decoder).join();
       final data = json.decode(encoded) as Map<String, dynamic>;
       final assists = data['assists'] as List<dynamic>;
-      if (sdk.oldChannel) {
-        expect(assists, hasLength(2));
-      } else {
-        expect(assists, hasLength(3));
-      }
+      expect(assists, hasLength(3));
       final firstEdit = assists.first as Map<String, dynamic>;
       expect(firstEdit['edits'], isNotNull);
       expect(firstEdit['edits'], hasLength(1));