Merge pull request #505 from RustedBones/project-structure

[scala3] Use standard project structure
softwaremill · Jan 10, 2024 · b5f2e6f · b5f2e6f
2 parents a8b0b33 + 6b4ef79
commit b5f2e6f
Show file tree

Hide file tree

Showing 38 changed files with 3 additions and 11 deletions.
diff --git 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 → core/src/main/scala/magnolia1/impl.scala b/src/core/impl.scala → core/src/main/scala/magnolia1/impl.scala
diff --git a/src/core/interface.scala → .../src/main/scala/magnolia1/interface.scala b/src/core/interface.scala → .../src/main/scala/magnolia1/interface.scala
diff --git a/src/core/macro.scala → core/src/main/scala/magnolia1/macro.scala b/src/core/macro.scala → core/src/main/scala/magnolia1/macro.scala
diff --git a/src/core/magnolia.scala → core/src/main/scala/magnolia1/magnolia.scala b/src/core/magnolia.scala → core/src/main/scala/magnolia1/magnolia.scala
diff --git a/src/core/monadic.scala → core/src/main/scala/magnolia1/monadic.scala b/src/core/monadic.scala → core/src/main/scala/magnolia1/monadic.scala
diff --git a/src/examples/JavaAnnotatedCase.scala → ...agnolia1/examples/JavaAnnotatedCase.scala b/src/examples/JavaAnnotatedCase.scala → ...agnolia1/examples/JavaAnnotatedCase.scala
diff --git a/src/examples/SubtypeInfo.scala → ...cala/magnolia1/examples/SubtypeInfo.scala b/src/examples/SubtypeInfo.scala → ...cala/magnolia1/examples/SubtypeInfo.scala
diff --git a/src/examples/csv.scala → ...c/main/scala/magnolia1/examples/csv.scala b/src/examples/csv.scala → ...c/main/scala/magnolia1/examples/csv.scala
diff --git a/src/examples/decode.scala → ...ain/scala/magnolia1/examples/decode.scala b/src/examples/decode.scala → ...ain/scala/magnolia1/examples/decode.scala
diff --git a/src/examples/decodeSafe.scala → ...scala/magnolia1/examples/decodeSafe.scala b/src/examples/decodeSafe.scala → ...scala/magnolia1/examples/decodeSafe.scala
diff --git a/src/examples/default.scala → ...in/scala/magnolia1/examples/default.scala b/src/examples/default.scala → ...in/scala/magnolia1/examples/default.scala
diff --git a/src/examples/eq.scala → ...rc/main/scala/magnolia1/examples/eq.scala b/src/examples/eq.scala → ...rc/main/scala/magnolia1/examples/eq.scala
diff --git a/src/examples/exported.scala → ...n/scala/magnolia1/examples/exported.scala b/src/examples/exported.scala → ...n/scala/magnolia1/examples/exported.scala
diff --git a/src/examples/hash.scala → .../main/scala/magnolia1/examples/hash.scala b/src/examples/hash.scala → .../main/scala/magnolia1/examples/hash.scala
diff --git a/src/examples/nocombine.scala → .../scala/magnolia1/examples/nocombine.scala b/src/examples/nocombine.scala → .../scala/magnolia1/examples/nocombine.scala
diff --git a/src/examples/passthrough.scala → ...cala/magnolia1/examples/passthrough.scala b/src/examples/passthrough.scala → ...cala/magnolia1/examples/passthrough.scala
diff --git a/src/examples/patch.scala → ...main/scala/magnolia1/examples/patch.scala b/src/examples/patch.scala → ...main/scala/magnolia1/examples/patch.scala
diff --git a/src/examples/print.scala → ...main/scala/magnolia1/examples/print.scala b/src/examples/print.scala → ...main/scala/magnolia1/examples/print.scala
diff --git a/src/examples/printRepeated.scala → ...la/magnolia1/examples/printRepeated.scala b/src/examples/printRepeated.scala → ...la/magnolia1/examples/printRepeated.scala
diff --git a/src/examples/semiauto.scala → ...n/scala/magnolia1/examples/semiauto.scala b/src/examples/semiauto.scala → ...n/scala/magnolia1/examples/semiauto.scala
diff --git a/src/examples/semidefault.scala → ...cala/magnolia1/examples/semidefault.scala b/src/examples/semidefault.scala → ...cala/magnolia1/examples/semidefault.scala
diff --git a/src/examples/show.scala → .../main/scala/magnolia1/examples/show.scala b/src/examples/show.scala → .../main/scala/magnolia1/examples/show.scala
diff --git a/src/examples/typename.scala → ...n/scala/magnolia1/examples/typename.scala b/src/examples/typename.scala → ...n/scala/magnolia1/examples/typename.scala
diff --git a/src/test/WeekDay.java b/src/test/WeekDay.java
diff --git a/src/test/JavaExampleAnnotation.java → ...agnolia1/tests/JavaExampleAnnotation.java b/src/test/JavaExampleAnnotation.java → ...agnolia1/tests/JavaExampleAnnotation.java
diff --git a/src/test-enum/magnolia/tests/WeekDay.java → ...rc/test/java/magnolia1/tests/WeekDay.java b/src/test-enum/magnolia/tests/WeekDay.java → ...rc/test/java/magnolia1/tests/WeekDay.java
diff --git a/src/test/AnnotationsTests.scala → ...la/magnolia1/tests/AnnotationsTests.scala b/src/test/AnnotationsTests.scala → ...la/magnolia1/tests/AnnotationsTests.scala
diff --git a/src/test/DefaultValuesTests.scala → .../magnolia1/tests/DefaultValuesTests.scala b/src/test/DefaultValuesTests.scala → .../magnolia1/tests/DefaultValuesTests.scala
diff --git a/src/test/ModifiersTests.scala → ...cala/magnolia1/tests/ModifiersTests.scala b/src/test/ModifiersTests.scala → ...cala/magnolia1/tests/ModifiersTests.scala
diff --git a/src/test/OtherTests.scala → ...st/scala/magnolia1/tests/OtherTests.scala b/src/test/OtherTests.scala → ...st/scala/magnolia1/tests/OtherTests.scala
diff --git a/src/test/ProductsTests.scala → ...scala/magnolia1/tests/ProductsTests.scala b/src/test/ProductsTests.scala → ...scala/magnolia1/tests/ProductsTests.scala
diff --git a/src/test/RecursiveTypesTests.scala → ...magnolia1/tests/RecursiveTypesTests.scala b/src/test/RecursiveTypesTests.scala → ...magnolia1/tests/RecursiveTypesTests.scala
diff --git a/src/test/ScopesTests.scala → ...t/scala/magnolia1/tests/ScopesTests.scala b/src/test/ScopesTests.scala → ...t/scala/magnolia1/tests/ScopesTests.scala
diff --git a/src/test/SumsTests.scala → ...est/scala/magnolia1/tests/SumsTests.scala b/src/test/SumsTests.scala → ...est/scala/magnolia1/tests/SumsTests.scala
diff --git a/src/test/TypeAliasesTests.scala → ...la/magnolia1/tests/TypeAliasesTests.scala b/src/test/TypeAliasesTests.scala → ...la/magnolia1/tests/TypeAliasesTests.scala
diff --git a/src/test/ValueClassesTests.scala → ...a/magnolia1/tests/ValueClassesTests.scala b/src/test/ValueClassesTests.scala → ...a/magnolia1/tests/ValueClassesTests.scala
diff --git a/src/test/VarianceTests.scala → ...scala/magnolia1/tests/VarianceTests.scala b/src/test/VarianceTests.scala → ...scala/magnolia1/tests/VarianceTests.scala