diff --git a/github/src/main/scala/org/typelevel/sbt/TypelevelGitHubPlugin.scala b/github/src/main/scala/org/typelevel/sbt/TypelevelGitHubPlugin.scala index 47365114..ea05483f 100644 --- a/github/src/main/scala/org/typelevel/sbt/TypelevelGitHubPlugin.scala +++ b/github/src/main/scala/org/typelevel/sbt/TypelevelGitHubPlugin.scala @@ -73,6 +73,7 @@ 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 => @@ -80,7 +81,13 @@ object TypelevelGitHubPlugin extends AutoPlugin { 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 index 08098f53..e592fda8 100644 --- 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",