Merge pull request #398 from armanbilge/issue/336

Move GitHub-related settings to GitHub plugin
typelevel · Oct 21, 2022 · cc38be3 · cc38be3
2 parents eb1c65c + 59ad691
commit cc38be3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 14 deletions.
diff --git a/github/src/main/scala/org/typelevel/sbt/TypelevelGitHubPlugin.scala b/github/src/main/scala/org/typelevel/sbt/TypelevelGitHubPlugin.scala
@@ -73,14 +73,21 @@ object TypelevelGitHubPlugin extends AutoPlugin {
       val tagOrHash =
         GitHelper.getTagOrHash(git.gitCurrentTags.value, git.gitHeadCommit.value)
       val userRepo = gitHubUserRepo.value
+      val infoOpt = scmInfo.value
 
       if (tlIsScala3.value)
         tagOrHash.toSeq flatMap { vh =>
           userRepo.toSeq flatMap {
             case (user, repo) => Seq(s"-source-links:github://${user}/${repo}", "-revision", vh)
           }
         }
-      else Nil // TODO move from settings plugin
+      else
+        tagOrHash.toSeq flatMap { vh =>
+          infoOpt.toSeq flatMap { info =>
+            val path = s"${info.browseUrl}/blob/${vh}€{FILE_PATH}.scala"
+            Seq("-doc-source-url", path)
+          }
+        }
     }
   )
 

diff --git a/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala b/settings/src/main/scala/org/typelevel/sbt/TypelevelSettingsPlugin.scala
@@ -17,8 +17,6 @@
 package org.typelevel.sbt
 
 import com.github.sbt.git.GitPlugin
-import com.github.sbt.git.SbtGit.git
-import org.typelevel.sbt.kernel.GitHelper
 import org.typelevel.sbt.kernel.V
 import sbt._
 import sbtcrossproject.CrossPlugin.autoImport._
@@ -191,19 +189,9 @@ object TypelevelSettingsPlugin extends AutoPlugin {
       Seq("-sourcepath", (LocalRootProject / baseDirectory).value.getAbsolutePath)
     },
     Compile / doc / scalacOptions ++= {
-      val tagOrHash =
-        GitHelper.getTagOrHash(git.gitCurrentTags.value, git.gitHeadCommit.value)
-      val infoOpt = scmInfo.value
-
       if (tlIsScala3.value)
         Seq("-project-version", version.value)
-      else // TODO move to GitHub plugin
-        tagOrHash.toSeq flatMap { vh =>
-          infoOpt.toSeq flatMap { info =>
-            val path = s"${info.browseUrl}/blob/${vh}€{FILE_PATH}.scala"
-            Seq("-doc-source-url", path)
-          }
-        }
+      else Nil
     },
     javacOptions ++= Seq(
       "-encoding",