From 1e3de002636071a639f01ca8cfa7c140efce0618 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 4 Jan 2023 14:58:55 -0500 Subject: [PATCH 1/2] Downgrade to Ubuntu 20.04 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 8e74099..79e7f06 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ jobs: fail-fast: false matrix: include: - - os: ubuntu-latest + - os: ubuntu-20.04 java: 8 jobtype: 1 - os: macos-latest @@ -52,7 +52,7 @@ jobs: shell: bash run: sbt "buildNativeArtifacts; test" - name: Archive native artifacts (Linux) - if: ${{ matrix.os == 'ubuntu-latest' }} + if: ${{ matrix.os == 'ubuntu-20.04' }} uses: actions/upload-artifact@v2 with: name: dist-${{ runner.os }} From b11c393b87d0df7022f3604313cdd0c36991dc56 Mon Sep 17 00:00:00 2001 From: Eugene Yokota Date: Wed, 4 Jan 2023 14:59:15 -0500 Subject: [PATCH 2/2] Update to sbt 1.8.0 --- build.sbt | 1 - project/build.properties | 2 +- project/plugins.sbt | 3 ++- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 9f3f32c..ad5a391 100644 --- a/build.sbt +++ b/build.sbt @@ -47,7 +47,6 @@ buildDarwin := { inThisBuild( List( - version := "1.4.1-SNAPSHOT", organization := "org.scala-sbt.ipcsocket", organizationName := "sbt", organizationHomepage := Some(url("http://scala-sbt.org/")), diff --git a/project/build.properties b/project/build.properties index c8fcab5..8b9a0b0 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.6.2 +sbt.version=1.8.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index 1398132..da7fd69 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,2 +1,3 @@ -addSbtPlugin("com.jsuereth" % "sbt-pgp" % "1.1.0") +addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.0.0") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") addSbtPlugin("com.swoval" % "sbt-source-format" % "0.3.1")