From 17b3831c93b268dd468713957b0f7aa9f4b53e33 Mon Sep 17 00:00:00 2001 From: Lunfu Zhong Date: Tue, 28 Nov 2023 14:44:10 +0800 Subject: [PATCH] Update scala-library to 2.13.12 (#154) * Update scala-library to 2.13.12 * Upgrade actions. * Upgrade sbt. * Clean plugins. * Add ignores. * Upgrade scala. --- .github/workflows/ci.yml | 8 ++++---- .github/workflows/sbt-release.yml | 4 ++-- .gitignore | 4 ++++ build.sbt | 4 ++-- project/build.properties | 2 +- project/plugins.sbt | 9 --------- 6 files changed, 13 insertions(+), 18 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3467623..2cf0eef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,13 +7,13 @@ on: pull_request: jobs: build: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - - uses: actions/checkout@v1 - - uses: olafurpg/setup-scala@v13 + - uses: actions/checkout@v4 + - uses: coursier/setup-action@v1 - name: branch-names id: branch-name - uses: tj-actions/branch-names@v2.2 + uses: tj-actions/branch-names@v7 - run: sbt coverage +test coverageReport - run: sbt coverageAggregate coveralls env: diff --git a/.github/workflows/sbt-release.yml b/.github/workflows/sbt-release.yml index 0f779e7..d95881e 100644 --- a/.github/workflows/sbt-release.yml +++ b/.github/workflows/sbt-release.yml @@ -7,10 +7,10 @@ jobs: publish: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2.3.4 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: olafurpg/setup-scala@v10 + - uses: coursier/setup-action@v1 - uses: olafurpg/setup-gpg@v3 - run: sbt ci-release env: diff --git a/.gitignore b/.gitignore index ec7f85f..2b9f388 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ .idea target/ .bsp/ +.metals/ +.vscode/ +metals.sbt +.bloop/ diff --git a/build.sbt b/build.sbt index 4b202d0..ebd4620 100644 --- a/build.sbt +++ b/build.sbt @@ -2,14 +2,14 @@ import Dependencies._ inThisBuild( Seq( - scalaVersion := "2.13.8", + scalaVersion := "2.13.12", scalafmtOnCompile := true, scalacOptions ++= Seq( "-deprecation", "-encoding", "UTF-8" ), - crossScalaVersions := Seq(scalaVersion.value, "2.12.15"), + crossScalaVersions := Seq(scalaVersion.value, "2.12.18"), organization := "com.github.zhongl", homepage := Some(url("https://github.com/hanabix/akka-stream-oauth2")), licenses := List( diff --git a/project/build.properties b/project/build.properties index ff6e0dd..331a838 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version = 1.7.2 \ No newline at end of file +sbt.version = 1.9.7 \ No newline at end of file diff --git a/project/plugins.sbt b/project/plugins.sbt index 53a487a..0f0cea5 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,4 +1,3 @@ -addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.9.2") addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.0.9") @@ -6,12 +5,4 @@ addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.11") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") -addSbtPlugin("com.dwijnand" % "sbt-dynver" % "4.1.1") - -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13") - -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") - -addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.0") - addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")