From 001de413b52e238942212efa26c004209fe9999a Mon Sep 17 00:00:00 2001 From: Ben List Date: Tue, 17 Aug 2021 12:28:43 -0400 Subject: [PATCH] renamed publishResolver to avoid conflicts with user resolvers --- build.sbt | 2 +- src/main/scala/com/gilcloud/sbt/gitlab/GitlabPlugin.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index a6a3399..93bcb58 100644 --- a/build.sbt +++ b/build.sbt @@ -1,6 +1,6 @@ name := "sbt-gitlab" organization := "com.gilcloud" -version := "0.0.6" +version := "0.0.7" description := "publishing and dependency resolution for gitlab both private and hosted using header auth" sbtPlugin := true diff --git a/src/main/scala/com/gilcloud/sbt/gitlab/GitlabPlugin.scala b/src/main/scala/com/gilcloud/sbt/gitlab/GitlabPlugin.scala index 8a164e0..f34379e 100644 --- a/src/main/scala/com/gilcloud/sbt/gitlab/GitlabPlugin.scala +++ b/src/main/scala/com/gilcloud/sbt/gitlab/GitlabPlugin.scala @@ -107,8 +107,8 @@ object GitlabPlugin extends AutoPlugin { .value, publish := publish.dependsOn(headerAuthHandler).value, publishTo := (ThisProject / publishTo).value.orElse { - gitlabProjectId.value.map(p => "gitlab-maven" at s"https://${gitlabDomain.value}/api/v4/projects/$p/packages/maven") orElse - gitlabGroupId.value.map(g => "gitlab-maven" at s"https://${gitlabDomain.value}/api/v4/groups/$g/-/packages/maven") + gitlabProjectId.value.map(p => "gilcloud-sbt-gitlab-maven" at s"https://${gitlabDomain.value}/api/v4/projects/$p/packages/maven") orElse + gitlabGroupId.value.map(g => "gilcloud-sbt-gitlab-maven" at s"https://${gitlabDomain.value}/api/v4/groups/$g/-/packages/maven") } ) }