Refactoring

Author: armanbilge

kernel/src/main/scala/org/typelevel/sbt/TypelevelKernelPlugin.scala

@@ -40,35 +40,6 @@ object TypelevelKernelPlugin extends AutoPlugin {
         }
       })
 
-    private[sbt] lazy val currentRelease: Def.Initialize[Option[String]] = Def.setting {
-      // some tricky logic here ...
-      // if the latest release is a pre-release (e.g., M or RC)
-      // and there are no stable releases it is bincompatible with,
-      // then for all effective purposes it is the current release
-
-      val release = previousReleases.value match {
-        case head :: tail if head.isPrerelease =>
-          tail
-            .filterNot(_.isPrerelease)
-            .find(head.copy(prerelease = None).mustBeBinCompatWith(_))
-            .orElse(Some(head))
-        case releases => releases.headOption
-      }
-
-      release.map(_.toString)
-    }
-
-    // latest tagged release, including pre-releases
-    private[sbt] lazy val currentPreRelease: Def.Initialize[Option[String]] = Def.setting {
-      previousReleases.value.headOption.map(_.toString)
-    }
-
-    private[sbt] lazy val previousReleases: Def.Initialize[List[V]] = Def.setting {
-      val currentVersion = V(version.value).map(_.copy(prerelease = None))
-      GitHelper.previousReleases(fromHead = true, strict = false).filter { v =>
-        currentVersion.forall(v.copy(prerelease = None) <= _)
-      }
-    }
   }
 
   import autoImport._
@@ -115,4 +86,34 @@ object TypelevelKernelPlugin extends AutoPlugin {
     }
   }
 
+  private[sbt] lazy val currentRelease: Def.Initialize[Option[String]] = Def.setting {
+    // some tricky logic here ...
+    // if the latest release is a pre-release (e.g., M or RC)
+    // and there are no stable releases it is bincompatible with,
+    // then for all effective purposes it is the current release
+
+    val release = previousReleases.value match {
+      case head :: tail if head.isPrerelease =>
+        tail
+          .filterNot(_.isPrerelease)
+          .find(head.copy(prerelease = None).mustBeBinCompatWith(_))
+          .orElse(Some(head))
+      case releases => releases.headOption
+    }
+
+    release.map(_.toString)
+  }
+
+  // latest tagged release, including pre-releases
+  private[sbt] lazy val currentPreRelease: Def.Initialize[Option[String]] = Def.setting {
+    previousReleases.value.headOption.map(_.toString)
+  }
+
+  private[this] lazy val previousReleases: Def.Initialize[List[V]] = Def.setting {
+    val currentVersion = V(version.value).map(_.copy(prerelease = None))
+    GitHelper.previousReleases(fromHead = true, strict = false).filter { v =>
+      currentVersion.forall(v.copy(prerelease = None) <= _)
+    }
+  }
+
 }

site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala

@@ -36,6 +36,7 @@ import MdocPlugin.autoImport._
 import LaikaPlugin.autoImport._
 import gha.GenerativePlugin
 import GenerativePlugin.autoImport._
+import TypelevelKernelPlugin._
 import TypelevelKernelPlugin.autoImport._
 
 object TypelevelSitePlugin extends AutoPlugin {

versioning/src/main/scala/org/typelevel/sbt/TypelevelVersioningPlugin.scala

@@ -18,7 +18,7 @@ package org.typelevel.sbt
 
 import com.typesafe.sbt.GitPlugin
 import com.typesafe.sbt.SbtGit.git
-import org.typelevel.sbt.TypelevelKernelPlugin.autoImport._
+import org.typelevel.sbt.TypelevelKernelPlugin._
 import org.typelevel.sbt.kernel.GitHelper
 import org.typelevel.sbt.kernel.V
 import sbt._