fix routes cache directory

xuwei-k · xuwei-k · commit 4dcb4ffe6e79 · 2025-08-04T10:25:28.000+09:00
diff --git a/dev-mode/sbt-plugin/src/main/scala/play/sbt/routes/RoutesCompiler.scala b/dev-mode/sbt-plugin/src/main/scala/play/sbt/routes/RoutesCompiler.scala
@@ -176,7 +176,7 @@ object RoutesCompiler extends AutoPlugin {
       routesCompilerTasks.value,
       routesGenerator.value,
       (routes / target).value,
-      streams.value.cacheDirectory,
+      streams.value.cacheDirectory / scalaVersion.value,
       log
     )
   }
diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-cache/build.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-cache/build.sbt
@@ -0,0 +1,19 @@
+// Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
+
+enablePlugins(PlayScala)
+
+def Scala3 = "3.7.2"
+
+scalaVersion := Scala3
+
+crossScalaVersions := Seq("2.13.16", Scala3)
+
+TaskKey[Unit]("check") := {
+  val dir = crossTarget.value
+  (Compile / managedSources).value.foreach{ src =>
+    assert(
+      IO.relativize(dir, src).isDefined,
+      s"scalaVersion = ${scalaVersion.value}, file = $src"
+    )
+  }
+}
diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-cache/conf/routes b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-cache/conf/routes
@@ -0,0 +1,3 @@
+# Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
+
+GET  /public/*file  controllers.Assets.versioned(path="/public", file: Asset)
diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-cache/project/plugins.sbt b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-cache/project/plugins.sbt
@@ -0,0 +1,3 @@
+// Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>
+
+addSbtPlugin("org.playframework" % "sbt-plugin" % sys.props("project.version"))
diff --git a/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-cache/test b/dev-mode/sbt-plugin/src/sbt-test/play-sbt-plugin/routes-compiler-cache/test
@@ -0,0 +1,2 @@
+> + compile
+> + check

Original file line number	Diff line number	Diff line change
`@@ -176,7 +176,7 @@ object RoutesCompiler extends AutoPlugin {`
`176`	`176`	`routesCompilerTasks.value,`
`177`	`177`	`routesGenerator.value,`
`178`	`178`	`(routes / target).value,`
`179`		`- streams.value.cacheDirectory,`
	`179`	`+ streams.value.cacheDirectory / scalaVersion.value,`
`180`	`180`	`log`
`181`	`181`	`)`
`182`	`182`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+# Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>`
	`2`	`+`
	`3`	`+GET /public/*file controllers.Assets.versioned(path="/public", file: Asset)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+// Copyright (C) from 2022 The Play Framework Contributors <https://github.com/playframework>, 2011-2021 Lightbend Inc. <https://www.lightbend.com>`
	`2`	`+`
	`3`	`+addSbtPlugin("org.playframework" % "sbt-plugin" % sys.props("project.version"))`