Skip to content

Commit 2c5666e

Browse files
authored
Merge pull request #471 from mkurz/remove-transitive-sbt-git
Remove totally unnecessary transitive sbt-git dependency (!)
2 parents 762d136 + 994ba24 commit 2c5666e

4 files changed

Lines changed: 2 additions & 7 deletions

File tree

build.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,5 @@ lazy val plugin = project
4242
},
4343
libraryDependencies += "org.scalameta" %% "munit" % "1.3.3" % Test,
4444
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1"),
45-
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0"),
4645
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
4746
)

plugin/src/main/scala/com/geirsson/CiReleasePlugin.scala

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ package com.geirsson
22

33
import com.geirsson.PipeFail.PipeFailOps
44
import PluginCompat.*
5-
import com.github.sbt.git.GitPlugin
6-
import com.github.sbt.git.SbtGit.GitKeys
75
import com.jsuereth.sbtpgp.SbtPgp
86
import com.jsuereth.sbtpgp.SbtPgp.autoImport.*
97

@@ -26,7 +24,7 @@ object CiReleasePlugin extends AutoPlugin {
2624

2725
override def trigger = allRequirements
2826
override def requires =
29-
JvmPlugin && SbtPgp && DynVerPlugin && GitPlugin
27+
JvmPlugin && SbtPgp && DynVerPlugin
3028

3129
def isSecure: Boolean =
3230
System.getenv("TRAVIS_SECURE_ENV_VARS") == "true" ||

project/plugins.sbt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@ Compile / unmanagedSourceDirectories +=
55
(ThisBuild / baseDirectory).value.getParentFile /
66
"plugin" / "src" / "main" / "scala-2.12"
77
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
8-
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
98
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
109
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.1")

readme.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,6 @@ By installing `sbt-ci-release` the following sbt plugins are also brought in:
9090
based on your git history
9191
- [sbt-pgp](https://github.com/sbt/sbt-pgp): to cryptographically sign the
9292
artifacts before publishing
93-
- [sbt-git](https://github.com/sbt/sbt-git): to automatically populate `scmInfo`
9493

9594
Make sure `build.sbt` does not define any of the following settings
9695

@@ -395,7 +394,7 @@ your environment.
395394
Yes, but the plugin is not released for sbt 0.13. The plugin source code is a
396395
single file which you can copy-paste into `project/CiReleasePlugin.scala` of
397396
your 0.13 build. Make sure you also
398-
`addSbtPlugin(sbt-dynver + sbt-sonatype + sbt-gpg + sbt-git)`.
397+
`addSbtPlugin(sbt-dynver + sbt-sonatype + sbt-gpg)`.
399398

400399
### How do I publish sbt plugins?
401400

0 commit comments

Comments
 (0)