Skip to content

Commit bbdcd91

Browse files
committed

File tree

5 files changed

+32
-46
lines changed

5 files changed

+32
-46
lines changed

.github/workflows/release.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Release
2+
3+
on:
4+
workflow_dispatch:
5+
6+
jobs:
7+
release:
8+
uses: guardian/gha-scala-library-release-workflow/.github/workflows/reusable-release.yml@v1
9+
permissions: { contents: write, pull-requests: write }
10+
with:
11+
GITHUB_APP_ID: 930725
12+
SONATYPE_PROFILE_NAME: 'com.madgag'
13+
SONATYPE_CREDENTIAL_HOST: 's01.oss.sonatype.org'
14+
secrets:
15+
SONATYPE_TOKEN: ${{ secrets.AUTOMATED_MAVEN_RELEASE_SONATYPE_TOKEN }}
16+
PGP_PRIVATE_KEY: ${{ secrets.AUTOMATED_MAVEN_RELEASE_PGP_SECRET }}
17+
GITHUB_APP_PRIVATE_KEY: ${{ secrets.AUTOMATED_MAVEN_RELEASE_GITHUB_APP_PRIVATE_KEY }}

build.sbt

Lines changed: 11 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,25 @@
1-
import ReleaseTransformations._
2-
import Dependencies._
1+
import ReleaseTransformations.*
2+
import sbtversionpolicy.withsbtrelease.ReleaseVersion
3+
import Dependencies.*
34

4-
lazy val baseSettings = Seq(
5+
lazy val artifactProducingProjectSettings = Seq(
56
scalaVersion := "2.13.16",
67
organization := "com.madgag.scala-git",
7-
scmInfo := Some(ScmInfo(
8-
url("https://github.com/rtyley/scala-git"),
9-
"scm:git:[email protected]:rtyley/scala-git.git"
10-
)),
118
licenses := Seq(License.Apache2),
12-
scalacOptions ++= Seq("-deprecation", "-unchecked"),
9+
scalacOptions ++= Seq("-deprecation", "-unchecked", "-release:11"),
1310
libraryDependencies ++= Seq(madgagCompress % Test, scalatest % Test)
1411
)
1512

16-
lazy val `scala-git` = project.settings(baseSettings: _*).dependsOn(`scala-git-test` % Test)
13+
lazy val `scala-git` = project.settings(artifactProducingProjectSettings *).dependsOn(`scala-git-test` % Test)
1714

18-
lazy val `scala-git-test` = project.in(file("scala-git-test")).settings(baseSettings: _*)
15+
lazy val `scala-git-test` = project.in(file("scala-git-test")).settings(artifactProducingProjectSettings *)
1916

2017
ThisBuild / Test / testOptions +=
2118
Tests.Argument(TestFrameworks.ScalaTest, "-u", s"test-results/scala-${scalaVersion.value}", "-o")
2219

23-
24-
lazy val root = (project in file(".")).aggregate(`scala-git`, `scala-git-test`).
25-
settings(baseSettings: _*).settings(
26-
publishArtifact := false,
27-
publish := {},
28-
publishLocal := {},
20+
lazy val root = (project in file(".")).aggregate(`scala-git`, `scala-git-test`).settings(
21+
publish / skip := true,
22+
// releaseVersion := ReleaseVersion.fromAggregatedAssessedCompatibilityWithLatestRelease().value,
2923
releaseCrossBuild := true, // true if you cross-build the project for multiple Scala versions
3024
releaseProcess := Seq[ReleaseStep](
3125
checkSnapshotDependencies,
@@ -35,12 +29,8 @@ lazy val root = (project in file(".")).aggregate(`scala-git`, `scala-git-test`).
3529
setReleaseVersion,
3630
commitReleaseVersion,
3731
tagRelease,
38-
// For non cross-build projects, use releaseStepCommand("publishSigned")
39-
releaseStepCommandAndRemaining("+publishSigned"),
40-
releaseStepCommand("sonatypeBundleRelease"),
4132
setNextVersion,
42-
commitNextVersion,
43-
pushChanges
33+
commitNextVersion
4434
)
4535
)
4636

project/plugins.sbt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0")
1+
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
22

3-
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
3+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2")
44

5-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.21")
5+
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")

sonatype.sbt

Lines changed: 0 additions & 21 deletions
This file was deleted.

version.sbt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ThisBuild / version := "4.9-SNAPSHOT"
1+
ThisBuild / version := "5.0.0-SNAPSHOT"

0 commit comments

Comments
 (0)