From d0221758aa96589d710afc9e5065d820b0d25d9b Mon Sep 17 00:00:00 2001
From: Honza Bittner <git@tenhobi.dev>
Date: Mon, 27 Mar 2023 14:10:29 +0200
Subject: [PATCH] Fix pub.dev issues

---
 packages/auto_mappr/CHANGELOG.md                          | 4 ++++
 packages/auto_mappr/lib/builder.dart                      | 2 +-
 .../lib/{ => src}/builder/auto_mappr_builder.dart         | 6 +++---
 .../lib/{ => src}/builder/convert_method_builder.dart     | 6 +++---
 .../{ => src}/builder/map_model_body_method_builder.dart  | 8 ++++----
 .../lib/{ => src}/builder/value_assignment_builder.dart   | 8 ++++----
 .../lib/{ => src}/extensions/dart_object_extension.dart   | 2 +-
 .../lib/{ => src}/extensions/dart_type_extension.dart     | 0
 .../extensions/executable_element_extension.dart          | 0
 .../lib/{ => src}/extensions/expression_extension.dart    | 0
 .../lib/{ => src}/extensions/field_element_extension.dart | 0
 .../lib/{ => src}/extensions/reference_extension.dart     | 0
 .../lib/{ => src}/generator/auto_mappr_generator.dart     | 6 +++---
 .../lib/{ => src}/models/auto_mappr_config.dart           | 4 ++--
 .../auto_mappr/lib/{ => src}/models/field_mapping.dart    | 2 +-
 packages/auto_mappr/lib/{ => src}/models/models.dart      | 0
 .../lib/{ => src}/models/source_assignment.dart           | 4 ++--
 .../auto_mappr/lib/{ => src}/models/type_mapping.dart     | 4 ++--
 packages/auto_mappr/pubspec.yaml                          | 4 ++--
 .../test/builder/convert_method_builder_test.dart         | 6 +++---
 packages/auto_mappr_annotation/CHANGELOG.md               | 4 ++++
 packages/auto_mappr_annotation/pubspec.yaml               | 4 ++--
 22 files changed, 41 insertions(+), 33 deletions(-)
 rename packages/auto_mappr/lib/{ => src}/builder/auto_mappr_builder.dart (92%)
 rename packages/auto_mappr/lib/{ => src}/builder/convert_method_builder.dart (96%)
 rename packages/auto_mappr/lib/{ => src}/builder/map_model_body_method_builder.dart (97%)
 rename packages/auto_mappr/lib/{ => src}/builder/value_assignment_builder.dart (97%)
 rename packages/auto_mappr/lib/{ => src}/extensions/dart_object_extension.dart (97%)
 rename packages/auto_mappr/lib/{ => src}/extensions/dart_type_extension.dart (100%)
 rename packages/auto_mappr/lib/{ => src}/extensions/executable_element_extension.dart (100%)
 rename packages/auto_mappr/lib/{ => src}/extensions/expression_extension.dart (100%)
 rename packages/auto_mappr/lib/{ => src}/extensions/field_element_extension.dart (100%)
 rename packages/auto_mappr/lib/{ => src}/extensions/reference_extension.dart (100%)
 rename packages/auto_mappr/lib/{ => src}/generator/auto_mappr_generator.dart (94%)
 rename packages/auto_mappr/lib/{ => src}/models/auto_mappr_config.dart (78%)
 rename packages/auto_mappr/lib/{ => src}/models/field_mapping.dart (96%)
 rename packages/auto_mappr/lib/{ => src}/models/models.dart (100%)
 rename packages/auto_mappr/lib/{ => src}/models/source_assignment.dart (95%)
 rename packages/auto_mappr/lib/{ => src}/models/type_mapping.dart (93%)

diff --git a/packages/auto_mappr/CHANGELOG.md b/packages/auto_mappr/CHANGELOG.md
index 4b82a972..6b7e0968 100644
--- a/packages/auto_mappr/CHANGELOG.md
+++ b/packages/auto_mappr/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.1
+
+- Fix pub.dev issues.
+
 ## 1.0.0
 
 - Initial version.
