From a57c94a198a388ca09840b64ddd2a161360e84ad Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Tue, 10 Dec 2024 08:49:30 -0500 Subject: [PATCH] ci: More setup changes --- .github/workflows/release.yml | 1 + build.sbt | 6 ++++++ project/build.properties | 2 +- 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 74a3b60..d64b36c 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,6 +19,7 @@ jobs: distribution: temurin java-version: 8 cache: sbt + - uses: sbt/setup-sbt@v1 - name: Test run: | gpg --import test-key.gpg diff --git a/build.sbt b/build.sbt index 5ab500f..2628913 100644 --- a/build.sbt +++ b/build.sbt @@ -50,6 +50,12 @@ lazy val plugin = (project in file("sbt-pgp")) case "2.12" => "1.5.8" case _ => "2.0.0-M2" } + }, + scriptedSbt := { + scalaBinaryVersion.value match { + case "2.12" => "1.10.6" + case _ => (pluginCrossBuild / sbtVersion).value + } } ) diff --git a/project/build.properties b/project/build.properties index 0b699c3..e88a0d8 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.10.2 +sbt.version=1.10.6