[native_assets_cli] Simplify library structure

Author: dcharkes

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

@@ -10,7 +10,6 @@ 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/hook_result.dart

@@ -4,7 +4,6 @@
 
 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 '../build_runner/build_runner.dart';
 import 'build_result.dart';

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

@@ -14,7 +14,7 @@
 /// Dart SDK.
 library;
 
-import 'package:native_assets_cli/native_assets_cli_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 import '../utils/yaml.dart';
 

pkgs/native_assets_builder/test/build_runner/build_runner_reusability_test.dart

@@ -6,7 +6,6 @@ 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,7 +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:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/build_runner/concurrency_shared_test_helper.dart

@@ -6,9 +6,8 @@ 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:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 
 import '../helpers.dart';
 

pkgs/native_assets_builder/test/build_runner/concurrency_test_helper.dart

@@ -6,8 +6,7 @@ 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/data_assets.dart';
 
 import '../helpers.dart';
 import 'helpers.dart';

pkgs/native_assets_builder/test/build_runner/fail_on_os_sdk_version_test.dart

@@ -4,7 +4,7 @@
 
 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:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/build_runner/helpers.dart

@@ -9,9 +9,8 @@ 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:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_builder/test/model/kernel_assets_test.dart

@@ -5,7 +5,7 @@
 // ignore_for_file: undefined_hidden_name
 
 import 'package:native_assets_builder/src/model/kernel_assets.dart';
-import 'package:native_assets_cli/native_assets_cli_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 void main() {

pkgs/native_assets_builder/test/test_data/native_dynamic_linking_test.dart

@@ -9,8 +9,7 @@ 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_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 import '../build_runner/helpers.dart';

pkgs/native_assets_builder/test/test_data/transformer_test.dart

@@ -9,10 +9,8 @@ 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:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 import '../build_runner/helpers.dart';

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

@@ -4,7 +4,6 @@
 
 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_toolchain_c/native_toolchain_c.dart';
 

pkgs/native_assets_cli/example/build/download_asset/tool/build.dart

