From bea7e9ec2433b776c32ccbe9319cff6af6b986e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Zyba=C5=82a?= Date: Wed, 4 May 2022 14:44:00 +0200 Subject: [PATCH] Generate static assets before copying docs dir --- project/Build.scala | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index e925b8c84324..33cc0cdd4543 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1303,6 +1303,16 @@ object Build { } } + def generateStaticAssetsTask = Def.task { + DocumentationWebsite.generateStaticAssets( + (`scaladoc-js-contributors` / Compile / fullOptJS).value.data, + (`scaladoc-js-main` / Compile / fullOptJS).value.data, + (`scaladoc-js-contributors` / Compile / baseDirectory).value / "css", + (`scaladoc-js-common` / Compile / baseDirectory).value / "css", + (Compile / resourceManaged).value, + ) + } + val SourceLinksIntegrationTest = config("sourceLinksIntegrationTest") extend Test lazy val scaladoc = project.in(file("scaladoc")). @@ -1316,15 +1326,7 @@ object Build { SourceLinksIntegrationTest / test:= ((SourceLinksIntegrationTest / test) dependsOn generateScalaDocumentation.toTask("")).value, ). settings( - Compile / resourceGenerators += Def.task { - DocumentationWebsite.generateStaticAssets( - (`scaladoc-js-contributors` / Compile / fullOptJS).value.data, - (`scaladoc-js-main` / Compile / fullOptJS).value.data, - (`scaladoc-js-contributors` / Compile / baseDirectory).value / "css", - (`scaladoc-js-common` / Compile / baseDirectory).value / "css", - (Compile / resourceManaged).value, - ) - }.taskValue, + Compile / resourceGenerators += generateStaticAssetsTask.taskValue, libraryDependencies ++= Dependencies.flexmarkDeps ++ Seq( "nl.big-o" % "liqp" % "0.8.2", "org.jsoup" % "jsoup" % "1.14.3", // Needed to process .html files for static site @@ -1382,6 +1384,8 @@ object Build { generateReferenceDocumentation := Def.inputTaskDyn { val shouldRegenerateExpectedLinks = literal("--no-regenerate-expected-links").?.parsed.isEmpty + generateStaticAssetsTask.value + val temp = IO.createTemporaryDirectory IO.copyDirectory(file("docs"), temp / "docs") IO.delete(temp / "docs" / "_blog")