Skip to content

Commit b268233

Browse files
authored
Merge pull request #26 from scalacenter/sonatype
Publish to Sonatype
2 parents d38f7d3 + f86b86c commit b268233

File tree

16 files changed

+55
-24
lines changed

16 files changed

+55
-24
lines changed

.github/workflows/release.yml

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
ame: Release
2+
on: workflow_dispatch
3+
4+
jobs:
5+
release:
6+
name: Release
7+
runs-on: ubuntu-latest
8+
env:
9+
PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }}
10+
SONATYPE_USERNAME: ${{ secrets.SONATYPE_USERNAME }}
11+
SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
12+
steps:
13+
- uses: actions/checkout@v3
14+
- uses: actions/setup-java@v3
15+
with:
16+
distribution: temurin
17+
java-version: 8.0.372+7
18+
cache: sbt
19+
gpg-private-key: ${{ secrets.PGP_SECRET }}
20+
gpg-passphrase: PGP_PASSPHRASE
21+
- run: git config user.email "[email protected]"
22+
- run: git config user.name "sbt release bot"
23+
- name: Push tag
24+
run: sbt release with-defaults

.github/workflows/scala.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,12 @@ jobs:
1212
runs-on: ubuntu-latest
1313

1414
steps:
15-
- uses: actions/checkout@v2
15+
- uses: actions/checkout@v3
1616
- name: Set up JDK 1.8
17-
uses: actions/setup-java@v1
17+
uses: actions/setup-java@v3
1818
with:
19-
java-version: 1.8
19+
distribution: temurin
20+
java-version: 8.0.372+7
21+
cache: sbt
2022
- name: Run tests
2123
run: sbt "^ scripted"

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ This sbt plugin adds Java agents to projects in a general way. It can enable age
77
Add the plugin to your `project/plugins.sbt`:
88

99
```scala
10-
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % versionNumber)
10+
addSbtPlugin("com.github.sbt" % "sbt-javaagent" % versionNumber)
11+
// Until version 0.1.6
12+
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % "0.1.6")
1113
```
1214

1315
See [sbt-javaagent releases] for a list of released versions.

build.sbt

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ lazy val `sbt-javaagent` = project in file(".")
77
sbtPlugin := true
88

99
name := "sbt-javaagent"
10-
organization := "com.lightbend.sbt"
10+
organization := "com.github.sbt"
1111

1212
// sbt cross build
1313
crossSbtVersions := Seq("0.13.18", "1.2.8")
@@ -79,12 +79,14 @@ scriptedDependencies := {
7979
}
8080

8181
// publish settings
82-
publishMavenStyle := false
83-
bintrayOrganization := Some("sbt")
84-
bintrayRepository := "sbt-plugin-releases"
85-
bintrayPackage := "sbt-javaagent"
86-
bintrayReleaseOnPublish := false
82+
publishMavenStyle := true
8783
licenses += "Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0.html")
84+
scmInfo := Some(ScmInfo(url("https://github.com/sbt/sbt-javaagent"), "scm:git:[email protected]:sbt/sbt-javaagent.git"))
85+
homepage := scmInfo.value.map(_.browseUrl)
86+
developers := List(
87+
Developer("contributors", "Contributors", "https://github.com/sbt/sbt-javaagent/discussions", url("https://github.com/sbt/sbt-javaagent/graphs/contributors"))
88+
)
89+
publishTo := sonatypePublishTo.value
8890

8991
// release settings
9092
import ReleaseTransformations._
@@ -96,8 +98,8 @@ releaseProcess := Seq[ReleaseStep](
9698
setReleaseVersion,
9799
commitReleaseVersion,
98100
tagRelease,
99-
releaseStepCommandAndRemaining("^ publish"),
100-
releaseStepTask(bintrayRelease),
101+
releaseStepCommandAndRemaining("^ publishSigned"),
102+
releaseStepCommand("sonatypeReleaseAll"),
101103
setNextVersion,
102104
commitNextVersion,
103105
pushChanges

project/plugins.sbt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
*/
44

55
addSbtPlugin("com.github.gseitz" % "sbt-release" % "1.0.6")
6-
addSbtPlugin("me.lessis" % "bintray-sbt" % "0.3.0")
6+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "2.3")
7+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
78

89
libraryDependencies += "org.scala-sbt" % "scripted-plugin" % sbtVersion.value
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % sys.props("project.version"))
1+
addSbtPlugin("com.github.sbt" % "sbt-javaagent" % sys.props("project.version"))
22
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("packager.10x.version"))
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % sys.props("project.version"))
1+
addSbtPlugin("com.github.sbt" % "sbt-javaagent" % sys.props("project.version"))
22
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("packager.11x.version"))
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % sys.props("project.version"))
1+
addSbtPlugin("com.github.sbt" % "sbt-javaagent" % sys.props("project.version"))
22
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("packager.version"))
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % sys.props("project.version"))
1+
addSbtPlugin("com.github.sbt" % "sbt-javaagent" % sys.props("project.version"))
22
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("packager.version"))
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
addSbtPlugin("com.lightbend.sbt" % "sbt-javaagent" % sys.props("project.version"))
1+
addSbtPlugin("com.github.sbt" % "sbt-javaagent" % sys.props("project.version"))
22
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % sys.props("packager.version"))

0 commit comments

Comments
 (0)