evict correct nonbootstrapped version

Author: bishabosha

project/Build.scala

@@ -86,10 +86,7 @@ object DottyJSPlugin extends AutoPlugin {
 
 object Build {
   import ScaladocConfigs._
-
-  val referenceVersion = "3.4.2-RC1"
-
-  val baseVersion = "3.5.0-RC1"
+  import versionhelpers.DottyVersion._
 
   // LTS or Next
   val versionLine = "Next"
@@ -158,24 +155,6 @@ object Build {
   val dottyGithubUrl = "https://github.com/scala/scala3"
   val dottyGithubRawUserContentUrl = "https://raw.githubusercontent.com/scala/scala3"
 
-
-  val isRelease = sys.env.get("RELEASEBUILD") == Some("yes")
-
-  val dottyVersion = {
-    def isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes")
-    if (isRelease)
-      baseVersion
-    else if (isNightly)
-      baseVersion + "-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY"
-    else
-      baseVersion + "-bin-SNAPSHOT"
-  }
-  val dottyNonBootstrappedVersion = {
-    // Make sure sbt always computes the scalaBinaryVersion correctly
-    val bin = if (!dottyVersion.contains("-bin")) "-bin" else ""
-    dottyVersion + bin + "-nonbootstrapped"
-  }
-
   val sbtCommunityBuildVersion = "0.1.0-SNAPSHOT"
 
   val agentOptions = List(
@@ -625,7 +604,7 @@ object Build {
         val contents =                //2.11.11.v20170413-090219-8a413ba7cc
           s"""version.number=${version.value}
              |maven.version.number=${version.value}
-             |git.hash=${VersionUtil.gitHash}
+             |git.hash=${versionhelpers.VersionUtil.gitHash}
              |copyright.string=Copyright 2002-$currentYear, LAMP/EPFL
            """.stripMargin
 
@@ -665,7 +644,7 @@ object Build {
       // Spawn new JVM in run and test
 
       // Add git-hash used to package the distribution to the manifest to know it in runtime and report it in REPL
-      packageOptions += ManifestAttributes(("Git-Hash", VersionUtil.gitHash)),
+      packageOptions += ManifestAttributes(("Git-Hash", versionhelpers.VersionUtil.gitHash)),
 
       javaOptions ++= {
         val log = streams.value.log
@@ -2284,6 +2263,7 @@ object Build {
 
 object ScaladocConfigs {
   import Build._
+  import versionhelpers.DottyVersion._
   private lazy val currentYear: String = java.util.Calendar.getInstance().get(java.util.Calendar.YEAR).toString
 
   def dottyExternalMapping = ".*scala/.*::scaladoc3::https://dotty.epfl.ch/api/"
@@ -2363,7 +2343,7 @@ object ScaladocConfigs {
       .add(UseJavacp(true))
       .add(ProjectName("scaladoc"))
       .add(OutputDir("scaladoc/output/self"))
-      .add(Revision(VersionUtil.gitHash))
+      .add(Revision(versionhelpers.VersionUtil.gitHash))
       .add(ExternalMappings(List(dottyExternalMapping, javaExternalMapping)))
       .withTargets((Compile / classDirectory).value.getAbsolutePath :: Nil)
   }

project/DottyVersion.scala

@@ -0,0 +1,24 @@
+package versionhelpers
+
+object DottyVersion {
+  val isRelease = sys.env.get("RELEASEBUILD") == Some("yes")
+
+  val baseVersion = "3.5.0-RC1"
+
+  val referenceVersion = "3.4.2-RC1"
+
+  val dottyVersion = {
+    def isNightly = sys.env.get("NIGHTLYBUILD") == Some("yes")
+    if (isRelease)
+      baseVersion
+    else if (isNightly)
+      baseVersion + "-bin-" + VersionUtil.commitDate + "-" + VersionUtil.gitHash + "-NIGHTLY"
+    else
+      baseVersion + "-bin-SNAPSHOT"
+  }
+  val dottyNonBootstrappedVersion = {
+    // Make sure sbt always computes the scalaBinaryVersion correctly
+    val bin = if (!dottyVersion.contains("-bin")) "-bin" else ""
+    dottyVersion + bin + "-nonbootstrapped"
+  }
+}

project/RepublishPlugin.scala

@@ -11,10 +11,12 @@ import sbt.util.CacheImplicits._
 
 import scala.collection.mutable
 import java.nio.file.Files
+import versionhelpers.DottyVersion._
 
 /** This local plugin provides ways of publishing a project classpath and library dependencies to
  * .a local repository */
 object RepublishPlugin extends AutoPlugin {
+
   override def trigger = allRequirements
   override def requires = super.requires && PublishBinPlugin && PackPlugin
 
@@ -87,7 +89,9 @@ object RepublishPlugin extends AutoPlugin {
 
       localResolved.foreach({ resolved =>
         val simpleId = resolved.id
-        evicted += simpleId.copy(revision = simpleId.revision + "-nonbootstrapped")
+        if (simpleId.revision == dottyVersion) {
+          evicted += simpleId.copy(revision = dottyNonBootstrappedVersion)
+        }
         found(simpleId) = resolved
       })
 

project/VersionUtil.scala

@@ -1,3 +1,5 @@
+package versionhelpers
+
 import org.eclipse.jgit.storage.file.FileRepositoryBuilder
 import org.eclipse.jgit.lib.{Constants, ObjectId, Ref, Repository}
 import org.eclipse.jgit.revwalk.{RevCommit, RevWalk}