Move stuff around

Author: rrousselGit

packages/custom_lint/lib/src/workspace.dart

@@ -9,6 +9,7 @@ import 'package:analyzer_plugin/protocol/protocol_generated.dart'
     as analyzer_plugin;
 import 'package:async/async.dart';
 import 'package:collection/collection.dart';
+import 'package:custom_lint_core/custom_lint_core.dart';
 import 'package:meta/meta.dart';
 import 'package:package_config/package_config.dart';
 import 'package:path/path.dart';
@@ -17,8 +18,6 @@ import 'package:pubspec_parse/pubspec_parse.dart';
 import 'package:rxdart/rxdart.dart';
 import 'package:yaml/yaml.dart';
 
-import 'package_utils.dart';
-
 /// Compute the constraint for a dependency which matches with all the constraints
 /// used in the workspace.
 String _buildDependencyConstraint(

packages/custom_lint/test/cli_process_test.dart

@@ -3,7 +3,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:custom_lint/src/output/output_format.dart';
-import 'package:custom_lint/src/package_utils.dart';
+import 'package:custom_lint_core/custom_lint_core.dart';
 import 'package:test/test.dart';
 import 'package:test_process/test_process.dart';
 

packages/custom_lint/test/error_report_test.dart

@@ -1,7 +1,7 @@
 import 'dart:convert';
 import 'dart:io';
 
-import 'package:custom_lint/src/package_utils.dart';
+import 'package:custom_lint_core/custom_lint_core.dart';
 import 'package:test/test.dart';
 
 import 'cli_process_test.dart';

packages/custom_lint/test/fixes_test.dart

@@ -1,6 +1,6 @@
 import 'dart:io';
 
-import 'package:custom_lint/src/package_utils.dart';
+import 'package:custom_lint_core/custom_lint_core.dart';
 import 'package:path/path.dart' as p;
 import 'package:test/test.dart';
 

packages/custom_lint/test/ignore_test.dart

@@ -2,7 +2,7 @@ import 'dart:io';
 
 import 'package:analyzer_plugin/protocol/protocol_common.dart';
 import 'package:analyzer_plugin/protocol/protocol_generated.dart';
-import 'package:custom_lint/src/package_utils.dart';
+import 'package:custom_lint_core/custom_lint_core.dart';
 import 'package:path/path.dart';
 import 'package:test/test.dart';
 

packages/custom_lint/test/src/workspace_test.dart

@@ -4,8 +4,8 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:analyzer_plugin/protocol/protocol_generated.dart';
-import 'package:custom_lint/src/package_utils.dart';
 import 'package:custom_lint/src/workspace.dart';
+import 'package:custom_lint_core/custom_lint_core.dart';
 import 'package:file/memory.dart';
 import 'package:package_config/package_config.dart';
 import 'package:path/path.dart' as p;

packages/custom_lint_builder/lib/src/client.dart

@@ -25,8 +25,6 @@ import 'package:collection/collection.dart';
 // ignore: implementation_imports
 import 'package:custom_lint/src/async_operation.dart';
 // ignore: implementation_imports
-import 'package:custom_lint/src/package_utils.dart';
-// ignore: implementation_imports
 import 'package:custom_lint/src/v2/protocol.dart';
 // ignore: implementation_imports
 import 'package:custom_lint_core/src/change_reporter.dart';

packages/custom_lint_core/lib/custom_lint_core.dart

@@ -6,6 +6,7 @@ export 'src/lint_codes.dart';
 export 'src/lint_rule.dart';
 export 'src/matcher.dart';
 export 'src/node_lint_visitor.dart' hide LintRegistry, LinterVisitor;
+export 'src/package_utils.dart' hide FindProjectError;
 export 'src/plugin_base.dart' hide runPostRunCallbacks;
 export 'src/resolver.dart' hide CustomLintResolverImpl;
 export 'src/source_range_extensions.dart';

packages/custom_lint/lib/src/package_utils.dart renamed to packages/custom_lint_core/lib/src/package_utils.dart

@@ -10,9 +10,6 @@ dependencies:
   analyzer: ">=5.12.0 <7.0.0"
   analyzer_plugin: ^0.11.0
   collection: ^1.16.0
-  # Using tight constraints as custom_lint_builder communicate with each-other
-  # using a specific contract
-  custom_lint: 0.6.2
   glob: ^2.1.2
   matcher: ^0.12.0
   meta: ^1.7.0