diff --git a/.forgejo/workflows/pull_request.yaml b/.forgejo/workflows/pull_request.yaml index d331681..81e4593 100644 --- a/.forgejo/workflows/pull_request.yaml +++ b/.forgejo/workflows/pull_request.yaml @@ -45,23 +45,24 @@ jobs: echo "Previous Git Tag: $latest_git_tag" echo "Latest Commit: $latest_commit_message ($GS_RELEASE_TYPE) (SNAPSHOT)" if [ "$GS_RELEASE_TYPE" = "norelease" ]; then - sbtn -Dsnapshot=true -Drelease="patch" semVerInfo + sbt setVersion patch snapshot else - sbtn -Dsnapshot=true -Drelease="$GS_RELEASE_TYPE" semVerInfo + sbt setVersion $GS_RELEASE_TYPE snapshot fi + sbt semVerInfo - name: 'Unit Tests and Code Coverage' run: | - sbtn clean - sbtn coverage - sbtn test - sbtn coverageReport + sbt clean + sbt coverage + sbt test + sbt coverageReport - name: 'Publish Snapshot' run: | echo "Testing env var propagation = ${{ env.GS_RELEASE_TYPE }}" if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then echo "Skipping publish due to GS_RELEASE_TYPE=norelease" else - sbtn coverageOff - sbtn clean - sbtn publish + sbt coverageOff + sbt clean + sbt publish fi diff --git a/.forgejo/workflows/release.yaml b/.forgejo/workflows/release.yaml index 72fac7d..eba667f 100644 --- a/.forgejo/workflows/release.yaml +++ b/.forgejo/workflows/release.yaml @@ -51,27 +51,28 @@ jobs: if [ "$GS_RELEASE_TYPE" = "norelease" ]; then echo "Skipping all versioning for 'norelease' commit." else - sbtn -Drelease="$GS_RELEASE_TYPE" semVerInfo + sbt setVersion $GS_RELEASE_TYPE release + sbt semVerInfo fi - name: 'Unit Tests and Code Coverage' run: | if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then echo "Skipping build/test for 'norelease' commit." else - sbtn clean - sbtn coverage - sbtn test - sbtn coverageReport + sbt clean + sbt coverage + sbt test + sbt coverageReport fi - name: 'Publish Release' run: | if [ "${{ env.GS_RELEASE_TYPE }}" = "norelease" ]; then echo "Skipping publish for 'norelease' commit." else - sbtn coverageOff - sbtn clean - sbtn semVerWriteVersionToFile - sbtn publish + sbt coverageOff + sbt clean + sbt semVerWriteVersionToFile + sbt publish fi - name: 'Create Git Tag' run: | diff --git a/build.sbt b/build.sbt index 009cfaf..5bb15cb 100644 --- a/build.sbt +++ b/build.sbt @@ -1,4 +1,4 @@ -val scala3: String = "3.8.3" +val scala3: String = "3.8.4" ThisBuild / scalaVersion := scala3 ThisBuild / versionScheme := Some("semver-spec") @@ -10,32 +10,26 @@ ThisBuild / licenses := Seq( ) ) -val noPublishSettings = Seq( - publish := {} -) - val sharedSettings = Seq( scalaVersion := scala3, - version := semVerSelected.value, coverageFailOnMinimum := true // coverageMinimumStmtTotal := 100, // coverageMinimumBranchTotal := 100 ) -val Deps = new { +val Deps = ( + Cats = ( + Core = "org.typelevel" %% "cats-core" % "2.13.0", + Effect = "org.typelevel" %% "cats-effect" % "3.7.0" + ), - val Cats = new { - val Core: ModuleID = "org.typelevel" %% "cats-core" % "2.13.0" - val Effect: ModuleID = "org.typelevel" %% "cats-effect" % "3.7.0" - } + Fs2 = ( + Core = "co.fs2" %% "fs2-core" % "3.13.0", + IO = "co.fs2" %% "fs2-io" % "3.13.0" + ), - val Fs2 = new { - val Core: ModuleID = "co.fs2" %% "fs2-core" % "3.13.0" - val IO: ModuleID = "co.fs2" %% "fs2-io" % "3.13.0" - } - - val MUnit: ModuleID = "org.scalameta" %% "munit" % "1.3.0" % Test -} + MUnit = "org.scalameta" %% "munit" % "1.3.0" % Test +) lazy val testSettings = Seq( libraryDependencies ++= Seq( diff --git a/project/build.properties b/project/build.properties index df061f4..3b9dfab 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.12.9 +sbt.version=2.0.3 diff --git a/project/plugins.sbt b/project/plugins.sbt index 9691bc6..d4645ed 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -30,5 +30,5 @@ externalResolvers := Seq( ) addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4") -addSbtPlugin("gs" % "sbt-garrity-software" % "0.7.0") -addSbtPlugin("gs" % "sbt-gs-semver" % "0.3.0") +addSbtPlugin("gs" % "sbt-garrity-software" % "0.8.0") +addSbtPlugin("gs" % "sbt-gs-semver" % "0.4.1")