Remove v1.0 / v1.1 serialization format code. Require 3.6.0+ (which has newest serialization format) via increased Dart SDK constraint

Author: mkustermann

pkgs/native_assets_cli/CHANGELOG.md

@@ -1,10 +1,11 @@
-## 0.8.1-wip
+## 0.9.0-wip
 
 - Add `BuildConfig` and `LinkConfig` `outputDirectoryShared`.
 - Remove `package:native_assets_cli/locking.dart` with `runUnderDirectoryLock`.
   Hook writers should not use this, the `native_assets_builder` does this.
 - Fix example packages with RecordUse annotations
   [#1586](https://github.com/dart-lang/native/issues/1586).
+- Remove v1.0 / v1.1 related serialization
 
 ## 0.8.0
 

pkgs/native_assets_cli/lib/src/api/asset.dart

@@ -4,7 +4,6 @@
 
 import 'package:pub_semver/pub_semver.dart';
 
-import '../model/target.dart';
 import '../utils/json.dart';
 import '../utils/map.dart';
 import 'architecture.dart';

pkgs/native_assets_cli/lib/src/model/asset.dart

@@ -15,7 +15,6 @@ abstract final class AssetImpl implements Asset {
       final type = jsonMap[NativeCodeAssetImpl.typeKey];
       switch (type) {
         case NativeCodeAsset.type:
-        case null: // Backwards compatibility with v1.0.0.
           assets.add(NativeCodeAssetImpl.fromJson(jsonMap));
         case DataAsset.type:
           assets.add(DataAssetImpl.fromJson(jsonMap));

pkgs/native_assets_cli/lib/src/model/build_config.dart

@@ -20,11 +20,7 @@ final class BuildConfigImpl extends HookConfigImpl implements BuildConfig {
   }
 
   @override
-  String get outputName =>
-      version > Version(1, 1, 0) ? 'build_output.json' : outputNameV1_1_0;
-
-  @override
-  String get outputNameV1_1_0 => 'build_output.yaml';
+  String get outputName => 'build_output.json';
 
   @override
   Object? metadatum(String packageName, String key) {

pkgs/native_assets_cli/lib/src/model/hook_config.dart

@@ -104,12 +104,6 @@ abstract class HookConfigImpl implements HookConfig {
   /// Makes newer build hooks work with older Dart SDKs.
   String get outputName;
 
-  /// Legacy output file name.
-  ///
-  /// Older build hooks output a yaml file, ignoring the newer protocol version
-  /// in the config.
-  String? get outputNameV1_1_0;
-
   HookConfigImpl({
     required this.hook,
     required this.outputDirectory,
@@ -157,10 +151,6 @@ abstract class HookConfigImpl implements HookConfig {
 
   Uri get outputFile => outputDirectory.resolve(outputName);
 
-  Uri? get outputFileV1_1_0 => outputNameV1_1_0 == null
-      ? null
-      : outputDirectory.resolve(outputNameV1_1_0!);
-
   // This is currently overriden by [BuildConfig], do account for older versions
   // still using a top-level build.dart.
   Uri get script => packageRoot.resolve('hook/').resolve(hook.scriptName);
@@ -484,7 +474,9 @@ can _only_ depend on OS.''');
     if (other.targetOS != targetOS) return false;
     if (other.linkModePreference != linkModePreference) return false;
     if (!const DeepCollectionEquality()
-        .equals(other.supportedAssetTypes, supportedAssetTypes)) return false;
+        .equals(other.supportedAssetTypes, supportedAssetTypes)) {
+      return false;
+    }
     if (!dryRun) {
       if (other.buildMode != buildMode) return false;
       if (other.targetArchitecture != targetArchitecture) return false;

pkgs/native_assets_cli/lib/src/model/link_config.dart

@@ -69,9 +69,6 @@ class LinkConfigImpl extends HookConfigImpl implements LinkConfig {
   @override
   String get outputName => 'link_output.json';
 
-  @override
-  String? get outputNameV1_1_0 => null;
-
   @override
   Map<String, Object> toJson() => {
         ...hookToJson(),

pkgs/native_assets_cli/lib/src/model/native_code_asset.dart

@@ -5,7 +5,7 @@
 part of '../api/asset.dart';
 
 abstract final class LinkModeImpl implements LinkMode {
-  /// Serialization of v1.1.0 and newer
+  /// Serialization of a link mode.
   ///
   /// Does not include the toplevel keys.
   ///
@@ -15,30 +15,14 @@ abstract final class LinkModeImpl implements LinkMode {
   /// ```
   Map<String, Object> toJson();
 
-  /// Backwards compatibility with v1.0.0 of the protocol
-  ///
-  /// Includes the parent keys.
-  ///
-  /// ```
-  /// link_mode: dynamic
-  /// path:
-  ///   path_type: system
-  ///   uri: ${foo3Uri.toFilePath()}
-  /// ```
-  Map<String, Object> toJsonV1_0_0(Uri? file);
-
   factory LinkModeImpl(String type, Uri? uri) {
     switch (type) {
-      case DynamicLoadingBundledImpl._typeValueV1_0_0:
       case DynamicLoadingBundledImpl._typeValue:
         return DynamicLoadingBundledImpl();
-      case DynamicLoadingSystemImpl._typeValueV1_0_0:
       case DynamicLoadingSystemImpl._typeValue:
         return DynamicLoadingSystemImpl(uri!);
-      case LookupInExecutableImpl._typeValueV1_0_0:
       case LookupInExecutableImpl._typeValue:
         return LookupInExecutableImpl();
-      case LookupInProcessImpl._typeValueV1_0_0:
       case LookupInProcessImpl._typeValue:
         return LookupInProcessImpl();
       case StaticLinkingImpl._typeValue:
@@ -47,7 +31,6 @@ abstract final class LinkModeImpl implements LinkMode {
     throw FormatException('Unknown type: $type.');
   }
 
-  /// v1.1.0 and newer.
   factory LinkModeImpl.fromJson(Map<Object?, Object?> jsonMap) {
     final type = get<String>(jsonMap, _typeKey);
     final uriString = get<String?>(jsonMap, _uriKey);
@@ -61,11 +44,8 @@ abstract final class LinkModeImpl implements LinkMode {
 
 abstract final class DynamicLoadingImpl
     implements LinkModeImpl, DynamicLoading {
-  static const _pathTypeKeyV1_0_0 = 'path_type';
   static const _typeKey = 'type';
   static const _uriKey = 'uri';
-
-  static const _typeValueV1_0_0 = 'dynamic';
 }
 
 final class DynamicLoadingBundledImpl
@@ -77,23 +57,13 @@ final class DynamicLoadingBundledImpl
 
   factory DynamicLoadingBundledImpl() => _singleton;
 
-  static const _typeValueV1_0_0 = 'absolute';
   static const _typeValue = 'dynamic_loading_bundle';
 
   @override
   Map<String, Object> toJson() => {
         DynamicLoadingImpl._typeKey: _typeValue,
       };
 
-  @override
-  Map<String, Object> toJsonV1_0_0(Uri? file) => {
-        NativeCodeAssetImpl._linkModeKey: DynamicLoadingImpl._typeValueV1_0_0,
-        NativeCodeAssetImpl._pathKey: {
-          DynamicLoadingImpl._pathTypeKeyV1_0_0: _typeValueV1_0_0,
-          DynamicLoadingImpl._uriKey: file!.toFilePath(),
-        }
-      };
-
   @override
   String toString() => _typeValue;
 }
@@ -106,23 +76,13 @@ final class DynamicLoadingSystemImpl
   DynamicLoadingSystemImpl(this.uri);
 
   static const _typeValue = 'dynamic_loading_system';
-  static const _typeValueV1_0_0 = 'system';
 
   @override
   Map<String, Object> toJson() => {
         DynamicLoadingImpl._typeKey: _typeValue,
         DynamicLoadingImpl._uriKey: uri.toFilePath(),
       };
 
-  @override
-  Map<String, Object> toJsonV1_0_0(Uri? file) => {
-        NativeCodeAssetImpl._linkModeKey: DynamicLoadingImpl._typeValueV1_0_0,
-        NativeCodeAssetImpl._pathKey: {
-          DynamicLoadingImpl._pathTypeKeyV1_0_0: _typeValueV1_0_0,
-          DynamicLoadingImpl._uriKey: uri.toFilePath(),
-        }
-      };
-
   @override
   int get hashCode => Object.hash(uri, 133723);
 
@@ -146,21 +106,12 @@ final class LookupInProcessImpl implements DynamicLoadingImpl, LookupInProcess {
   factory LookupInProcessImpl() => _singleton;
 
   static const _typeValue = 'dynamic_loading_process';
-  static const _typeValueV1_0_0 = 'process';
 
   @override
   Map<String, Object> toJson() => {
         DynamicLoadingImpl._typeKey: _typeValue,
       };
 
-  @override
-  Map<String, Object> toJsonV1_0_0(Uri? file) => {
-        NativeCodeAssetImpl._linkModeKey: DynamicLoadingImpl._typeValueV1_0_0,
-        NativeCodeAssetImpl._pathKey: {
-          DynamicLoadingImpl._pathTypeKeyV1_0_0: _typeValueV1_0_0,
-        }
-      };
-
   @override
   String toString() => _typeValue;
 }
@@ -174,20 +125,11 @@ final class LookupInExecutableImpl
   factory LookupInExecutableImpl() => _singleton;
 
   static const _typeValue = 'dynamic_loading_executable';
-  static const _typeValueV1_0_0 = 'executable';
 
   @override
   Map<String, Object> toJson() => {
         DynamicLoadingImpl._typeKey: _typeValue,
       };
-
-  @override
-  Map<String, Object> toJsonV1_0_0(Uri? file) => {
-        NativeCodeAssetImpl._linkModeKey: DynamicLoadingImpl._typeValueV1_0_0,
-        NativeCodeAssetImpl._pathKey: {
-          DynamicLoadingImpl._pathTypeKeyV1_0_0: _typeValueV1_0_0,
-        }
-      };
 }
 
 final class StaticLinkingImpl implements LinkModeImpl, StaticLinking {
@@ -204,11 +146,6 @@ final class StaticLinkingImpl implements LinkModeImpl, StaticLinking {
         DynamicLoadingImpl._typeKey: _typeValue,
       };
 
-  @override
-  Map<String, Object> toJsonV1_0_0(Uri? file) => {
-        NativeCodeAssetImpl._linkModeKey: _typeValue,
-      };
-
   @override
   String toString() => _typeValue;
 }
@@ -248,56 +185,24 @@ final class NativeCodeAssetImpl implements NativeCodeAsset, AssetImpl {
   }
 
   factory NativeCodeAssetImpl.fromJson(Map<Object?, Object?> jsonMap) {
-    final LinkModeImpl linkMode;
     final linkModeJson = jsonMap[_linkModeKey];
-    if (linkModeJson is String) {
-      // v1.0.0
-      if (linkModeJson == StaticLinkingImpl._typeValue) {
-        linkMode = StaticLinkingImpl();
-      } else {
-        assert(linkModeJson == DynamicLoadingImpl._typeValueV1_0_0);
-        final pathJson = get<Map<Object?, Object?>>(jsonMap, _pathKey);
-        final type =
-            as<String>(pathJson[DynamicLoadingImpl._pathTypeKeyV1_0_0]);
-        final uriString = as<String?>(pathJson[DynamicLoadingImpl._uriKey]);
-        final uri = uriString != null ? Uri(path: uriString) : null;
-        linkMode = LinkModeImpl(type, uri);
-      }
-    } else {
-      // v1.1.0 and newer.
-      linkMode = LinkModeImpl.fromJson(as<Map<Object?, Object?>>(linkModeJson));
-    }
+    final linkMode =
+        LinkModeImpl.fromJson(as<Map<Object?, Object?>>(linkModeJson));
 
     final fileString = get<String?>(jsonMap, _fileKey);
     final Uri? file;
     if (fileString != null) {
       file = Uri(path: fileString);
-    } else if ((linkMode is DynamicLoadingBundledImpl ||
-            linkMode is StaticLinkingImpl) &&
-        jsonMap[_pathKey] != null) {
-      // Compatibility with v1.0.0.
-      final oldPath = as<String?>((jsonMap[_pathKey]
-          as Map<Object?, Object?>)[DynamicLoadingImpl._uriKey]);
-      file = oldPath != null ? Uri(path: oldPath) : null;
     } else {
       file = null;
     }
-    final targetString = get<String?>(jsonMap, _targetKey);
     final ArchitectureImpl? architecture;
-    final OSImpl os;
-    if (targetString != null) {
-      // Compatibility with v1.0.0.
-      final target = Target.fromString(targetString);
-      os = target.os;
-      architecture = target.architecture;
+    final os = OSImpl.fromString(get<String>(jsonMap, _osKey));
+    final architectureString = get<String?>(jsonMap, _architectureKey);
+    if (architectureString != null) {
+      architecture = ArchitectureImpl.fromString(architectureString);
     } else {
-      os = OSImpl.fromString(get<String>(jsonMap, _osKey));
-      final architectureString = get<String?>(jsonMap, _architectureKey);
-      if (architectureString != null) {
-        architecture = ArchitectureImpl.fromString(architectureString);
-      } else {
-        architecture = null;
-      }
+      architecture = null;
     }
 
     return NativeCodeAssetImpl(
@@ -346,29 +251,19 @@ final class NativeCodeAssetImpl implements NativeCodeAsset, AssetImpl {
       );
 
   @override
-  Map<String, Object> toJson(Version version) {
-    if (version == Version(1, 0, 0)) {
-      return {
+  Map<String, Object> toJson(Version version) => {
+        if (architecture != null) _architectureKey: architecture.toString(),
+        if (file != null) _fileKey: file!.toFilePath(),
         _idKey: id,
-        ...linkMode.toJsonV1_0_0(file),
-        _targetKey: Target.fromArchitectureAndOS(architecture!, os).toString(),
+        _linkModeKey: linkMode.toJson(),
+        _osKey: os.toString(),
+        typeKey: NativeCodeAsset.type,
       }..sortOnKey();
-    }
-    return {
-      if (architecture != null) _architectureKey: architecture.toString(),
-      if (file != null) _fileKey: file!.toFilePath(),
-      _idKey: id,
-      _linkModeKey: linkMode.toJson(),
-      _osKey: os.toString(),
-      typeKey: NativeCodeAsset.type,
-    }..sortOnKey();
-  }
 
   static const typeKey = 'type';
   static const _idKey = 'id';
   static const _linkModeKey = 'link_mode';
   static const _pathKey = 'path';
-  static const _targetKey = 'target';
   static const _fileKey = 'file';
   static const _osKey = 'os';
   static const _architectureKey = 'architecture';

pkgs/native_assets_cli/pubspec.yaml

@@ -4,7 +4,7 @@ description: >-
   native assets CLI.
 
 # Note: Bump BuildConfig.version and BuildOutput.version on breaking changes!
-version: 0.8.1-wip
+version: 0.9.0-wip
 repository: https://github.com/dart-lang/native/tree/main/pkgs/native_assets_cli
 
 topics:
@@ -13,7 +13,9 @@ topics:
   - native-assets
 
 environment:
-  sdk: '>=3.3.0 <4.0.0'
+  # Allow any pre-release version of 3.6.0 and onwards
+  # (i.e. 3.6.0-edge*, 3.6.0-dev*, 3.6.0-beta*, ...)
+  sdk: '>=3.6.0-0 <4.0.0'
 
 dependencies:
   args: ^2.4.2