diff --git a/.github/workflows/scala.yml b/.github/workflows/scala.yml index 3a241e5..c6a791d 100644 --- a/.github/workflows/scala.yml +++ b/.github/workflows/scala.yml @@ -12,12 +12,6 @@ jobs: build: runs-on: ubuntu-latest - strategy: - fail-fast: false - matrix: - scala: - - 2.12.20 - steps: - uses: actions/checkout@v4 with: @@ -36,14 +30,11 @@ jobs: ~/.ivy2/cache/ ~/.sbt/ ~/.coursier/ - key: | - ${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}-${{matrix.sbt-args}} - ${{runner.os}}-${{matrix.scala}}-${{hashFiles('**/*.sbt')}}- - ${{runner.os}}-${{matrix.scala}}- + key: ${{hashFiles('**/*.sbt')}} - name: Run tests - run: sbt ${{matrix.sbt-args}} ++${{ matrix.scala }} test scripted + run: sbt test scripted - name: Publish to Maven Central Repository env: GITHUB_PERSONAL_ACCESS_TOKEN: ${{secrets.PERSONAL_ACCESS_TOKEN}} if: ${{ env.GITHUB_PERSONAL_ACCESS_TOKEN != '' && github.event_name != 'pull_request' }} - run: sbt ${{matrix.sbt-args}} ++${{ matrix.scala }} "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}}-${{github.run_number}}-${{github.run_attempt}}-$$ ${{ matrix.scala }}\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease + run: sbt "set every Seq(sonatypeSessionName := \"${{github.workflow}} ${{github.run_id}}-${{github.run_number}}-${{github.run_attempt}}-$$ 2.12.20\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease diff --git a/build.sbt b/build.sbt index c9d8e57..6f4288b 100644 --- a/build.sbt +++ b/build.sbt @@ -2,10 +2,12 @@ enablePlugins(SbtPlugin) scriptedLaunchOpts += "-Dplugin.version=" + version.value -organization in ThisBuild := "com.thoughtworks.example" +ThisBuild / organization := "com.thoughtworks.example" name := "sbt-example" +scalaVersion := "2.12.20" + libraryDependencies += "org.scalameta" %% "scalameta" % "4.7.3" libraryDependencies += scalaOrganization.value % "scala-reflect" % scalaVersion.value % Provided