diff --git a/packages/auto_mappr/lib/builder.dart b/packages/auto_mappr/lib/builder.dart
index bb21e239..3fe6b6d9 100644
--- a/packages/auto_mappr/lib/builder.dart
+++ b/packages/auto_mappr/lib/builder.dart
@@ -1,6 +1,6 @@
 //ignore_for_file: prefer-static-class
 
-import 'package:auto_mappr/generator/auto_mappr_generator.dart';
+import 'package:auto_mappr/src/generator/auto_mappr_generator.dart';
 import 'package:build/build.dart';
 import 'package:source_gen/source_gen.dart';
 
diff --git a/packages/auto_mappr/lib/builder/auto_mappr_builder.dart b/packages/auto_mappr/lib/src/builder/auto_mappr_builder.dart
similarity index 92%
rename from packages/auto_mappr/lib/builder/auto_mappr_builder.dart
rename to packages/auto_mappr/lib/src/builder/auto_mappr_builder.dart
index 687bdc59..d3e06735 100644
--- a/packages/auto_mappr/lib/builder/auto_mappr_builder.dart
+++ b/packages/auto_mappr/lib/src/builder/auto_mappr_builder.dart
@@ -2,9 +2,9 @@
 // ignore_for_file: format-comment
 
 import 'package:analyzer/dart/element/element.dart';
