1.0.7 - morphy_annotation must now be in the dependencies and morphy …

…must be in the dev dependencies, cleaned this up

example/pubspec.yaml

@@ -3,19 +3,19 @@ name: example
 environment:
   sdk: ">=3.1.3 <4.0.0"
 
-#dependency_overrides:
-#  morphy_annotation:
-#    path: ../morphy_annotation
+dependency_overrides:
+  morphy_annotation:
+    path: ../morphy_annotation
 
 dependencies:
-  json_serializable: ^6.7.1
   meta: any
-  morphy:
-    path: ../morphy
-
-#  morphy: ^1.0.1
+  morphy_annotation:
+    path: ../morphy_annotation
 
 dev_dependencies:
+  morphy:
+    path: ../morphy
   build_runner: ^2.4.6
   test: ^1.24.8
+  json_serializable: ^6.3.2
 

example/test/ex11_generic_subclass_manual_test.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 import 'package:test/test.dart';
 
 // ignore_for_file: UNNECESSARY_CAST

example/test/ex11_generic_subclass_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex11_generic_subclass_test.morphy.dart';
 

example/test/ex12_generic_subclass_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex12_generic_subclass_test.morphy.dart';
 

example/test/ex13_copywith_test.dart

@@ -1,5 +1,5 @@
+import 'package:morphy_annotation/morphy_annotation.dart';
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
 
 part 'ex13_copywith_test.morphy.dart';
 

example/test/ex14_inheritance_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex14_inheritance_test.morphy.dart';
 

example/test/ex15_equality_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex15_equality_test.morphy.dart';
 

example/test/ex16_nofields_should_work.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex16_nofields_should_work.morphy.dart';
 

example/test/ex17_multiple_inheritance.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex17_multiple_inheritance.morphy.dart';
 

example/test/ex18_inheritance_generics.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex18_inheritance_generics.morphy.dart';
 

example/test/ex19_inheritance_generics.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex19_inheritance_generics.morphy.dart';
 

example/test/ex1_simple_test.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 import 'package:test/test.dart';
 
 part 'ex1_simple_test.morphy.dart';

example/test/ex20_inheritance_generics_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex20_inheritance_generics_test.morphy.dart';
 part 'ex20_inheritance_generics_test.morphy2.dart';

example/test/ex21_custom_constructors_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex21_custom_constructors_test.morphy.dart';
 

example/test/ex22_null_safety_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex22_null_safety_test.morphy.dart';
 

example/test/ex23_comments_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex23_comments_test.morphy.dart';
 

example/test/ex24_generics_fields_test.dart

@@ -1,7 +1,7 @@
 
 
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex24_generics_fields_test.morphy.dart';
 

example/test/ex25_class_build_order_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex25_class_build_order_test.morphy.dart';
 part 'ex25_class_build_order_test.morphy2.dart';

example/test/ex26_bug_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex26_bug_test.morphy.dart';
 

example/test/ex27_bug.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex27_bug.morphy.dart';
 

example/test/ex28_field_list_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex28_field_list_test.morphy.dart';
 

example/test/ex29_copywith_subclasses_manual.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 import 'package:test/test.dart';
 
 // ignore_for_file: UNNECESSARY_CAST

example/test/ex29_copywith_subclasses_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 // ignore_for_file: UNNECESSARY_CAST
 

example/test/ex2_generic_interfaces_manual_test.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 import 'package:test/test.dart';
 
 // ignore_for_file: UNNECESSARY_CAST

example/test/ex2_generic_interfaces_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex2_generic_interfaces_test.morphy.dart';
 

example/test/ex30_override_subclassproperty_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex30_override_subclassproperty_test.morphy.dart';
 

example/test/ex31_constant_constructor_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex31_constant_constructor_test.morphy.dart';
 

example/test/ex32_self_referencing_class_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 //SELF REFERENCING CLASS
 part 'ex32_self_referencing_class_test.morphy.dart';

example/test/ex33_list_equality_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex33_list_equality_test.morphy.dart';
 

example/test/ex34_list_equality_with_nulls_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex34_list_equality_with_nulls_test.morphy.dart';
 

example/test/ex35_function_parameters_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex35_function_parameters_test.morphy.dart';
 

example/test/ex36_create_subclass_from_super_manual_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 // COPY WITH FROM SUPER CLASS TO SUB CLASS
 

example/test/ex36_create_subclass_from_super_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 // COPY WITH FROM SUPER CLASS TO SUB CLASS
 

example/test/ex37_changeTo_siblings_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 // COPYTO FROM SUB CLASS TO A SIBLING SUB CLASS
 

example/test/ex38_cw_vs_copyTo_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 // COPYWITH & COPYTO SUBLIST IS A VALUET2 TYPE
 

example/test/ex39_copyTo_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 // COPY TO - FROM ABSTRACT SUPERCLASS TO SUB CLASS
 

example/test/ex3_inheritance_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex3_inheritance_test.morphy.dart';
 

example/test/ex40_bug_fixed_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 //STRANGE ERROR WHERE CAN'T PASS SUB CLASS
 

example/test/ex41_inheritance_generics.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex41_inheritance_generics.morphy.dart';
 

example/test/ex42_bug_fixed_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex42_bug_fixed_test.morphy.dart';
 

example/test/ex44_a_copy_super_to_sub_generic_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 // ignore_for_file: unnecessary_type_check
 

example/test/ex44_copy_super_to_sub_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex44_copy_super_to_sub_test.morphy.dart';
 

example/test/ex45_copyWithPolymorphic_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 // ignore_for_file: unnecessary_type_check
 

example/test/ex46_json_test.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: unnecessary_cast
 
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex46_json_test.g.dart';
 part 'ex46_json_test.morphy.dart';

example/test/ex47_json_inheritance_test.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: unnecessary_cast
 
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex47_json_inheritance_test.g.dart';
 part 'ex47_json_inheritance_test.morphy.dart';

example/test/ex48_json_with_subtype_test.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: unnecessary_cast
 
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex48_json_with_subtype_test.g.dart';
 part 'ex48_json_with_subtype_test.morphy.dart';

example/test/ex4_inheritance_test.dart

@@ -1,5 +1,5 @@
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex4_inheritance_test.morphy.dart';
 

example/test/ex50_json_inheritance_generic_test.dart

@@ -2,7 +2,7 @@
 // ignore_for_file: unused_element
 
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex50_json_inheritance_generic_test.g.dart';
 part 'ex50_json_inheritance_generic_test.morphy.dart';

example/test/ex51_json_inheritance_generic_from_test.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: unnecessary_cast
 
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex51_json_inheritance_generic_from_test.g.dart';
 part 'ex51_json_inheritance_generic_from_test.morphy.dart';

example/test/ex52_json_inheritance_generic_test.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: unnecessary_cast
 
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex52_json_inheritance_generic_test.g.dart';
 

example/test/ex53_abstract_json_test.dart

@@ -1,7 +1,7 @@
 // ignore_for_file: unnecessary_cast
 
 import 'package:test/test.dart';
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 
 part 'ex53_abstract_json_test.g.dart';
 

example/test/ex54_default_constructor_json_test.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 import 'package:test/test.dart';
 
 part 'ex54_default_constructor_json_test.g.dart';

example/test/ex55_sealed_class_test.dart

@@ -1,4 +1,4 @@
-import 'package:morphy/morphy.dart';
+import 'package:morphy_annotation/morphy_annotation.dart';
 import 'package:test/test.dart';
 
 part 'ex55_sealed_class_test.morphy.dart';