Update version tagging scheme

Author: adamw

.github/workflows/main.yml

@@ -4,7 +4,7 @@ on:
     branches: ['**']
   push:
     branches: ['**']
-    tags: [v*]
+    tags: [scala2-v*]
 jobs:
   ci:
     # run on external PRs, but not on internal PRs since those will be run by push to branch
@@ -41,7 +41,7 @@ jobs:
   publish:
     name: Publish release
     needs: [ci]
-    if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/v'))
+    if: github.event_name != 'pull_request' && (startsWith(github.ref, 'refs/tags/scala2-v'))
     runs-on: ubuntu-20.04
     env:
       STTP_NATIVE: 1
@@ -72,7 +72,7 @@ jobs:
           SONATYPE_PASSWORD: ${{ secrets.SONATYPE_PASSWORD }}
       - name: Extract version from commit message
         run: |
-          version=${GITHUB_REF/refs\/tags\/v/}
+          version=${GITHUB_REF/refs\/tags\/scala2-v/}
           echo "VERSION=$version" >> $GITHUB_ENV
         env:
           COMMIT_MSG: ${{ github.event.head_commit.message }}
@@ -81,8 +81,8 @@ jobs:
         with:
           config-name: release-drafter.yml
           publish: true
-          name: "v${{ env.VERSION }}"
-          tag: "v${{ env.VERSION }}"
+          name: "scala2-v${{ env.VERSION }}"
+          tag: "scala2-v${{ env.VERSION }}"
           version: "v${{ env.VERSION }}"
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

build.sbt

@@ -5,6 +5,7 @@ val scala2_13 = "2.13.6"
 val scala2 = List(scala2_12, scala2_13)
 
 excludeLintKeys in Global ++= Set(ideSkipProject)
+ThisBuild / dynverTagPrefix := "scala2-v" // a custom prefix is needed to differentiate tags between scala2 & scala3 versions
 
 val commonSettings = commonSmlBuildSettings ++ ossPublishSettings ++ Seq(
   organization := "com.softwaremill.magnolia1_2",

project/build.properties

@@ -1 +1 @@
-sbt.version=1.5.3
+sbt.version=1.5.5

project/plugins.sbt

@@ -1,8 +1,8 @@
 addSbtPlugin("com.eed3si9n" % "sbt-projectmatrix" % "0.8.0")
 
-val sbtSoftwareMillVersion = "2.0.5"
+val sbtSoftwareMillVersion = "2.0.6"
 addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-common" % sbtSoftwareMillVersion)
 addSbtPlugin("com.softwaremill.sbt-softwaremill" % "sbt-softwaremill-publish" % sbtSoftwareMillVersion)
 
 addSbtPlugin("org.jetbrains.scala" % "sbt-ide-settings" % "1.1.1")
-addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0")
+addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.6.0")