From 64ae7077080a5a14dfec93e1cd8c345bb6be1da4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Wro=C5=84ski?= Date: Tue, 8 Aug 2023 15:58:29 +0200 Subject: [PATCH] Fix ref doc - ignore setting project version to avoid error during releases --- .../src/main/scala/scala/cli/doc/GenerateReferenceDoc.scala | 5 +++-- website/docs/reference/build-info.md | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/modules/generate-reference-doc/src/main/scala/scala/cli/doc/GenerateReferenceDoc.scala b/modules/generate-reference-doc/src/main/scala/scala/cli/doc/GenerateReferenceDoc.scala index b808c37c6b..9db3c067e4 100644 --- a/modules/generate-reference-doc/src/main/scala/scala/cli/doc/GenerateReferenceDoc.scala +++ b/modules/generate-reference-doc/src/main/scala/scala/cli/doc/GenerateReferenceDoc.scala @@ -12,6 +12,7 @@ import java.nio.charset.StandardCharsets import java.util import scala.build.info.{ArtifactId, BuildInfo, ExportDependencyFormat, ScopedBuildInfo} +import scala.build.internal.Constants import scala.build.options.{BuildOptions, BuildRequirements, WithBuildRequirements} import scala.build.preprocessing.directives.DirectiveHandler import scala.build.preprocessing.directives.DirectivesPreprocessingUtils.* @@ -19,7 +20,6 @@ import scala.cli.commands.{ScalaCommand, SpecificationLevel, tags} import scala.cli.doc.ReferenceDocUtils.* import scala.cli.util.ArgHelpers.* import scala.cli.{ScalaCli, ScalaCliCommands} - object GenerateReferenceDoc extends CaseApp[InternalDocOptions] { implicit class PBUtils(sb: StringBuilder) { @@ -562,7 +562,8 @@ object GenerateReferenceDoc extends CaseApp[InternalDocOptions] { scalaJsVersion = None, jsEsVersion = None, scalaNativeVersion = None, - mainClass = Some("Main") + mainClass = Some("Main"), + projectVersion = None ) .withScope("main", mainScopedBuildInfo) .withScope("test", testScopedBuildInfo) diff --git a/website/docs/reference/build-info.md b/website/docs/reference/build-info.md index 8738e905f8..c6afc59442 100644 --- a/website/docs/reference/build-info.md +++ b/website/docs/reference/build-info.md @@ -50,7 +50,7 @@ object BuildInfo { /** Main class specified for the project */ val mainClass = Some("Main") /** Project version */ - val projectVersion = Some("1.0.3-SNAPSHOT") + val projectVersion = None /** Information about the Main scope */ object Main {