From d28279fc5fa8b4c3559b5e76a13a3a15e13dd4f4 Mon Sep 17 00:00:00 2001 From: Nadav Samet Date: Sun, 29 Sep 2024 18:16:51 -0700 Subject: [PATCH] Fix Scala3 compat spec --- build.sbt | 1 + e2e/src/main/{protobuf-scala3 => protobuf}/issue1576.proto | 0 .../{scalajvm-3 => scalajvm-3-source}/Scala3CompatSpec.scala | 0 3 files changed, 1 insertion(+) rename e2e/src/main/{protobuf-scala3 => protobuf}/issue1576.proto (100%) rename e2e/src/test/{scalajvm-3 => scalajvm-3-source}/Scala3CompatSpec.scala (100%) diff --git a/build.sbt b/build.sbt index 6520725ff..246d52604 100644 --- a/build.sbt +++ b/build.sbt @@ -407,6 +407,7 @@ lazy val e2e = (projectMatrix in file("e2e")) "scalajvm-3" else "scalajvm-2"), + Test / unmanagedSourceDirectories += (Test / scalaSource).value.getParentFile / "scalajvm-3-source", scalacOptions ++= (if (isScala3.value) Seq("-source", "future") else Seq("-Xsource:3")), Test / scalacOptions --= diff --git a/e2e/src/main/protobuf-scala3/issue1576.proto b/e2e/src/main/protobuf/issue1576.proto similarity index 100% rename from e2e/src/main/protobuf-scala3/issue1576.proto rename to e2e/src/main/protobuf/issue1576.proto diff --git a/e2e/src/test/scalajvm-3/Scala3CompatSpec.scala b/e2e/src/test/scalajvm-3-source/Scala3CompatSpec.scala similarity index 100% rename from e2e/src/test/scalajvm-3/Scala3CompatSpec.scala rename to e2e/src/test/scalajvm-3-source/Scala3CompatSpec.scala