Merge branch 'main' into deprecate-metadata

Author: dcharkes

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

@@ -62,7 +62,7 @@ abstract final class BuildOutput {
   ///
   /// In dry runs, the assets for all [Architecture]s for the [OS] specified in
   /// the dry run must be provided.
-  Map<String, List<Asset>> get assetsForLinking;
+  Map<String, Iterable<Asset>> get assetsForLinking;
 
   /// The files used by this build.
   ///

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

@@ -46,7 +46,7 @@ abstract class LinkConfig implements HookConfig {
     int? targetMacOSVersion,
     CCompilerConfig? cCompiler,
     BuildMode? buildMode,
-    List<String>? supportedAssetTypes,
+    Iterable<String>? supportedAssetTypes,
     int? targetAndroidNdkApi,
     required Iterable<Asset> assets,
     required LinkModePreference linkModePreference,
@@ -77,7 +77,7 @@ abstract class LinkConfig implements HookConfig {
     required String packageName,
     required Uri packageRoot,
     required OS targetOS,
-    List<String>? supportedAssetTypes,
+    Iterable<String>? supportedAssetTypes,
     required Iterable<Asset> assets,
     required LinkModePreference linkModePreference,
     Version? version,

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

@@ -54,7 +54,7 @@ abstract final class LinkOutput {
   void addAssets(Iterable<Asset> assets);
 
   factory LinkOutput({
-    List<AssetImpl>? assets,
+    Iterable<AssetImpl>? assets,
     Dependencies? dependencies,
     DateTime? timestamp,
   }) =>

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

@@ -29,12 +29,14 @@ final class HookOutputImpl implements BuildOutput, LinkOutput {
 
   HookOutputImpl({
     DateTime? timestamp,
-    List<AssetImpl>? assets,
+    Iterable<AssetImpl>? assets,
     Map<String, List<AssetImpl>>? assetsForLinking,
     Dependencies? dependencies,
     Metadata? metadata,
   })  : timestamp = (timestamp ?? DateTime.now()).roundDownToSeconds(),
-        _assets = assets ?? [],
+        _assets = [
+          ...?assets,
+        ],
         _assetsForLinking = assetsForLinking ?? {},
         // ignore: prefer_const_constructors
         _dependencies = dependencies ?? Dependencies([]),