Revert "Native assets: roll deps" (#141748)

b/320767653

Reverts flutter/flutter#141684

packages/flutter_tools/lib/src/android/native_assets.dart

@@ -4,10 +4,8 @@
 
 import 'package:native_assets_builder/native_assets_builder.dart'
     show BuildResult, DryRunResult;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode;
-    hide BuildMode;
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    as native_assets_cli;
 
 import '../base/common.dart';
 import '../base/file_system.dart';

packages/flutter_tools/lib/src/build_system/targets/native_assets.dart

@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:meta/meta.dart';
-import 'package:native_assets_cli/native_assets_cli_internal.dart' show Asset;
+import 'package:native_assets_cli/native_assets_cli.dart' show Asset;
 import 'package:package_config/package_config_types.dart';
 
 import '../../android/gradle_utils.dart';

packages/flutter_tools/lib/src/ios/native_assets.dart

@@ -4,10 +4,8 @@
 
 import 'package:native_assets_builder/native_assets_builder.dart'
     show BuildResult, DryRunResult;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode;
-    hide BuildMode;
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    as native_assets_cli;
 
 import '../base/file_system.dart';
 import '../build_info.dart';

packages/flutter_tools/lib/src/linux/native_assets.dart

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode;
-    hide BuildMode;
 
 import '../base/common.dart';
 import '../base/file_system.dart';

packages/flutter_tools/lib/src/macos/native_assets.dart

@@ -4,10 +4,8 @@
 
 import 'package:native_assets_builder/native_assets_builder.dart'
     show BuildResult, DryRunResult;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode;
-    hide BuildMode;
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    as native_assets_cli;
 
 import '../base/file_system.dart';
 import '../build_info.dart';

packages/flutter_tools/lib/src/macos/native_assets_host.dart

@@ -4,8 +4,7 @@
 
 // Shared logic between iOS and macOS implementations of native assets.
 
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode;
-    hide BuildMode;
 
 import '../base/common.dart';
 import '../base/file_system.dart';

packages/flutter_tools/lib/src/native_assets.dart

@@ -7,7 +7,7 @@
 import 'package:logging/logging.dart' as logging;
 import 'package:native_assets_builder/native_assets_builder.dart' hide NativeAssetsBuildRunner;
 import 'package:native_assets_builder/native_assets_builder.dart' as native_assets_builder show NativeAssetsBuildRunner;
-import 'package:native_assets_cli/native_assets_cli_internal.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:package_config/package_config_types.dart';
 
 import 'android/native_assets.dart';

packages/flutter_tools/lib/src/windows/native_assets.dart

@@ -2,8 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode;
-    hide BuildMode;
 
 import '../base/file_system.dart';
 import '../build_info.dart';

packages/flutter_tools/pubspec.yaml

@@ -55,8 +55,8 @@ dependencies:
 
   cli_config: 0.1.2
   graphs: 2.3.1
-  native_assets_builder: 0.3.2
+  native_assets_builder: 0.3.0
-  native_assets_cli: 0.4.1
+  native_assets_cli: 0.3.2
 
   # We depend on very specific internal implementation details of the
   # 'test' package, which change between versions, so when upgrading
@@ -118,4 +118,4 @@ dartdoc:
   # Exclude this package from the hosted API docs.
   nodoc: true
 
-# PUBSPEC CHECKSUM: ba6a
+# PUBSPEC CHECKSUM: eb68

packages/flutter_tools/templates/package_ffi/pubspec.yaml.tmpl

@@ -9,8 +9,8 @@ environment:
 dependencies:
   cli_config: ^0.1.2
   logging: ^1.2.0
-  native_assets_cli: ^0.4.1
+  native_assets_cli: ^0.3.2
-  native_toolchain_c: ^0.3.4+1
+  native_toolchain_c: ^0.3.2
 
 dev_dependencies:
   ffi: ^2.1.0

packages/flutter_tools/test/general.shard/android/native_assets_test.dart

@@ -15,10 +15,8 @@ import 'package:flutter_tools/src/build_info.dart';
 import 'package:flutter_tools/src/build_system/build_system.dart';
 import 'package:flutter_tools/src/features.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-    as native_assets_cli;
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode, Target;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    hide BuildMode, Target;
 import 'package:package_config/package_config_types.dart';
 
 import '../../src/common.dart';

packages/flutter_tools/test/general.shard/build_system/targets/native_assets_test.dart

@@ -13,8 +13,7 @@ import 'package:flutter_tools/src/build_system/exceptions.dart';
 import 'package:flutter_tools/src/build_system/targets/native_assets.dart';
 import 'package:flutter_tools/src/features.dart';
 import 'package:flutter_tools/src/native_assets.dart';
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-    as native_assets_cli;
 import 'package:package_config/package_config.dart' show Package;
 
 import '../../../src/common.dart';

packages/flutter_tools/test/general.shard/fake_native_assets_build_runner.dart

@@ -5,7 +5,7 @@
 import 'package:flutter_tools/src/native_assets.dart';
 import 'package:native_assets_builder/native_assets_builder.dart'
     as native_assets_builder;
-import 'package:native_assets_cli/native_assets_cli_internal.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:package_config/package_config_types.dart';
 
 /// Mocks all logic instead of using `package:native_assets_builder`, which

packages/flutter_tools/test/general.shard/hot_test.dart

@@ -21,10 +21,8 @@ import 'package:flutter_tools/src/resident_devtools_handler.dart';
 import 'package:flutter_tools/src/resident_runner.dart';
 import 'package:flutter_tools/src/run_hot.dart';
 import 'package:flutter_tools/src/vmservice.dart';
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode, Target;
-    hide BuildMode, Target;
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    as native_assets_cli;
 import 'package:package_config/package_config.dart';
 import 'package:test/fake.dart';
 import 'package:unified_analytics/unified_analytics.dart';

packages/flutter_tools/test/general.shard/ios/native_assets_test.dart

@@ -14,10 +14,8 @@ import 'package:flutter_tools/src/build_system/build_system.dart';
 import 'package:flutter_tools/src/features.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
 import 'package:flutter_tools/src/ios/native_assets.dart';
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode, Target;
-    hide BuildMode, Target;
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    as native_assets_cli;
 import 'package:package_config/package_config_types.dart';
 
 import '../../src/common.dart';

packages/flutter_tools/test/general.shard/linux/native_assets_test.dart

@@ -17,10 +17,8 @@ import 'package:flutter_tools/src/features.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
 import 'package:flutter_tools/src/linux/native_assets.dart';
 import 'package:flutter_tools/src/native_assets.dart';
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode, Target;
-    hide BuildMode, Target;
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    as native_assets_cli;
 import 'package:package_config/package_config_types.dart';
 
 import '../../src/common.dart';

packages/flutter_tools/test/general.shard/macos/native_assets_test.dart

@@ -15,10 +15,8 @@ import 'package:flutter_tools/src/features.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
 import 'package:flutter_tools/src/macos/native_assets.dart';
 import 'package:flutter_tools/src/native_assets.dart';
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode, Target;
-    hide BuildMode, Target;
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    as native_assets_cli;
 import 'package:package_config/package_config_types.dart';
 
 import '../../src/common.dart';

packages/flutter_tools/test/general.shard/resident_runner_test.dart

@@ -36,10 +36,9 @@ import 'package:flutter_tools/src/run_cold.dart';
 import 'package:flutter_tools/src/run_hot.dart';
 import 'package:flutter_tools/src/version.dart';
 import 'package:flutter_tools/src/vmservice.dart';
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart'
     hide BuildMode, Target;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-    as native_assets_cli;
 import 'package:package_config/package_config.dart';
 import 'package:test/fake.dart';
 import 'package:unified_analytics/src/enums.dart';

packages/flutter_tools/test/general.shard/windows/native_assets_test.dart

@@ -16,10 +16,8 @@ import 'package:flutter_tools/src/features.dart';
 import 'package:flutter_tools/src/globals.dart' as globals;
 import 'package:flutter_tools/src/native_assets.dart';
 import 'package:flutter_tools/src/windows/native_assets.dart';
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
+import 'package:native_assets_cli/native_assets_cli.dart' hide BuildMode, Target;
-    hide BuildMode, Target;
+import 'package:native_assets_cli/native_assets_cli.dart' as native_assets_cli;
-import 'package:native_assets_cli/native_assets_cli_internal.dart'
-    as native_assets_cli;
 import 'package:package_config/package_config_types.dart';
 
 import '../../src/common.dart';

packages/flutter_tools/test/integration.shard/native_assets_test.dart

@@ -19,7 +19,7 @@ import 'package:file/file.dart';
 import 'package:file_testing/file_testing.dart';
 import 'package:flutter_tools/src/base/logger.dart';
 import 'package:flutter_tools/src/base/os.dart';
-import 'package:native_assets_cli/native_assets_cli_internal.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 import '../src/common.dart';
 import 'test_utils.dart' show ProcessResultMatcher, fileSystem, platform;
@@ -230,7 +230,7 @@ void main() {
         // Overrides the build to output static libraries.
         final String buildDotDartContentsNew = buildDotDartContents.replaceFirst(
           'final buildConfig = await BuildConfig.fromArgs(args);',
-          '''
+          r'''
   final buildConfig = await BuildConfig.fromArgs([
     '-D${LinkModePreference.configKey}=${LinkModePreference.static}',
     ...args,