Versioning checks update

dart-lang · Jan 24, 2025 · 3a7c791 · 3a7c791
1 parent ddfbb37
commit 3a7c791
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/pkgs/dart_services/lib/src/sdk.dart b/pkgs/dart_services/lib/src/sdk.dart
@@ -158,11 +158,17 @@ final class Sdk {
     return true;
   }
 
-  static final _dartMinorVersionMatch = RegExp(r'([0-9]+.[0-9]+)');
+  static final _dartVersionMatch = RegExp(r'([0-9]+).([0-9]+)');
 
-  double get dartMinorVersion {
+  int get dartMajorVersion {
     final dartVersionString =
-        _dartMinorVersionMatch.firstMatch(dartVersion)!.group(1)!;
-    return double.parse(dartVersionString);
+        _dartVersionMatch.firstMatch(dartVersion)!.group(1)!;
+    return int.parse(dartVersionString);
+  }
+
+  int get dartMinorVersion {
+    final dartVersionString =
+        _dartVersionMatch.firstMatch(dartVersion)!.group(2)!;
+    return int.parse(dartVersionString);
   }
 }
diff --git a/pkgs/dart_services/test/compiling_test.dart b/pkgs/dart_services/test/compiling_test.dart
@@ -149,7 +149,7 @@ void defineTests() {
         endpoint: (source) => compiler.compileDDC(source),
         expectDeltaDill: false,
         compiledIndicator: "define('dartpad_main', [");
-    if (sdk.dartMinorVersion >= 3.8) {
+    if (sdk.dartMajorVersion >= 3 && sdk.dartMinorVersion >= 8) {
       // DDC only supports these at version 3.8 and higher.
       testDDCEndpoint('compileNewDDC',
           endpoint: (source) => compiler.compileNewDDC(source),

diff --git a/pkgs/dart_services/tool/grind.dart b/pkgs/dart_services/tool/grind.dart
@@ -240,7 +240,7 @@ Future<String> _buildStorageArtifacts(
   copy(joinFile(dir, ['flutter_web.dill']), artifactsDir);
 
   // We only expect these hot reload artifacts to work at version 3.8 and later.
-  if (sdk.dartMinorVersion >= 3.8) {
+  if (sdk.dartMajorVersion >= 3 && sdk.dartMinorVersion >= 8) {
     final argumentsNew = <String>[
       path.join(sdk.dartSdkPath, 'bin', 'snapshots', 'dartdevc.dart.snapshot'),
       '-s',

diff --git a/pkgs/dartpad_shared/lib/util.dart b/pkgs/dartpad_shared/lib/util.dart