From d3ed869bcc10e26b37e04312f6218d187ab7d79b Mon Sep 17 00:00:00 2001 From: Daniel Spiewak Date: Sun, 15 Mar 2020 23:33:10 -0600 Subject: [PATCH] Made scmInfo and homepage fallback on previous values --- src/main/scala/sbtghpackages/GitHubPackagesPlugin.scala | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/scala/sbtghpackages/GitHubPackagesPlugin.scala b/src/main/scala/sbtghpackages/GitHubPackagesPlugin.scala index b00acc7..a2914fe 100644 --- a/src/main/scala/sbtghpackages/GitHubPackagesPlugin.scala +++ b/src/main/scala/sbtghpackages/GitHubPackagesPlugin.scala @@ -86,17 +86,21 @@ object GitHubPackagesPlugin extends AutoPlugin { resolvers ++= githubOwner.?.value.toSeq.map(Resolver.githubPackages(_)), scmInfo := { - for { + val back = for { owner <- githubOwner.?.value repo <- githubRepository.?.value } yield ScmInfo(url(s"https://github.com/$owner/$repo"), s"scm:git@github.com:$owner/$repo.git") + + back.orElse(scmInfo.value) }, homepage := { - for { + val back = for { owner <- githubOwner.?.value repo <- githubRepository.?.value } yield url(s"https://github.com/$owner/$repo") + + back.orElse(homepage.value) }, pomIncludeRepository := (_ => false),