From a323568e7cf20a075875bd8bb14e5bcded2934c3 Mon Sep 17 00:00:00 2001 From: Jamie Thompson Date: Thu, 25 Aug 2022 18:29:17 +0200 Subject: [PATCH 1/2] update quick links for new ui --- project/Build.scala | 12 ++++++------ project/scripts/cmdScaladocTests | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project/Build.scala b/project/Build.scala index 255196dd9960..c9a01aa3c549 100644 --- a/project/Build.scala +++ b/project/Build.scala @@ -1498,7 +1498,7 @@ object Build { .add(OutputDir("scaladoc/output/reference")) .add(SiteRoot(s"${temp.getAbsolutePath}/docs")) .add(ProjectName("Scala 3 Reference")) - .add(ProjectVersion("3.1.2")) // TODO: Change that later to the current version tag. (This must happen on first forward this branch to stable release tag) + .add(ProjectVersion("3.1.3")) // TODO: Change that later to the current version tag. (This must happen on first forward this branch to stable release tag) .remove[VersionsDictionaryUrl] .add(SourceLinks(List( s"${temp.getAbsolutePath}=github://lampepfl/dotty/language-reference-stable" @@ -1901,12 +1901,12 @@ object ScaladocConfigs { Groups(true), QuickLinks( List( - "Download::https://www.scala-lang.org/download/", - "Documentation::https://docs.scala-lang.org/", - "Libraries::https://index.scala-lang.org", - "Contribute::https://www.scala-lang.org/contribute/", + "Learn::https://docs.scala-lang.org/", + "Install::https://www.scala-lang.org/download/", + "Playground::https://scastie.scala-lang.org", + "Find\u00A0A\u00A0Library::https://index.scala-lang.org", + "Community::https://www.scala-lang.org/community/", "Blog::https://www.scala-lang.org/blog/", - "Community::https://www.scala-lang.org/community/" ) ) ) diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index 37ee0bd7727c..b068f396a8d2 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -40,6 +40,6 @@ dist/target/pack/bin/scaladoc \ -project-footer "Copyright (c) 2002-2022, LAMP/EPFL" \ -default-template static-site-main \ -author -groups -revision main -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ - "-quick-links:Download::https://www.scala-lang.org/download/,Documentation::https://docs.scala-lang.org/,Libraries::https://index.scala-lang.org,Contribute::https://www.scala-lang.org/contribute/,Blog::https://www.scala-lang.org/blog/,Community::https://www.scala-lang.org/community/" \ + "-quick-links:Learn::https://docs.scala-lang.org/,Install::https://www.scala-lang.org/download/,Playground::https://scastie.scala-lang.org,Find\u00A0A\u00A0Library::https://index.scala-lang.org,Community::https://www.scala-lang.org/community/,Blog::https://www.scala-lang.org/blog/" \ out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts" diff -rq "$OUT1" "scaladoc/output/testcases" From 387f7bb6fdc1786370b14af37ab30f8c8eae6555 Mon Sep 17 00:00:00 2001 From: Julien Richard-Foy Date: Thu, 6 Oct 2022 14:26:47 +0200 Subject: [PATCH 2/2] Use non-breakable spaces instead of \u00A0 --- project/scripts/cmdScaladocTests | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project/scripts/cmdScaladocTests b/project/scripts/cmdScaladocTests index b068f396a8d2..f73e996e3dac 100755 --- a/project/scripts/cmdScaladocTests +++ b/project/scripts/cmdScaladocTests @@ -40,6 +40,6 @@ dist/target/pack/bin/scaladoc \ -project-footer "Copyright (c) 2002-2022, LAMP/EPFL" \ -default-template static-site-main \ -author -groups -revision main -project-version "${DOTTY_BOOTSTRAPPED_VERSION}" \ - "-quick-links:Learn::https://docs.scala-lang.org/,Install::https://www.scala-lang.org/download/,Playground::https://scastie.scala-lang.org,Find\u00A0A\u00A0Library::https://index.scala-lang.org,Community::https://www.scala-lang.org/community/,Blog::https://www.scala-lang.org/blog/" \ + "-quick-links:Learn::https://docs.scala-lang.org/,Install::https://www.scala-lang.org/download/,Playground::https://scastie.scala-lang.org,Find A Library::https://index.scala-lang.org,Community::https://www.scala-lang.org/community/,Blog::https://www.scala-lang.org/blog/" \ out/bootstrap/scaladoc-testcases/scala-"${DOTTY_NONBOOTSTRAPPED_VERSION}"/classes > "$tmp" 2>&1 || echo "generated testcases project with scripts" diff -rq "$OUT1" "scaladoc/output/testcases"