From ead5b8a9b1b4846be7d481b3432fdd0009fe2033 Mon Sep 17 00:00:00 2001 From: Roberto Tyley Date: Fri, 17 Jan 2025 23:17:54 +0000 Subject: [PATCH] Use gha-scala-library-release-workflow --- build.sbt | 55 ++++++++++++++++------------------------ project/build.properties | 2 +- project/plugins.sbt | 6 ++--- sonatype.sbt | 14 ---------- 4 files changed, 26 insertions(+), 51 deletions(-) delete mode 100644 sonatype.sbt diff --git a/build.sbt b/build.sbt index bb1962f..7996c30 100644 --- a/build.sbt +++ b/build.sbt @@ -1,27 +1,24 @@ +import ReleaseTransformations.* +import sbtversionpolicy.withsbtrelease.ReleaseVersion + lazy val baseSettings = Seq( - scalaVersion := "2.13.10", organization := "com.madgag", - licenses := Seq("Apache-2.0" -> url("http://www.apache.org/licenses/LICENSE-2.0")), - publishTo := sonatypePublishToBundle.value, - scmInfo := Some(ScmInfo( - url("https://github.com/rtyley/line-break-preserving-line-splitting"), - "scm:git:git@github.com:rtyley/line-break-preserving-line-splitting.git" - )), - scalacOptions ++= Seq("-deprecation", "-unchecked") + licenses := Seq(License.Apache2), + scalacOptions ++= Seq("-deprecation", "-unchecked", "-release:11") ) name := "line-splitting-root" description := "Splits lines of text while preserving line breaks" -ThisBuild / scalaVersion := "2.13.10" +ThisBuild / scalaVersion := "2.13.16" lazy val lineSplitting = project.in(file("line-splitting")).settings( baseSettings, name := "line-break-preserving-line-splitting", - crossScalaVersions := Seq(scalaVersion.value, "3.2.1"), + crossScalaVersions := Seq(scalaVersion.value, "3.3.4"), libraryDependencies ++= Seq( - "org.scalatest" %% "scalatest" % "3.2.14" % Test, + "org.scalatest" %% "scalatest" % "3.2.19" % Test, "com.madgag" %% "scala-collection-plus" % "0.11" % Test ), Test/testOptions += Tests.Argument( @@ -37,31 +34,23 @@ lazy val docs = project.in(file("line-splitting-generated-docs")) // important: mdocOut := (ThisBuild / baseDirectory).value ) -import ReleaseTransformations._ - lazy val lineSplittingRoot = (project in file(".")) .aggregate( lineSplitting ) .settings(baseSettings).settings( - publishArtifact := false, - publish := {}, - publishLocal := {}, - releaseCrossBuild := true, // true if you cross-build the project for multiple Scala versions - releaseProcess := Seq[ReleaseStep]( - checkSnapshotDependencies, - inquireVersions, - runClean, - runTest, - setReleaseVersion, - commitReleaseVersion, - tagRelease, - // For non cross-build projects, use releaseStepCommand("publishSigned") - releaseStepCommandAndRemaining("+publishSigned"), - releaseStepCommand("sonatypeBundleRelease"), - setNextVersion, - commitNextVersion, - pushChanges - ) - + publish / skip := true, + releaseVersion := ReleaseVersion.fromAggregatedAssessedCompatibilityWithLatestRelease().value, + releaseCrossBuild := true, // true if you cross-build the project for multiple Scala versions + releaseProcess := Seq[ReleaseStep]( + checkSnapshotDependencies, + inquireVersions, + runClean, + runTest, + setReleaseVersion, + commitReleaseVersion, + tagRelease, + setNextVersion, + commitNextVersion + ) ) diff --git a/project/build.properties b/project/build.properties index 8b9a0b0..73df629 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.0 +sbt.version=1.10.7 diff --git a/project/plugins.sbt b/project/plugins.sbt index eb6bf3f..6a49cc6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,7 +1,7 @@ -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.12.2") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.15") +addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1") addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.2.24" ) \ No newline at end of file diff --git a/sonatype.sbt b/sonatype.sbt deleted file mode 100644 index 228e526..0000000 --- a/sonatype.sbt +++ /dev/null @@ -1,14 +0,0 @@ -sonatypeProfileName := "com.madgag" - -ThisBuild/sonatypeCredentialHost := "s01.oss.sonatype.org" - -ThisBuild / pomExtra := ( - https://github.com/rtyley/line-break-preserving-line-splitting - - - rtyley - Roberto Tyley - https://github.com/rtyley - - - )