From d3d4e5483a22aa14424233b94706825c723a406e Mon Sep 17 00:00:00 2001 From: Michel Davit Date: Sun, 7 Jan 2024 16:45:14 +0100 Subject: [PATCH 1/2] Use standard project structure --- build.sbt | 9 +++------ {src/core => core/src/main/scala}/impl.scala | 0 {src/core => core/src/main/scala}/interface.scala | 0 {src/core => core/src/main/scala}/macro.scala | 0 {src/core => core/src/main/scala}/magnolia.scala | 0 {src/core => core/src/main/scala}/monadic.scala | 0 .../src/main/scala}/JavaAnnotatedCase.scala | 0 .../src/main/scala}/SubtypeInfo.scala | 0 {src/examples => examples/src/main/scala}/csv.scala | 0 {src/examples => examples/src/main/scala}/decode.scala | 0 .../src/main/scala}/decodeSafe.scala | 0 {src/examples => examples/src/main/scala}/default.scala | 0 {src/examples => examples/src/main/scala}/eq.scala | 0 {src/examples => examples/src/main/scala}/exported.scala | 0 {src/examples => examples/src/main/scala}/hash.scala | 0 .../examples => examples/src/main/scala}/nocombine.scala | 0 .../src/main/scala}/passthrough.scala | 0 {src/examples => examples/src/main/scala}/patch.scala | 0 {src/examples => examples/src/main/scala}/print.scala | 0 .../src/main/scala}/printRepeated.scala | 0 {src/examples => examples/src/main/scala}/semiauto.scala | 0 .../src/main/scala}/semidefault.scala | 0 {src/examples => examples/src/main/scala}/show.scala | 0 {src/examples => examples/src/main/scala}/typename.scala | 0 src/test/WeekDay.java | 5 ----- {src/test => test/src/test/scala}/AnnotationsTests.scala | 0 .../src/test/scala}/DefaultValuesTests.scala | 0 .../src/test/scala}/JavaExampleAnnotation.java | 0 {src/test => test/src/test/scala}/ModifiersTests.scala | 0 {src/test => test/src/test/scala}/OtherTests.scala | 0 {src/test => test/src/test/scala}/ProductsTests.scala | 0 .../src/test/scala}/RecursiveTypesTests.scala | 0 {src/test => test/src/test/scala}/ScopesTests.scala | 0 {src/test => test/src/test/scala}/SumsTests.scala | 0 {src/test => test/src/test/scala}/TypeAliasesTests.scala | 0 .../test => test/src/test/scala}/ValueClassesTests.scala | 0 {src/test => test/src/test/scala}/VarianceTests.scala | 0 .../magnolia/tests => test/src/test/scala}/WeekDay.java | 0 38 files changed, 3 insertions(+), 11 deletions(-) rename {src/core => core/src/main/scala}/impl.scala (100%) rename {src/core => core/src/main/scala}/interface.scala (100%) rename {src/core => core/src/main/scala}/macro.scala (100%) rename {src/core => core/src/main/scala}/magnolia.scala (100%) rename {src/core => core/src/main/scala}/monadic.scala (100%) rename {src/examples => examples/src/main/scala}/JavaAnnotatedCase.scala (100%) rename {src/examples => examples/src/main/scala}/SubtypeInfo.scala (100%) rename {src/examples => examples/src/main/scala}/csv.scala (100%) rename {src/examples => examples/src/main/scala}/decode.scala (100%) rename {src/examples => examples/src/main/scala}/decodeSafe.scala (100%) rename {src/examples => examples/src/main/scala}/default.scala (100%) rename {src/examples => examples/src/main/scala}/eq.scala (100%) rename {src/examples => examples/src/main/scala}/exported.scala (100%) rename {src/examples => examples/src/main/scala}/hash.scala (100%) rename {src/examples => examples/src/main/scala}/nocombine.scala (100%) rename {src/examples => examples/src/main/scala}/passthrough.scala (100%) rename {src/examples => examples/src/main/scala}/patch.scala (100%) rename {src/examples => examples/src/main/scala}/print.scala (100%) rename {src/examples => examples/src/main/scala}/printRepeated.scala (100%) rename {src/examples => examples/src/main/scala}/semiauto.scala (100%) rename {src/examples => examples/src/main/scala}/semidefault.scala (100%) rename {src/examples => examples/src/main/scala}/show.scala (100%) rename {src/examples => examples/src/main/scala}/typename.scala (100%) delete mode 100644 src/test/WeekDay.java rename {src/test => test/src/test/scala}/AnnotationsTests.scala (100%) rename {src/test => test/src/test/scala}/DefaultValuesTests.scala (100%) rename {src/test => test/src/test/scala}/JavaExampleAnnotation.java (100%) rename {src/test => test/src/test/scala}/ModifiersTests.scala (100%) rename {src/test => test/src/test/scala}/OtherTests.scala (100%) rename {src/test => test/src/test/scala}/ProductsTests.scala (100%) rename {src/test => test/src/test/scala}/RecursiveTypesTests.scala (100%) rename {src/test => test/src/test/scala}/ScopesTests.scala (100%) rename {src/test => test/src/test/scala}/SumsTests.scala (100%) rename {src/test => test/src/test/scala}/TypeAliasesTests.scala (100%) rename {src/test => test/src/test/scala}/ValueClassesTests.scala (100%) rename {src/test => test/src/test/scala}/VarianceTests.scala (100%) rename {src/test-enum/magnolia/tests => test/src/test/scala}/WeekDay.java (100%) diff --git a/build.sbt b/build.sbt index 462ccfc3..39d24e6c 100644 --- a/build.sbt +++ b/build.sbt @@ -27,11 +27,10 @@ lazy val root = (core.projectRefs ++ examples.projectRefs ++ test.projectRefs): _* ) -lazy val core = (projectMatrix in file(".core")) +lazy val core = (projectMatrix in file("core")) .settings(commonSettings) .settings( name := "magnolia", - Compile / scalaSource := baseDirectory.value / ".." / ".." / ".." / "src" / "core", mimaPreviousArtifacts := { val current = version.value val isRcOrMilestone = current.contains("M") || current.contains("RC") @@ -56,19 +55,18 @@ lazy val core = (projectMatrix in file(".core")) .jsPlatform(scalaVersions = List(scala3)) .nativePlatform(scalaVersions = List(scala3)) -lazy val examples = (projectMatrix in file(".examples")) +lazy val examples = (projectMatrix in file("examples")) .dependsOn(core) .settings(commonSettings) .settings( name := "magnolia-examples", - Compile / scalaSource := baseDirectory.value / ".." / ".." / ".." / "src" / "examples", publishArtifact := false ) .jvmPlatform(scalaVersions = List(scala3)) .jsPlatform(scalaVersions = List(scala3)) .nativePlatform(scalaVersions = List(scala3)) -lazy val test = (projectMatrix in file(".test")) +lazy val test = (projectMatrix in file("test")) .dependsOn(examples) .settings(commonSettings) .settings( @@ -78,7 +76,6 @@ lazy val test = (projectMatrix in file(".test")) "org.scalameta" %%% "munit" % "1.0.0-M6" ), testFrameworks += new TestFramework("munit.Framework"), - Test / scalaSource := baseDirectory.value / ".." / ".." / ".." / "src" / "test", publishArtifact := false ) .jvmPlatform(scalaVersions = List(scala3)) diff --git a/src/core/impl.scala b/core/src/main/scala/impl.scala similarity index 100% rename from src/core/impl.scala rename to core/src/main/scala/impl.scala diff --git a/src/core/interface.scala b/core/src/main/scala/interface.scala similarity index 100% rename from src/core/interface.scala rename to core/src/main/scala/interface.scala diff --git a/src/core/macro.scala b/core/src/main/scala/macro.scala similarity index 100% rename from src/core/macro.scala rename to core/src/main/scala/macro.scala diff --git a/src/core/magnolia.scala b/core/src/main/scala/magnolia.scala similarity index 100% rename from src/core/magnolia.scala rename to core/src/main/scala/magnolia.scala diff --git a/src/core/monadic.scala b/core/src/main/scala/monadic.scala similarity index 100% rename from src/core/monadic.scala rename to core/src/main/scala/monadic.scala diff --git a/src/examples/JavaAnnotatedCase.scala b/examples/src/main/scala/JavaAnnotatedCase.scala similarity index 100% rename from src/examples/JavaAnnotatedCase.scala rename to examples/src/main/scala/JavaAnnotatedCase.scala diff --git a/src/examples/SubtypeInfo.scala b/examples/src/main/scala/SubtypeInfo.scala similarity index 100% rename from src/examples/SubtypeInfo.scala rename to examples/src/main/scala/SubtypeInfo.scala diff --git a/src/examples/csv.scala b/examples/src/main/scala/csv.scala similarity index 100% rename from src/examples/csv.scala rename to examples/src/main/scala/csv.scala diff --git a/src/examples/decode.scala b/examples/src/main/scala/decode.scala similarity index 100% rename from src/examples/decode.scala rename to examples/src/main/scala/decode.scala diff --git a/src/examples/decodeSafe.scala b/examples/src/main/scala/decodeSafe.scala similarity index 100% rename from src/examples/decodeSafe.scala rename to examples/src/main/scala/decodeSafe.scala diff --git a/src/examples/default.scala b/examples/src/main/scala/default.scala similarity index 100% rename from src/examples/default.scala rename to examples/src/main/scala/default.scala diff --git a/src/examples/eq.scala b/examples/src/main/scala/eq.scala similarity index 100% rename from src/examples/eq.scala rename to examples/src/main/scala/eq.scala diff --git a/src/examples/exported.scala b/examples/src/main/scala/exported.scala similarity index 100% rename from src/examples/exported.scala rename to examples/src/main/scala/exported.scala diff --git a/src/examples/hash.scala b/examples/src/main/scala/hash.scala similarity index 100% rename from src/examples/hash.scala rename to examples/src/main/scala/hash.scala diff --git a/src/examples/nocombine.scala b/examples/src/main/scala/nocombine.scala similarity index 100% rename from src/examples/nocombine.scala rename to examples/src/main/scala/nocombine.scala diff --git a/src/examples/passthrough.scala b/examples/src/main/scala/passthrough.scala similarity index 100% rename from src/examples/passthrough.scala rename to examples/src/main/scala/passthrough.scala diff --git a/src/examples/patch.scala b/examples/src/main/scala/patch.scala similarity index 100% rename from src/examples/patch.scala rename to examples/src/main/scala/patch.scala diff --git a/src/examples/print.scala b/examples/src/main/scala/print.scala similarity index 100% rename from src/examples/print.scala rename to examples/src/main/scala/print.scala diff --git a/src/examples/printRepeated.scala b/examples/src/main/scala/printRepeated.scala similarity index 100% rename from src/examples/printRepeated.scala rename to examples/src/main/scala/printRepeated.scala diff --git a/src/examples/semiauto.scala b/examples/src/main/scala/semiauto.scala similarity index 100% rename from src/examples/semiauto.scala rename to examples/src/main/scala/semiauto.scala diff --git a/src/examples/semidefault.scala b/examples/src/main/scala/semidefault.scala similarity index 100% rename from src/examples/semidefault.scala rename to examples/src/main/scala/semidefault.scala diff --git a/src/examples/show.scala b/examples/src/main/scala/show.scala similarity index 100% rename from src/examples/show.scala rename to examples/src/main/scala/show.scala diff --git a/src/examples/typename.scala b/examples/src/main/scala/typename.scala similarity index 100% rename from src/examples/typename.scala rename to examples/src/main/scala/typename.scala diff --git a/src/test/WeekDay.java b/src/test/WeekDay.java deleted file mode 100644 index a895bbe9..00000000 --- a/src/test/WeekDay.java +++ /dev/null @@ -1,5 +0,0 @@ -package magnolia1.tests; - -public enum WeekDay { - Monday, Tuesday, Wednesday, Thursday, Friday, Saturday, Sunday; -} diff --git a/src/test/AnnotationsTests.scala b/test/src/test/scala/AnnotationsTests.scala similarity index 100% rename from src/test/AnnotationsTests.scala rename to test/src/test/scala/AnnotationsTests.scala diff --git a/src/test/DefaultValuesTests.scala b/test/src/test/scala/DefaultValuesTests.scala similarity index 100% rename from src/test/DefaultValuesTests.scala rename to test/src/test/scala/DefaultValuesTests.scala diff --git a/src/test/JavaExampleAnnotation.java b/test/src/test/scala/JavaExampleAnnotation.java similarity index 100% rename from src/test/JavaExampleAnnotation.java rename to test/src/test/scala/JavaExampleAnnotation.java diff --git a/src/test/ModifiersTests.scala b/test/src/test/scala/ModifiersTests.scala similarity index 100% rename from src/test/ModifiersTests.scala rename to test/src/test/scala/ModifiersTests.scala diff --git a/src/test/OtherTests.scala b/test/src/test/scala/OtherTests.scala similarity index 100% rename from src/test/OtherTests.scala rename to test/src/test/scala/OtherTests.scala diff --git a/src/test/ProductsTests.scala b/test/src/test/scala/ProductsTests.scala similarity index 100% rename from src/test/ProductsTests.scala rename to test/src/test/scala/ProductsTests.scala diff --git a/src/test/RecursiveTypesTests.scala b/test/src/test/scala/RecursiveTypesTests.scala similarity index 100% rename from src/test/RecursiveTypesTests.scala rename to test/src/test/scala/RecursiveTypesTests.scala diff --git a/src/test/ScopesTests.scala b/test/src/test/scala/ScopesTests.scala similarity index 100% rename from src/test/ScopesTests.scala rename to test/src/test/scala/ScopesTests.scala diff --git a/src/test/SumsTests.scala b/test/src/test/scala/SumsTests.scala similarity index 100% rename from src/test/SumsTests.scala rename to test/src/test/scala/SumsTests.scala diff --git a/src/test/TypeAliasesTests.scala b/test/src/test/scala/TypeAliasesTests.scala similarity index 100% rename from src/test/TypeAliasesTests.scala rename to test/src/test/scala/TypeAliasesTests.scala diff --git a/src/test/ValueClassesTests.scala b/test/src/test/scala/ValueClassesTests.scala similarity index 100% rename from src/test/ValueClassesTests.scala rename to test/src/test/scala/ValueClassesTests.scala diff --git a/src/test/VarianceTests.scala b/test/src/test/scala/VarianceTests.scala similarity index 100% rename from src/test/VarianceTests.scala rename to test/src/test/scala/VarianceTests.scala diff --git a/src/test-enum/magnolia/tests/WeekDay.java b/test/src/test/scala/WeekDay.java similarity index 100% rename from src/test-enum/magnolia/tests/WeekDay.java rename to test/src/test/scala/WeekDay.java From 6b4ef79e102e045649e38c8b9212931b0c86b087 Mon Sep 17 00:00:00 2001 From: Michel Davit Date: Tue, 9 Jan 2024 11:17:37 +0100 Subject: [PATCH 2/2] Respect package and file type --- core/src/main/scala/{ => magnolia1}/impl.scala | 0 core/src/main/scala/{ => magnolia1}/interface.scala | 0 core/src/main/scala/{ => magnolia1}/macro.scala | 0 core/src/main/scala/{ => magnolia1}/magnolia.scala | 0 core/src/main/scala/{ => magnolia1}/monadic.scala | 0 .../main/scala/{ => magnolia1/examples}/JavaAnnotatedCase.scala | 0 .../src/main/scala/{ => magnolia1/examples}/SubtypeInfo.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/csv.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/decode.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/decodeSafe.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/default.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/eq.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/exported.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/hash.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/nocombine.scala | 0 .../src/main/scala/{ => magnolia1/examples}/passthrough.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/patch.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/print.scala | 0 .../src/main/scala/{ => magnolia1/examples}/printRepeated.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/semiauto.scala | 0 .../src/main/scala/{ => magnolia1/examples}/semidefault.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/show.scala | 0 examples/src/main/scala/{ => magnolia1/examples}/typename.scala | 0 .../{scala => java/magnolia1/tests}/JavaExampleAnnotation.java | 0 test/src/test/{scala => java/magnolia1/tests}/WeekDay.java | 0 test/src/test/scala/{ => magnolia1/tests}/AnnotationsTests.scala | 0 .../src/test/scala/{ => magnolia1/tests}/DefaultValuesTests.scala | 0 test/src/test/scala/{ => magnolia1/tests}/ModifiersTests.scala | 0 test/src/test/scala/{ => magnolia1/tests}/OtherTests.scala | 0 test/src/test/scala/{ => magnolia1/tests}/ProductsTests.scala | 0 .../test/scala/{ => magnolia1/tests}/RecursiveTypesTests.scala | 0 test/src/test/scala/{ => magnolia1/tests}/ScopesTests.scala | 0 test/src/test/scala/{ => magnolia1/tests}/SumsTests.scala | 0 test/src/test/scala/{ => magnolia1/tests}/TypeAliasesTests.scala | 0 test/src/test/scala/{ => magnolia1/tests}/ValueClassesTests.scala | 0 test/src/test/scala/{ => magnolia1/tests}/VarianceTests.scala | 0 36 files changed, 0 insertions(+), 0 deletions(-) rename core/src/main/scala/{ => magnolia1}/impl.scala (100%) rename core/src/main/scala/{ => magnolia1}/interface.scala (100%) rename core/src/main/scala/{ => magnolia1}/macro.scala (100%) rename core/src/main/scala/{ => magnolia1}/magnolia.scala (100%) rename core/src/main/scala/{ => magnolia1}/monadic.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/JavaAnnotatedCase.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/SubtypeInfo.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/csv.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/decode.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/decodeSafe.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/default.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/eq.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/exported.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/hash.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/nocombine.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/passthrough.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/patch.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/print.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/printRepeated.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/semiauto.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/semidefault.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/show.scala (100%) rename examples/src/main/scala/{ => magnolia1/examples}/typename.scala (100%) rename test/src/test/{scala => java/magnolia1/tests}/JavaExampleAnnotation.java (100%) rename test/src/test/{scala => java/magnolia1/tests}/WeekDay.java (100%) rename test/src/test/scala/{ => magnolia1/tests}/AnnotationsTests.scala (100%) rename test/src/test/scala/{ => magnolia1/tests}/DefaultValuesTests.scala (100%) rename test/src/test/scala/{ => magnolia1/tests}/ModifiersTests.scala (100%) rename test/src/test/scala/{ => magnolia1/tests}/OtherTests.scala (100%) rename test/src/test/scala/{ => magnolia1/tests}/ProductsTests.scala (100%) rename test/src/test/scala/{ => magnolia1/tests}/RecursiveTypesTests.scala (100%) rename test/src/test/scala/{ => magnolia1/tests}/ScopesTests.scala (100%) rename test/src/test/scala/{ => magnolia1/tests}/SumsTests.scala (100%) rename test/src/test/scala/{ => magnolia1/tests}/TypeAliasesTests.scala (100%) rename test/src/test/scala/{ => magnolia1/tests}/ValueClassesTests.scala (100%) rename test/src/test/scala/{ => magnolia1/tests}/VarianceTests.scala (100%) diff --git a/core/src/main/scala/impl.scala b/core/src/main/scala/magnolia1/impl.scala similarity index 100% rename from core/src/main/scala/impl.scala rename to core/src/main/scala/magnolia1/impl.scala diff --git a/core/src/main/scala/interface.scala b/core/src/main/scala/magnolia1/interface.scala similarity index 100% rename from core/src/main/scala/interface.scala rename to core/src/main/scala/magnolia1/interface.scala diff --git a/core/src/main/scala/macro.scala b/core/src/main/scala/magnolia1/macro.scala similarity index 100% rename from core/src/main/scala/macro.scala rename to core/src/main/scala/magnolia1/macro.scala diff --git a/core/src/main/scala/magnolia.scala b/core/src/main/scala/magnolia1/magnolia.scala similarity index 100% rename from core/src/main/scala/magnolia.scala rename to core/src/main/scala/magnolia1/magnolia.scala diff --git a/core/src/main/scala/monadic.scala b/core/src/main/scala/magnolia1/monadic.scala similarity index 100% rename from core/src/main/scala/monadic.scala rename to core/src/main/scala/magnolia1/monadic.scala diff --git a/examples/src/main/scala/JavaAnnotatedCase.scala b/examples/src/main/scala/magnolia1/examples/JavaAnnotatedCase.scala similarity index 100% rename from examples/src/main/scala/JavaAnnotatedCase.scala rename to examples/src/main/scala/magnolia1/examples/JavaAnnotatedCase.scala diff --git a/examples/src/main/scala/SubtypeInfo.scala b/examples/src/main/scala/magnolia1/examples/SubtypeInfo.scala similarity index 100% rename from examples/src/main/scala/SubtypeInfo.scala rename to examples/src/main/scala/magnolia1/examples/SubtypeInfo.scala diff --git a/examples/src/main/scala/csv.scala b/examples/src/main/scala/magnolia1/examples/csv.scala similarity index 100% rename from examples/src/main/scala/csv.scala rename to examples/src/main/scala/magnolia1/examples/csv.scala diff --git a/examples/src/main/scala/decode.scala b/examples/src/main/scala/magnolia1/examples/decode.scala similarity index 100% rename from examples/src/main/scala/decode.scala rename to examples/src/main/scala/magnolia1/examples/decode.scala diff --git a/examples/src/main/scala/decodeSafe.scala b/examples/src/main/scala/magnolia1/examples/decodeSafe.scala similarity index 100% rename from examples/src/main/scala/decodeSafe.scala rename to examples/src/main/scala/magnolia1/examples/decodeSafe.scala diff --git a/examples/src/main/scala/default.scala b/examples/src/main/scala/magnolia1/examples/default.scala similarity index 100% rename from examples/src/main/scala/default.scala rename to examples/src/main/scala/magnolia1/examples/default.scala diff --git a/examples/src/main/scala/eq.scala b/examples/src/main/scala/magnolia1/examples/eq.scala similarity index 100% rename from examples/src/main/scala/eq.scala rename to examples/src/main/scala/magnolia1/examples/eq.scala diff --git a/examples/src/main/scala/exported.scala b/examples/src/main/scala/magnolia1/examples/exported.scala similarity index 100% rename from examples/src/main/scala/exported.scala rename to examples/src/main/scala/magnolia1/examples/exported.scala diff --git a/examples/src/main/scala/hash.scala b/examples/src/main/scala/magnolia1/examples/hash.scala similarity index 100% rename from examples/src/main/scala/hash.scala rename to examples/src/main/scala/magnolia1/examples/hash.scala diff --git a/examples/src/main/scala/nocombine.scala b/examples/src/main/scala/magnolia1/examples/nocombine.scala similarity index 100% rename from examples/src/main/scala/nocombine.scala rename to examples/src/main/scala/magnolia1/examples/nocombine.scala diff --git a/examples/src/main/scala/passthrough.scala b/examples/src/main/scala/magnolia1/examples/passthrough.scala similarity index 100% rename from examples/src/main/scala/passthrough.scala rename to examples/src/main/scala/magnolia1/examples/passthrough.scala diff --git a/examples/src/main/scala/patch.scala b/examples/src/main/scala/magnolia1/examples/patch.scala similarity index 100% rename from examples/src/main/scala/patch.scala rename to examples/src/main/scala/magnolia1/examples/patch.scala diff --git a/examples/src/main/scala/print.scala b/examples/src/main/scala/magnolia1/examples/print.scala similarity index 100% rename from examples/src/main/scala/print.scala rename to examples/src/main/scala/magnolia1/examples/print.scala diff --git a/examples/src/main/scala/printRepeated.scala b/examples/src/main/scala/magnolia1/examples/printRepeated.scala similarity index 100% rename from examples/src/main/scala/printRepeated.scala rename to examples/src/main/scala/magnolia1/examples/printRepeated.scala diff --git a/examples/src/main/scala/semiauto.scala b/examples/src/main/scala/magnolia1/examples/semiauto.scala similarity index 100% rename from examples/src/main/scala/semiauto.scala rename to examples/src/main/scala/magnolia1/examples/semiauto.scala diff --git a/examples/src/main/scala/semidefault.scala b/examples/src/main/scala/magnolia1/examples/semidefault.scala similarity index 100% rename from examples/src/main/scala/semidefault.scala rename to examples/src/main/scala/magnolia1/examples/semidefault.scala diff --git a/examples/src/main/scala/show.scala b/examples/src/main/scala/magnolia1/examples/show.scala similarity index 100% rename from examples/src/main/scala/show.scala rename to examples/src/main/scala/magnolia1/examples/show.scala diff --git a/examples/src/main/scala/typename.scala b/examples/src/main/scala/magnolia1/examples/typename.scala similarity index 100% rename from examples/src/main/scala/typename.scala rename to examples/src/main/scala/magnolia1/examples/typename.scala diff --git a/test/src/test/scala/JavaExampleAnnotation.java b/test/src/test/java/magnolia1/tests/JavaExampleAnnotation.java similarity index 100% rename from test/src/test/scala/JavaExampleAnnotation.java rename to test/src/test/java/magnolia1/tests/JavaExampleAnnotation.java diff --git a/test/src/test/scala/WeekDay.java b/test/src/test/java/magnolia1/tests/WeekDay.java similarity index 100% rename from test/src/test/scala/WeekDay.java rename to test/src/test/java/magnolia1/tests/WeekDay.java diff --git a/test/src/test/scala/AnnotationsTests.scala b/test/src/test/scala/magnolia1/tests/AnnotationsTests.scala similarity index 100% rename from test/src/test/scala/AnnotationsTests.scala rename to test/src/test/scala/magnolia1/tests/AnnotationsTests.scala diff --git a/test/src/test/scala/DefaultValuesTests.scala b/test/src/test/scala/magnolia1/tests/DefaultValuesTests.scala similarity index 100% rename from test/src/test/scala/DefaultValuesTests.scala rename to test/src/test/scala/magnolia1/tests/DefaultValuesTests.scala diff --git a/test/src/test/scala/ModifiersTests.scala b/test/src/test/scala/magnolia1/tests/ModifiersTests.scala similarity index 100% rename from test/src/test/scala/ModifiersTests.scala rename to test/src/test/scala/magnolia1/tests/ModifiersTests.scala diff --git a/test/src/test/scala/OtherTests.scala b/test/src/test/scala/magnolia1/tests/OtherTests.scala similarity index 100% rename from test/src/test/scala/OtherTests.scala rename to test/src/test/scala/magnolia1/tests/OtherTests.scala diff --git a/test/src/test/scala/ProductsTests.scala b/test/src/test/scala/magnolia1/tests/ProductsTests.scala similarity index 100% rename from test/src/test/scala/ProductsTests.scala rename to test/src/test/scala/magnolia1/tests/ProductsTests.scala diff --git a/test/src/test/scala/RecursiveTypesTests.scala b/test/src/test/scala/magnolia1/tests/RecursiveTypesTests.scala similarity index 100% rename from test/src/test/scala/RecursiveTypesTests.scala rename to test/src/test/scala/magnolia1/tests/RecursiveTypesTests.scala diff --git a/test/src/test/scala/ScopesTests.scala b/test/src/test/scala/magnolia1/tests/ScopesTests.scala similarity index 100% rename from test/src/test/scala/ScopesTests.scala rename to test/src/test/scala/magnolia1/tests/ScopesTests.scala diff --git a/test/src/test/scala/SumsTests.scala b/test/src/test/scala/magnolia1/tests/SumsTests.scala similarity index 100% rename from test/src/test/scala/SumsTests.scala rename to test/src/test/scala/magnolia1/tests/SumsTests.scala diff --git a/test/src/test/scala/TypeAliasesTests.scala b/test/src/test/scala/magnolia1/tests/TypeAliasesTests.scala similarity index 100% rename from test/src/test/scala/TypeAliasesTests.scala rename to test/src/test/scala/magnolia1/tests/TypeAliasesTests.scala diff --git a/test/src/test/scala/ValueClassesTests.scala b/test/src/test/scala/magnolia1/tests/ValueClassesTests.scala similarity index 100% rename from test/src/test/scala/ValueClassesTests.scala rename to test/src/test/scala/magnolia1/tests/ValueClassesTests.scala diff --git a/test/src/test/scala/VarianceTests.scala b/test/src/test/scala/magnolia1/tests/VarianceTests.scala similarity index 100% rename from test/src/test/scala/VarianceTests.scala rename to test/src/test/scala/magnolia1/tests/VarianceTests.scala