Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions docs/build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import sbtheader.FileType
import sbtheader.LineCommentCreator

// The docs are a separate sbt build and cannot reuse the root build's Dependencies object.
val scala33LTSVersion = "3.3.8"
val scala33LTSVersion = "3.9.0"

lazy val docs = project
.in(file("."))
Expand All @@ -20,8 +20,10 @@ lazy val docs = project
},
libraryDependencies += component("play-test") % Test,
libraryDependencies += component("play-specs2") % Test,
PlayDocsKeys.javaManualSourceDirectories := (baseDirectory.value / "manual" / "working" / "javaGuide" ** "code").get(),
PlayDocsKeys.scalaManualSourceDirectories := (baseDirectory.value / "manual" / "working" / "scalaGuide" ** "code").get(),
PlayDocsKeys.javaManualSourceDirectories := (baseDirectory.value / "manual" / "working" / "javaGuide" ** "code")
.get(),
PlayDocsKeys.scalaManualSourceDirectories := (baseDirectory.value / "manual" / "working" / "scalaGuide" ** "code")
.get(),
headerLicense := {
Some(
HeaderLicense.Custom(
Expand All @@ -35,7 +37,8 @@ lazy val docs = project
FileType("md") -> CommentStyle(new LineCommentCreator("<!---", "-->"), commentBetween("<!---", "*", "-->")),
),
(Compile / headerSources) ++= Def.uncached(
((baseDirectory.value ** ("*.properties" || "*.sbt" || "*.md" || "*.scala")) --- (baseDirectory.value ** "target" ** "*")).get()
((baseDirectory.value ** ("*.properties" || "*.sbt" || "*.md" || "*.scala")) --- (baseDirectory.value ** "target" ** "*"))
.get()
)
)
.settings(overrideTwirlSettings)
Expand Down
164 changes: 82 additions & 82 deletions gradle-twirl/gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion project/Dependencies.scala
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
object Dependencies {
val scala212Version = "2.12.21"
val scala213Version = "2.13.18"
val scala33LTSVersion = "3.3.8"
val scala33LTSVersion = "3.9.0"
val scala39LTSVersion = "3.9.0"
val scala3NextVersion = "3.10.0-RC2"

Expand Down