-import 'package:auto_mappr/builder/convert_method_builder.dart';
-import 'package:auto_mappr/builder/map_model_body_method_builder.dart';
-import 'package:auto_mappr/models/auto_mappr_config.dart';
+import 'package:auto_mappr/src/builder/convert_method_builder.dart';
+import 'package:auto_mappr/src/builder/map_model_body_method_builder.dart';
+import 'package:auto_mappr/src/models/auto_mappr_config.dart';
 import 'package:code_builder/code_builder.dart';
 
 class AutoMapprBuilder {
diff --git a/packages/auto_mappr/lib/builder/convert_method_builder.dart b/packages/auto_mappr/lib/src/builder/convert_method_builder.dart
similarity index 96%
rename from packages/auto_mappr/lib/builder/convert_method_builder.dart
rename to packages/auto_mappr/lib/src/builder/convert_method_builder.dart
index 675025b1..14f34812 100644
--- a/packages/auto_mappr/lib/builder/convert_method_builder.dart
+++ b/packages/auto_mappr/lib/src/builder/convert_method_builder.dart
@@ -1,7 +1,7 @@
 import 'package:analyzer/dart/element/type.dart';
-import 'package:auto_mappr/extensions/expression_extension.dart';
-import 'package:auto_mappr/models/auto_mappr_config.dart';
-import 'package:auto_mappr/models/type_mapping.dart';
+import 'package:auto_mappr/src/extensions/expression_extension.dart';
+import 'package:auto_mappr/src/models/auto_mappr_config.dart';
+import 'package:auto_mappr/src/models/type_mapping.dart';
 import 'package:code_builder/code_builder.dart';
 
 /// Builds main `convert` method
diff --git a/packages/auto_mappr/lib/builder/map_model_body_method_builder.dart b/packages/auto_mappr/lib/src/builder/map_model_body_method_builder.dart
similarity index 97%
rename from packages/auto_mappr/lib/builder/map_model_body_method_builder.dart
rename to packages/auto_mappr/lib/src/builder/map_model_body_method_builder.dart
index 0233c24d..2b681133 100644
--- a/packages/auto_mappr/lib/builder/map_model_body_method_builder.dart
+++ b/packages/auto_mappr/lib/src/builder/map_model_body_method_builder.dart
@@ -1,9 +1,9 @@
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/nullability_suffix.dart';
-import 'package:auto_mappr/builder/value_assignment_builder.dart';
-import 'package:auto_mappr/extensions/expression_extension.dart';
-import 'package:auto_mappr/extensions/field_element_extension.dart';
-import 'package:auto_mappr/models/models.dart';
+import 'package:auto_mappr/src/builder/value_assignment_builder.dart';
+import 'package:auto_mappr/src/extensions/expression_extension.dart';
+import 'package:auto_mappr/src/extensions/field_element_extension.dart';
+import 'package:auto_mappr/src/models/models.dart';
 import 'package:build/build.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:collection/collection.dart';
diff --git a/packages/auto_mappr/lib/builder/value_assignment_builder.dart b/packages/auto_mappr/lib/src/builder/value_assignment_builder.dart
similarity index 97%
rename from packages/auto_mappr/lib/builder/value_assignment_builder.dart
rename to packages/auto_mappr/lib/src/builder/value_assignment_builder.dart
index 64d4c298..b3933712 100644
--- a/packages/auto_mappr/lib/builder/value_assignment_builder.dart
+++ b/packages/auto_mappr/lib/src/builder/value_assignment_builder.dart
@@ -1,9 +1,9 @@
 import 'package:analyzer/dart/element/nullability_suffix.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:auto_mappr/builder/convert_method_builder.dart';
-import 'package:auto_mappr/extensions/dart_type_extension.dart';
-import 'package:auto_mappr/extensions/expression_extension.dart';
-import 'package:auto_mappr/models/models.dart';
+import 'package:auto_mappr/src/builder/convert_method_builder.dart';
+import 'package:auto_mappr/src/extensions/dart_type_extension.dart';
+import 'package:auto_mappr/src/extensions/expression_extension.dart';
+import 'package:auto_mappr/src/models/models.dart';
 import 'package:build/build.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:source_gen/source_gen.dart';
diff --git a/packages/auto_mappr/lib/extensions/dart_object_extension.dart b/packages/auto_mappr/lib/src/extensions/dart_object_extension.dart
similarity index 97%
rename from packages/auto_mappr/lib/extensions/dart_object_extension.dart
rename to packages/auto_mappr/lib/src/extensions/dart_object_extension.dart
index d2db0496..10c82322 100644
--- a/packages/auto_mappr/lib/extensions/dart_object_extension.dart
+++ b/packages/auto_mappr/lib/src/extensions/dart_object_extension.dart
@@ -1,7 +1,7 @@
 //ignore_for_file: no-object-declaration
 
 import 'package:analyzer/dart/constant/value.dart';
-import 'package:auto_mappr/extensions/executable_element_extension.dart';
+import 'package:auto_mappr/src/extensions/executable_element_extension.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:source_gen/source_gen.dart';
 
diff --git a/packages/auto_mappr/lib/extensions/dart_type_extension.dart b/packages/auto_mappr/lib/src/extensions/dart_type_extension.dart
similarity index 100%
rename from packages/auto_mappr/lib/extensions/dart_type_extension.dart
rename to packages/auto_mappr/lib/src/extensions/dart_type_extension.dart
diff --git a/packages/auto_mappr/lib/extensions/executable_element_extension.dart b/packages/auto_mappr/lib/src/extensions/executable_element_extension.dart
similarity index 100%
rename from packages/auto_mappr/lib/extensions/executable_element_extension.dart
rename to packages/auto_mappr/lib/src/extensions/executable_element_extension.dart
diff --git a/packages/auto_mappr/lib/extensions/expression_extension.dart b/packages/auto_mappr/lib/src/extensions/expression_extension.dart
similarity index 100%
rename from packages/auto_mappr/lib/extensions/expression_extension.dart
rename to packages/auto_mappr/lib/src/extensions/expression_extension.dart
diff --git a/packages/auto_mappr/lib/extensions/field_element_extension.dart b/packages/auto_mappr/lib/src/extensions/field_element_extension.dart
similarity index 100%
rename from packages/auto_mappr/lib/extensions/field_element_extension.dart
rename to packages/auto_mappr/lib/src/extensions/field_element_extension.dart
diff --git a/packages/auto_mappr/lib/extensions/reference_extension.dart b/packages/auto_mappr/lib/src/extensions/reference_extension.dart
similarity index 100%
rename from packages/auto_mappr/lib/extensions/reference_extension.dart
rename to packages/auto_mappr/lib/src/extensions/reference_extension.dart
diff --git a/packages/auto_mappr/lib/generator/auto_mappr_generator.dart b/packages/auto_mappr/lib/src/generator/auto_mappr_generator.dart
similarity index 94%
rename from packages/auto_mappr/lib/generator/auto_mappr_generator.dart
rename to packages/auto_mappr/lib/src/generator/auto_mappr_generator.dart
index 99ce3778..93b00fb0 100644
--- a/packages/auto_mappr/lib/generator/auto_mappr_generator.dart
+++ b/packages/auto_mappr/lib/src/generator/auto_mappr_generator.dart
@@ -2,9 +2,9 @@
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:auto_mappr/builder/auto_mappr_builder.dart';
-import 'package:auto_mappr/extensions/dart_object_extension.dart';
-import 'package:auto_mappr/models/models.dart';
+import 'package:auto_mappr/src/builder/auto_mappr_builder.dart';
+import 'package:auto_mappr/src/extensions/dart_object_extension.dart';
+import 'package:auto_mappr/src/models/models.dart';
 import 'package:auto_mappr_annotation/auto_mappr_annotation.dart';
 import 'package:build/build.dart';
 import 'package:code_builder/code_builder.dart';
diff --git a/packages/auto_mappr/lib/models/auto_mappr_config.dart b/packages/auto_mappr/lib/src/models/auto_mappr_config.dart
similarity index 78%
rename from packages/auto_mappr/lib/models/auto_mappr_config.dart
rename to packages/auto_mappr/lib/src/models/auto_mappr_config.dart
index be010b8d..9f8078e9 100644
--- a/packages/auto_mappr/lib/models/auto_mappr_config.dart
+++ b/packages/auto_mappr/lib/src/models/auto_mappr_config.dart
@@ -1,6 +1,6 @@
 import 'package:analyzer/dart/element/type.dart';
-import 'package:auto_mappr/extensions/dart_type_extension.dart';
-import 'package:auto_mappr/models/type_mapping.dart';
+import 'package:auto_mappr/src/extensions/dart_type_extension.dart';
+import 'package:auto_mappr/src/models/type_mapping.dart';
 import 'package:collection/collection.dart';
 
 class AutoMapprConfig {
diff --git a/packages/auto_mappr/lib/models/field_mapping.dart b/packages/auto_mappr/lib/src/models/field_mapping.dart
similarity index 96%
rename from packages/auto_mappr/lib/models/field_mapping.dart
rename to packages/auto_mappr/lib/src/models/field_mapping.dart
index 19784971..6d47d610 100644
--- a/packages/auto_mappr/lib/models/field_mapping.dart
+++ b/packages/auto_mappr/lib/src/models/field_mapping.dart
@@ -1,4 +1,4 @@
-import 'package:auto_mappr/models/source_assignment.dart';
+import 'package:auto_mappr/src/models/source_assignment.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:equatable/equatable.dart';
 import 'package:source_gen/source_gen.dart';
diff --git a/packages/auto_mappr/lib/models/models.dart b/packages/auto_mappr/lib/src/models/models.dart
similarity index 100%
rename from packages/auto_mappr/lib/models/models.dart
rename to packages/auto_mappr/lib/src/models/models.dart
diff --git a/packages/auto_mappr/lib/models/source_assignment.dart b/packages/auto_mappr/lib/src/models/source_assignment.dart
similarity index 95%
rename from packages/auto_mappr/lib/models/source_assignment.dart
rename to packages/auto_mappr/lib/src/models/source_assignment.dart
index 9d7076ed..797dc0cb 100644
--- a/packages/auto_mappr/lib/models/source_assignment.dart
+++ b/packages/auto_mappr/lib/src/models/source_assignment.dart
@@ -2,8 +2,8 @@
 
 import 'package:analyzer/dart/element/element.dart';
 import 'package:analyzer/dart/element/type.dart';
-import 'package:auto_mappr/extensions/dart_type_extension.dart';
-import 'package:auto_mappr/models/field_mapping.dart';
+import 'package:auto_mappr/src/extensions/dart_type_extension.dart';
+import 'package:auto_mappr/src/models/field_mapping.dart';
 import 'package:code_builder/code_builder.dart';
 
 class ConstructorAssignment {
diff --git a/packages/auto_mappr/lib/models/type_mapping.dart b/packages/auto_mappr/lib/src/models/type_mapping.dart
similarity index 93%
rename from packages/auto_mappr/lib/models/type_mapping.dart
rename to packages/auto_mappr/lib/src/models/type_mapping.dart
index daa4d588..d6515f3f 100644
--- a/packages/auto_mappr/lib/models/type_mapping.dart
+++ b/packages/auto_mappr/lib/src/models/type_mapping.dart
@@ -1,6 +1,6 @@
 import 'package:analyzer/dart/element/type.dart';
-import 'package:auto_mappr/builder/convert_method_builder.dart';
-import 'package:auto_mappr/models/field_mapping.dart';
+import 'package:auto_mappr/src/builder/convert_method_builder.dart';
+import 'package:auto_mappr/src/models/field_mapping.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:collection/collection.dart';
 import 'package:equatable/equatable.dart';
diff --git a/packages/auto_mappr/pubspec.yaml b/packages/auto_mappr/pubspec.yaml
index 9cc2f798..a8b72164 100644
--- a/packages/auto_mappr/pubspec.yaml
+++ b/packages/auto_mappr/pubspec.yaml
@@ -1,6 +1,6 @@
 name: auto_mappr
-description: Mapping between different objects with ease
-version: 1.0.0
+description: Code generation for mapping between different objects with ease.
+version: 1.0.1
 repository: https://github.com/netglade/auto_mappr
 issue_tracker: https://github.com/netglade/auto_mappr/issues
 
diff --git a/packages/auto_mappr/test/builder/convert_method_builder_test.dart b/packages/auto_mappr/test/builder/convert_method_builder_test.dart
index 1b69301f..28ba3f27 100644
--- a/packages/auto_mappr/test/builder/convert_method_builder_test.dart
+++ b/packages/auto_mappr/test/builder/convert_method_builder_test.dart
@@ -1,6 +1,6 @@
-import 'package:auto_mappr/builder/convert_method_builder.dart';
-import 'package:auto_mappr/extensions/reference_extension.dart';
-import 'package:auto_mappr/models/auto_mappr_config.dart';
+import 'package:auto_mappr/src/builder/convert_method_builder.dart';
+import 'package:auto_mappr/src/extensions/reference_extension.dart';
+import 'package:auto_mappr/src/models/auto_mappr_config.dart';
 import 'package:code_builder/code_builder.dart';
 import 'package:test/test.dart';
 
diff --git a/packages/auto_mappr_annotation/CHANGELOG.md b/packages/auto_mappr_annotation/CHANGELOG.md
index 4464e36d..b21cb56a 100644
--- a/packages/auto_mappr_annotation/CHANGELOG.md
+++ b/packages/auto_mappr_annotation/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.1
+
+- Fix pub.dev issues.
+
 ## 1.0.0
 
 - Initial version.
diff --git a/packages/auto_mappr_annotation/pubspec.yaml b/packages/auto_mappr_annotation/pubspec.yaml
index a4df44ae..f77ff14e 100644
--- a/packages/auto_mappr_annotation/pubspec.yaml
+++ b/packages/auto_mappr_annotation/pubspec.yaml
@@ -1,6 +1,6 @@
 name: auto_mappr_annotation
-description: Mapping between different objects with ease
-version: 1.0.0
+description: Annotations for the auto_mappr code-generator of mapping between objects with ease.
+version: 1.0.1
 repository: https://github.com/netglade/auto_mappr
 issue_tracker: https://github.com/netglade/auto_mappr/issues