Use js-native folder by sbt-crossproject

Avoid creating extra `Compile / unmanagedSourceDirectories` for non-jvm
scalameta · Apr 17, 2023 · 29eeea4 · 29eeea4
1 parent 22a27a7
commit 29eeea4
Show file tree

Hide file tree

Showing 26 changed files with 2 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -229,9 +229,7 @@ lazy val munit = crossProject(JSPlatform, JVMPlatform, NativePlatform)
     sharedNativeSettings,
     libraryDependencies ++= List(
       "org.scala-native" %%% "test-interface" % nativeVersion
-    ),
-    Compile / unmanagedSourceDirectories +=
-      (ThisBuild / baseDirectory).value / "munit" / "non-jvm" / "src" / "main"
+    )
   )
   .jsConfigure(sharedJSConfigure)
   .jsSettings(
@@ -241,9 +239,7 @@ lazy val munit = crossProject(JSPlatform, JVMPlatform, NativePlatform)
         .cross(CrossVersion.for3Use2_13),
       ("org.scala-js" %% "scalajs-junit-test-runtime" % scalaJSVersion)
         .cross(CrossVersion.for3Use2_13)
-    ),
-    Compile / unmanagedSourceDirectories +=
-      (ThisBuild / baseDirectory).value / "munit" / "non-jvm" / "src" / "main"
+    )
   )
   .jvmSettings(
     sharedJVMSettings,

diff --git a/...-jvm/src/main/scala/munit/Framework.scala → ...tive/src/main/scala/munit/Framework.scala b/...-jvm/src/main/scala/munit/Framework.scala → ...tive/src/main/scala/munit/Framework.scala
diff --git a/...vm/src/main/scala/munit/IgnoreSuite.scala → ...ve/src/main/scala/munit/IgnoreSuite.scala b/...vm/src/main/scala/munit/IgnoreSuite.scala → ...ve/src/main/scala/munit/IgnoreSuite.scala
diff --git a/...ala/munit/internal/MUnitFingerprint.scala → ...ala/munit/internal/MUnitFingerprint.scala b/...ala/munit/internal/MUnitFingerprint.scala → ...ala/munit/internal/MUnitFingerprint.scala
diff --git a/...nternal/junitinterface/Configurable.scala → ...nternal/junitinterface/Configurable.scala b/...nternal/junitinterface/Configurable.scala → ...nternal/junitinterface/Configurable.scala
diff --git a/...al/junitinterface/CustomFingerprint.scala → ...al/junitinterface/CustomFingerprint.scala b/...al/junitinterface/CustomFingerprint.scala → ...al/junitinterface/CustomFingerprint.scala
diff --git a/...ternal/junitinterface/CustomRunners.scala → ...ternal/junitinterface/CustomRunners.scala b/...ternal/junitinterface/CustomRunners.scala → ...ternal/junitinterface/CustomRunners.scala
diff --git a/...ternal/junitinterface/IncludeFilter.scala → ...ternal/junitinterface/IncludeFilter.scala b/...ternal/junitinterface/IncludeFilter.scala → ...ternal/junitinterface/IncludeFilter.scala
diff --git a/.../internal/junitinterface/JUnitEvent.scala → .../internal/junitinterface/JUnitEvent.scala b/.../internal/junitinterface/JUnitEvent.scala → .../internal/junitinterface/JUnitEvent.scala
diff --git a/...ernal/junitinterface/JUnitFramework.scala → ...ernal/junitinterface/JUnitFramework.scala b/...ernal/junitinterface/JUnitFramework.scala → ...ernal/junitinterface/JUnitFramework.scala
diff --git a/...ternal/junitinterface/JUnitReporter.scala → ...ternal/junitinterface/JUnitReporter.scala b/...ternal/junitinterface/JUnitReporter.scala → ...ternal/junitinterface/JUnitReporter.scala
diff --git a/...internal/junitinterface/JUnitRunner.scala → ...internal/junitinterface/JUnitRunner.scala b/...internal/junitinterface/JUnitRunner.scala → ...internal/junitinterface/JUnitRunner.scala
diff --git a/...t/internal/junitinterface/JUnitTask.scala → ...t/internal/junitinterface/JUnitTask.scala b/...t/internal/junitinterface/JUnitTask.scala → ...t/internal/junitinterface/JUnitTask.scala
diff --git a/...nal/junitinterface/MUnitRunNotifier.scala → ...nal/junitinterface/MUnitRunNotifier.scala b/...nal/junitinterface/MUnitRunNotifier.scala → ...nal/junitinterface/MUnitRunNotifier.scala
diff --git a/...internal/junitinterface/RunSettings.scala → ...internal/junitinterface/RunSettings.scala b/...internal/junitinterface/RunSettings.scala → ...internal/junitinterface/RunSettings.scala
diff --git a/...it/internal/junitinterface/Settings.scala → ...it/internal/junitinterface/Settings.scala b/...it/internal/junitinterface/Settings.scala → ...it/internal/junitinterface/Settings.scala
diff --git a/...a/munit/internal/junitinterface/Tag.scala → ...a/munit/internal/junitinterface/Tag.scala b/...a/munit/internal/junitinterface/Tag.scala → ...a/munit/internal/junitinterface/Tag.scala
diff --git a/...rc/main/scala/org/junit/LICENSE-junit.txt → ...rc/main/scala/org/junit/LICENSE-junit.txt b/...rc/main/scala/org/junit/LICENSE-junit.txt → ...rc/main/scala/org/junit/LICENSE-junit.txt
diff --git a/...it/experimental/categories/Category.scala → ...it/experimental/categories/Category.scala b/...it/experimental/categories/Category.scala → ...it/experimental/categories/Category.scala
diff --git a/.../scala/org/junit/runner/Description.scala → .../scala/org/junit/runner/Description.scala b/.../scala/org/junit/runner/Description.scala → .../scala/org/junit/runner/Description.scala
diff --git a/...main/scala/org/junit/runner/RunWith.scala → ...main/scala/org/junit/runner/RunWith.scala b/...main/scala/org/junit/runner/RunWith.scala → ...main/scala/org/junit/runner/RunWith.scala
diff --git a/.../main/scala/org/junit/runner/Runner.scala → .../main/scala/org/junit/runner/Runner.scala b/.../main/scala/org/junit/runner/Runner.scala → .../main/scala/org/junit/runner/Runner.scala
diff --git a/...rg/junit/runner/manipulation/Filter.scala → ...rg/junit/runner/manipulation/Filter.scala b/...rg/junit/runner/manipulation/Filter.scala → ...rg/junit/runner/manipulation/Filter.scala
diff --git a/...unit/runner/manipulation/Filterable.scala → ...unit/runner/manipulation/Filterable.scala b/...unit/runner/manipulation/Filterable.scala → ...unit/runner/manipulation/Filterable.scala
diff --git a/...g/junit/runner/notification/Failure.scala → ...g/junit/runner/notification/Failure.scala b/...g/junit/runner/notification/Failure.scala → ...g/junit/runner/notification/Failure.scala
diff --git a/...nit/runner/notification/RunNotifier.scala → ...nit/runner/notification/RunNotifier.scala b/...nit/runner/notification/RunNotifier.scala → ...nit/runner/notification/RunNotifier.scala