Skip to content

Commit ac1ea64

Browse files
committed
Add workaround for invalid Sonatype URL
1 parent af3f19d commit ac1ea64

File tree

3 files changed

+11
-12
lines changed

3 files changed

+11
-12
lines changed

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ For most use cases you should add Scala2PlantUML as a global plugin since your b
3636
Create `~/.sbt/1.0/plugins/scala2PlantUML.sbt` containing:
3737

3838
```text
39-
addSbtPlugin("nz.co.bottech" % "sbt-scala2plantuml" % "0.1.9")
39+
addSbtPlugin("nz.co.bottech" % "sbt-scala2plantuml" % "0.1.10")
4040
```
4141

4242
## CLI
@@ -52,7 +52,7 @@ cs install --channel https://git.io/Jqv1i scala2plantuml
5252
### Usage
5353

5454
```text
55-
Scala2PlantUML version 0.1.9
55+
Scala2PlantUML version 0.1.10
5656
Usage: scala2plantuml [options] symbol
5757
5858
Scala2PlantUML generates PlantUML Class Diagrams from Scala SemanticDB files.

build.sbt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -87,19 +87,13 @@ inThisBuild(
8787
// This needs to be set otherwise the GitHub workflow plugin gets confused about which
8888
// version to use for the publish job.
8989
scalaVersion := scala212,
90-
versionPolicyFirstVersion := Some("0.1.9"),
90+
versionPolicyFirstVersion := Some("0.1.10"),
9191
versionPolicyIntention := Compatibility.BinaryAndSourceCompatible,
9292
versionScheme := Some("early-semver")
9393
)
9494
)
9595

96-
val sonatypeSettings = List(
97-
// Workaround for https://github.com/olafurpg/sbt-ci-release/issues/181
98-
sonatypeCredentialHost := "s01.oss.sonatype.org",
99-
sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
100-
)
101-
102-
val commonProjectSettings = sonatypeSettings ++ List(
96+
val commonProjectSettings = List(
10397
isScala213 := isScala213Setting.value,
10498
scalastyleFailOnError := true,
10599
scalastyleFailOnWarning := true,
@@ -127,11 +121,13 @@ val libraryProjectSettings = commonProjectSettings
127121
lazy val root = (project in file("."))
128122
.aggregate(cli, core, docs, sbtProject)
129123
.settings(metaProjectSettings)
130-
// The sbt-sonatype plugin requires these to go on the root project too.
131-
.settings(sonatypeSettings)
132124
.settings(
133125
crossScalaVersions := supportedScalaVersions,
134126
name := "scala2plantuml",
127+
// Workaround for https://github.com/olafurpg/sbt-ci-release/issues/181
128+
// These have to go on the root project.
129+
sonatypeCredentialHost := "s01.oss.sonatype.org",
130+
sonatypeRepository := "https://s01.oss.sonatype.org/service/local"
135131
)
136132

137133
lazy val core = project

project/plugins.sbt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,6 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.18
99
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.2")
1010
addSbtPlugin("org.scalastyle" %% "scalastyle-sbt-plugin" % "1.0.0")
1111
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "2.4.13")
12+
13+
lazy val root = (project in file(".")).dependsOn(sonatypePlugin)
14+
lazy val sonatypePlugin = RootProject(uri("git://github.com/steinybot/sbt-sonatype#5a0ace0551b5d58debbf4aae4a1b5f9b5d888ef1"))

0 commit comments

Comments
 (0)