@@ -8,9 +8,7 @@ import 'package:args/args.dart';
 import 'package:download_asset/src/hook_helpers/c_build.dart';
 import 'package:download_asset/src/hook_helpers/target_versions.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';
 
 void main(List<String> args) async {
   final (os: os, architecture: architecture, iOSSdk: iOSSdk) = parseArguments(

pkgs/native_assets_cli/example/build/local_asset/test/build_test.dart

@@ -5,8 +5,7 @@
 import 'dart:io';
 
 import 'package:file_testing/file_testing.dart';
-import 'package:native_assets_cli/code_assets_builder.dart';
-import 'package:native_assets_cli/code_assets_testing.dart';
+import 'package:native_assets_cli/code_assets.dart';
 import 'package:test/test.dart';
 
 import '../hook/build.dart' as build;

pkgs/native_assets_cli/lib/code_assets.dart

@@ -22,6 +22,9 @@ export 'src/code_assets/config.dart'
         CodeConfig,
         IOSCodeConfig,
         MacOSCodeConfig;
+export 'src/code_assets/config.dart'
+    show CodeAssetBuildOutput, CodeAssetLinkOutput;
+export 'src/code_assets/extension.dart';
 export 'src/code_assets/ios_sdk.dart' show IOSSdk;
 export 'src/code_assets/link_mode.dart'
     show
@@ -33,3 +36,4 @@ export 'src/code_assets/link_mode.dart'
         StaticLinking;
 export 'src/code_assets/link_mode_preference.dart' show LinkModePreference;
 export 'src/code_assets/os.dart' show OS;
+export 'src/code_assets/testing.dart' show testCodeBuildHook;

pkgs/native_assets_cli/lib/code_assets_builder.dart

@@ -14,4 +14,7 @@ export 'src/data_assets/config.dart'
         DataAssetLinkInput,
         DataAssetLinkOutputBuilder,
         DataAssetLinkOutputBuilderAdd;
+export 'src/data_assets/config.dart'
+    show DataAssetBuildInputBuilder, DataAssetBuildOutput, DataAssetLinkOutput;
 export 'src/data_assets/data_asset.dart' show DataAsset, EncodedDataAsset;
+export 'src/data_assets/extension.dart';

pkgs/native_assets_cli/lib/code_assets_testing.dart

@@ -28,5 +28,26 @@ export 'src/config.dart'
         ToAppBundle,
         ToBuildHooks,
         ToLinkHook;
+export 'src/config.dart'
+    show
+        BuildConfigBuilderSetup,
+        BuildInputBuilder,
+        BuildOutput,
+        HookInputBuilder,
+        HookOutput,
+        LinkInputBuilder,
+        LinkOutput;
 export 'src/encoded_asset.dart' show EncodedAsset;
+export 'src/extension.dart';
 export 'src/metadata.dart' show Metadata;
+export 'src/model/dependencies.dart';
+export 'src/target.dart' show Target;
+export 'src/test.dart';
+export 'src/user_defines.dart'
+    show PackageUserDefines, PackageUserDefinesSource;
+export 'src/validation.dart'
+    show
+        validateBuildInput,
+        validateBuildOutput,
+        validateLinkInput,
+        validateLinkOutput;

pkgs/native_assets_cli/lib/data_assets.dart

@@ -7,7 +7,6 @@ import 'dart:io';
 
 import 'package:file_testing/file_testing.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';
 
 void main() async {

pkgs/native_assets_cli/lib/data_assets_builder.dart

@@ -6,7 +6,6 @@ import 'dart:convert';
 import 'dart:io';
 
 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 'helpers.dart';

pkgs/native_assets_cli/lib/native_assets_cli.dart

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

pkgs/native_assets_cli/lib/native_assets_cli_builder.dart

@@ -3,9 +3,8 @@
 // BSD-style license that can be found in the LICENSE file.
 
 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:native_assets_cli/data_assets.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 import 'helpers.dart';

pkgs/native_assets_cli/lib/native_assets_cli_testing.dart

@@ -5,9 +5,7 @@
 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:native_assets_cli/src/code_assets/code_asset.dart';
 import 'package:test/test.dart';
 

pkgs/native_assets_cli/test/api/build_test.dart

@@ -5,9 +5,7 @@
 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:native_assets_cli/src/code_assets/validation.dart';
 import 'package:test/test.dart';
 

pkgs/native_assets_cli/test/build_input_test.dart

@@ -5,9 +5,7 @@
 import 'dart:io';
 
 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.dart';
-import 'package:native_assets_cli/native_assets_cli_builder.dart';
 import 'package:native_assets_cli/src/data_assets/validation.dart';
 import 'package:test/test.dart';
 

pkgs/native_assets_cli/test/build_output_test.dart

@@ -9,8 +9,7 @@ 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_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_cli/test/checksum_test.dart

@@ -13,8 +13,7 @@ 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_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 import '../helpers.dart';

pkgs/native_assets_cli/test/code_assets/config_test.dart

@@ -6,7 +6,6 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:native_assets_cli/native_assets_cli.dart';
-import 'package:native_assets_cli/native_assets_cli_builder.dart';
 import 'package:test/test.dart';
 
 void main() async {

pkgs/native_assets_cli/test/code_assets/validation_test.dart

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

pkgs/native_assets_cli/test/data_assets/validation_test.dart

@@ -4,7 +4,7 @@
 
 import 'dart:io';
 
-import 'package:native_assets_cli/native_assets_cli_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 void main() {

pkgs/native_assets_cli/test/example/native_add_library_test.dart

@@ -6,7 +6,7 @@ import 'dart:ffi';
 import 'dart:io';
 
 import 'package:native_assets_cli/code_assets.dart';
-import 'package:native_assets_cli/native_assets_cli_builder.dart';
+import 'package:native_assets_cli/native_assets_cli.dart';
 import 'package:test/test.dart';
 
 void main() {

pkgs/native_assets_cli/test/example/native_dynamic_linking_test.dart

@@ -5,7 +5,6 @@
 import 'dart:io';
 
 import 'package:native_assets_cli/native_assets_cli.dart';
-import 'package:native_assets_cli/native_assets_cli_builder.dart';
 import 'package:test/test.dart';
 
 void main() {

pkgs/native_assets_cli/test/link_input_test.dart

@@ -8,7 +8,6 @@ import 'package:logging/logging.dart';
 import 'package:meta/meta.dart';
 import 'package:native_assets_cli/code_assets.dart';
 import 'package:native_assets_cli/native_assets_cli.dart';
-import 'package:native_assets_cli/native_assets_cli_builder.dart';
 
 import 'build_mode.dart';
 import 'ctool.dart';