[native_assets_cli] Remove all reexporting (#2237)

Author: dcharkes

pkgs/native_assets_builder/lib/native_assets_builder.dart

@@ -2,16 +2,13 @@
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
-export 'package:native_assets_builder/src/build_runner/build_runner.dart'
+export 'src/build_runner/build_runner.dart'
     show
         BuildInputCreator,
         LinkInputCreator,
         NativeAssetsBuildRunner,
         UserDefines;
-export 'package:native_assets_builder/src/model/build_result.dart'
-    show BuildResult;
-export 'package:native_assets_builder/src/model/kernel_assets.dart';
-export 'package:native_assets_builder/src/model/link_result.dart'
-    show LinkResult;
-export 'package:native_assets_builder/src/package_layout/package_layout.dart'
-    show PackageLayout;
+export 'src/model/build_result.dart' show BuildResult;
+export 'src/model/kernel_assets.dart';
+export 'src/model/link_result.dart' show LinkResult;
+export 'src/package_layout/package_layout.dart' show PackageLayout;

pkgs/native_assets_builder/lib/src/build_runner/build_runner.dart

@@ -9,6 +9,7 @@ import 'dart:io' show Platform;
 import 'package:file/file.dart';
 import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_assets_cli/native_assets_cli_builder.dart';
 import 'package:package_config/package_config.dart';
 import 'package:yaml/yaml.dart';

pkgs/native_assets_builder/lib/src/model/build_result.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. 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_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 /// The result of executing build hooks from all packages in the dependency tree
 /// of the entry point application.

pkgs/native_assets_builder/lib/src/model/hook_result.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:collection/collection.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_assets_cli/native_assets_cli_builder.dart';
 
 import '../../native_assets_builder.dart';

pkgs/native_assets_builder/lib/src/model/link_result.dart

@@ -2,7 +2,7 @@
 // for details. All rights reserved. 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_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 /// The result of executing the link hooks from all packages in the dependency
 /// tree of the entry point application.

pkgs/native_assets_builder/test/build_runner/build_runner_caching_test.dart

@@ -6,6 +6,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:native_assets_builder/src/build_runner/build_runner.dart';
+import 'package:native_assets_cli/code_assets.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/build_runner/build_runner_failure_test.dart

@@ -5,6 +5,7 @@
 import 'dart:io';
 
 import 'package:logging/logging.dart';
+import 'package:native_assets_cli/code_assets.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/build_runner/build_runner_reusability_test.dart

@@ -5,6 +5,8 @@
 import 'package:file/local.dart';
 import 'package:native_assets_builder/src/build_runner/build_runner.dart';
 import 'package:native_assets_builder/src/package_layout/package_layout.dart';
+import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/code_assets_builder.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/build_runner/concurrency_shared_test.dart

@@ -6,6 +6,7 @@ import 'dart:async';
 
 import 'package:native_assets_builder/src/utils/run_process.dart'
     show RunProcessResult;
+import 'package:native_assets_cli/native_assets_cli_builder.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/build_runner/concurrency_shared_test_helper.dart

@@ -5,6 +5,10 @@
 import 'package:file/local.dart';
 import 'package:logging/logging.dart';
 import 'package:native_assets_builder/native_assets_builder.dart';
+import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/code_assets_builder.dart';
+import 'package:native_assets_cli/data_assets_builder.dart';
+import 'package:native_assets_cli/native_assets_cli_builder.dart';
 
 import '../helpers.dart';
 

pkgs/native_assets_builder/test/build_runner/concurrency_test_helper.dart

@@ -5,6 +5,9 @@
 import 'package:file/local.dart';
 import 'package:logging/logging.dart';
 import 'package:native_assets_builder/native_assets_builder.dart';
+import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/code_assets_builder.dart';
+import 'package:native_assets_cli/data_assets_builder.dart';
 
 import '../helpers.dart';
 import 'helpers.dart';

pkgs/native_assets_builder/test/build_runner/fail_on_os_sdk_version_test.dart

@@ -3,6 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:logging/logging.dart';
+import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli_builder.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/build_runner/helpers.dart

@@ -8,6 +8,10 @@ import 'dart:io';
 import 'package:file/local.dart';
 import 'package:logging/logging.dart';
 import 'package:native_assets_builder/native_assets_builder.dart';
+import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/code_assets_builder.dart';
+import 'package:native_assets_cli/data_assets_builder.dart';
+import 'package:native_assets_cli/native_assets_cli_builder.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/build_runner/link_test.dart

@@ -4,6 +4,9 @@
 
 import 'dart:io';
 
+import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart' hide build, link;
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/build_runner/packaging_preference_test.dart

@@ -2,6 +2,7 @@
 // for details. All rights reserved. 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/code_assets.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/helpers.dart

@@ -15,10 +15,6 @@ import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 import 'package:yaml/yaml.dart';
 
-export 'package:native_assets_cli/code_assets_builder.dart';
-export 'package:native_assets_cli/data_assets_builder.dart';
-export 'package:native_assets_cli/native_assets_cli_builder.dart';
-
 extension UriExtension on Uri {
   String get name => pathSegments.where((e) => e != '').last;
 

pkgs/native_assets_builder/test/test_data/native_dynamic_linking_test.dart

@@ -8,6 +8,10 @@ library;
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/code_assets_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
+import 'package:native_assets_cli/native_assets_cli_builder.dart';
 import 'package:test/test.dart';
 
 import '../build_runner/helpers.dart';

pkgs/native_assets_builder/test/test_data/transformer_test.dart

@@ -8,6 +8,11 @@ library;
 import 'dart:convert';
 import 'dart:io';
 
+import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/code_assets_builder.dart';
+import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/data_assets_builder.dart';
+import 'package:native_assets_cli/native_assets_cli_builder.dart';
 import 'package:test/test.dart';
 
 import '../build_runner/helpers.dart';

pkgs/native_assets_builder/test/test_data/user_defines_test.dart

@@ -10,6 +10,7 @@ import 'dart:io';
 import 'package:file_testing/file_testing.dart';
 import 'package:native_assets_builder/native_assets_builder.dart';
 import 'package:native_assets_builder/src/build_runner/build_runner.dart';
+import 'package:native_assets_cli/data_assets.dart';
 import 'package:test/test.dart';
 
 import '../build_runner/helpers.dart';

pkgs/native_assets_builder/test_data/add_asset_link/hook/build.dart

@@ -4,6 +4,7 @@
 
 import 'package:logging/logging.dart';
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_toolchain_c/native_toolchain_c.dart';
 
 void main(List<String> arguments) async {

pkgs/native_assets_builder/test_data/add_asset_link/hook/link.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> arguments) async {
   await link(arguments, (input, output) async {

pkgs/native_assets_builder/test_data/complex_link/hook/build.dart

@@ -5,6 +5,7 @@
 import 'dart:io';
 
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> args) async {
   await build(args, (input, output) async {

pkgs/native_assets_builder/test_data/complex_link/hook/link.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> args) async {
   await link(

pkgs/native_assets_builder/test_data/complex_link_helper/hook/build.dart

@@ -5,6 +5,7 @@
 import 'dart:io';
 
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> args) async {
   await build(args, (input, output) async {

pkgs/native_assets_builder/test_data/depend_on_fail_build/hook/build.dart

@@ -3,7 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:fail_build/fail_build.dart';
-import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> arguments) async {
   await build(arguments, (input, output) async {

pkgs/native_assets_builder/test_data/drop_dylib_link/hook/build.dart

@@ -4,6 +4,7 @@
 
 import 'package:logging/logging.dart';
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_toolchain_c/native_toolchain_c.dart';
 
 void main(List<String> arguments) async {

pkgs/native_assets_builder/test_data/drop_dylib_link/hook/link.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> arguments) async {
   await link(arguments, (input, output) async {

pkgs/native_assets_builder/test_data/fail_on_os_sdk_version/hook/build.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 // Simulate needing some version of the API.
 //

pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_link/hook/build.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> arguments) async {
   await build(arguments, (input, output) async {

pkgs/native_assets_builder/test_data/fail_on_os_sdk_version_linker/hook/link.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 // Simulate needing some version of the API.
 //

pkgs/native_assets_builder/test_data/native_add_duplicate/hook/build.dart

@@ -5,6 +5,8 @@
 import 'package:logging/logging.dart';
 import 'package:native_assets_cli/code_assets.dart';
 import 'package:native_assets_cli/code_assets_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
+import 'package:native_assets_cli/native_assets_cli_builder.dart';
 import 'package:native_toolchain_c/native_toolchain_c.dart';
 
 void main(List<String> arguments) async {

pkgs/native_assets_builder/test_data/native_add_duplicate/hook/link.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> args) async {
   await link(args, (input, output) async {

pkgs/native_assets_builder/test_data/no_asset_for_link/hook/link.dart

@@ -4,6 +4,7 @@
 
 import 'package:native_assets_cli/code_assets.dart';
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> arguments) async {
   await link(arguments, (input, output) async {

pkgs/native_assets_builder/test_data/relative_path/hook/build.dart

@@ -5,6 +5,7 @@
 import 'dart:io';
 
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> args) async {
   await build(args, (input, output) async {

pkgs/native_assets_builder/test_data/reusable_dynamic_library/lib/hook.dart

@@ -9,6 +9,7 @@ library;
 import 'dart:io';
 
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_toolchain_c/native_toolchain_c.dart';
 
 /// Helper class for populating a [CBuilder.library] call with the fields of

pkgs/native_assets_builder/test_data/simple_data_asset/hook/build.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> args) async {
   await build(args, (input, output) async {

pkgs/native_assets_builder/test_data/simple_link/hook/build.dart

@@ -5,6 +5,7 @@
 import 'dart:io';
 
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> args) async {
   await build(args, (input, output) async {

pkgs/native_assets_builder/test_data/simple_link/hook/link.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> args) async {
   await link(args, (input, output) async {

pkgs/native_assets_builder/test_data/system_library/hook/build.dart

@@ -3,6 +3,7 @@
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> arguments) async {
   await build(arguments, (input, output) async {

pkgs/native_assets_builder/test_data/transformer/hook/build.dart

@@ -7,6 +7,7 @@ import 'dart:io';
 
 import 'package:crypto/crypto.dart';
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:transformer/src/transform.dart';
 
 void main(List<String> arguments) async {

pkgs/native_assets_builder/test_data/treeshaking_native_libs/hook/build.dart

@@ -4,6 +4,7 @@
 
 import 'package:logging/logging.dart';
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_toolchain_c/native_toolchain_c.dart';
 
 void main(List<String> arguments) async {

pkgs/native_assets_builder/test_data/treeshaking_native_libs/hook/link.dart

@@ -4,6 +4,7 @@
 
 import 'package:logging/logging.dart';
 import 'package:native_assets_cli/code_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:native_toolchain_c/native_toolchain_c.dart';
 
 void main(List<String> arguments) async {

pkgs/native_assets_builder/test_data/use_all_api/hook/build.dart

@@ -6,6 +6,7 @@
 
 import 'package:native_assets_cli/code_assets.dart';
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> args) async {
   await build(args, (input, output) async {

pkgs/native_assets_builder/test_data/use_all_api/hook/link.dart

@@ -6,6 +6,7 @@
 
 import 'package:native_assets_cli/code_assets.dart';
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> args) async {
   await link(args, (input, output) async {

pkgs/native_assets_builder/test_data/user_defines/hook/build.dart

@@ -6,6 +6,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 void main(List<String> arguments) async {
   await build(arguments, (input, output) async {