From a523d18f570c22906f4d52af94364d04e79239b4 Mon Sep 17 00:00:00 2001 From: Scala Steward Date: Sat, 3 Jun 2023 03:52:01 +0000 Subject: [PATCH 1/2] Update sbt, scripted-plugin to 1.9.0 --- project/build.properties | 2 +- .../scoverage/coverage-excluded-files/project/build.properties | 2 +- .../coverage-excluded-packages/project/build.properties | 2 +- src/sbt-test/scoverage/coverage-off/project/build.properties | 2 +- .../scala3-coverage-excluded-files/project/build.properties | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project/build.properties b/project/build.properties index 72413de1..40b3b8e7 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.3 +sbt.version=1.9.0 diff --git a/src/sbt-test/scoverage/coverage-excluded-files/project/build.properties b/src/sbt-test/scoverage/coverage-excluded-files/project/build.properties index 72413de1..40b3b8e7 100644 --- a/src/sbt-test/scoverage/coverage-excluded-files/project/build.properties +++ b/src/sbt-test/scoverage/coverage-excluded-files/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.3 +sbt.version=1.9.0 diff --git a/src/sbt-test/scoverage/coverage-excluded-packages/project/build.properties b/src/sbt-test/scoverage/coverage-excluded-packages/project/build.properties index 72413de1..40b3b8e7 100644 --- a/src/sbt-test/scoverage/coverage-excluded-packages/project/build.properties +++ b/src/sbt-test/scoverage/coverage-excluded-packages/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.3 +sbt.version=1.9.0 diff --git a/src/sbt-test/scoverage/coverage-off/project/build.properties b/src/sbt-test/scoverage/coverage-off/project/build.properties index 72413de1..40b3b8e7 100644 --- a/src/sbt-test/scoverage/coverage-off/project/build.properties +++ b/src/sbt-test/scoverage/coverage-off/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.3 +sbt.version=1.9.0 diff --git a/src/sbt-test/scoverage/scala3-coverage-excluded-files/project/build.properties b/src/sbt-test/scoverage/scala3-coverage-excluded-files/project/build.properties index 72413de1..40b3b8e7 100644 --- a/src/sbt-test/scoverage/scala3-coverage-excluded-files/project/build.properties +++ b/src/sbt-test/scoverage/scala3-coverage-excluded-files/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.3 +sbt.version=1.9.0 From c9715389a593694fc088b4360785924cbd323fcd Mon Sep 17 00:00:00 2001 From: Chris Kipp Date: Sat, 3 Jun 2023 11:58:54 +0200 Subject: [PATCH 2/2] chore: account for 1.9.0 changes - Start using Resolver.sonatypeOssRepos - Remove the sbt-vspp app since publishing with 1.9.0 fixes the issue it solves. --- build.sbt | 2 +- project/plugins.sbt | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/build.sbt b/build.sbt index d50e3b18..7981e5da 100644 --- a/build.sbt +++ b/build.sbt @@ -51,7 +51,7 @@ lazy val root = Project("sbt-scoverage", file(".")) "utf8" ), resolvers ++= { - if (isSnapshot.value) Seq(Resolver.sonatypeRepo("snapshots")) else Nil + if (isSnapshot.value) Resolver.sonatypeOssRepos("snapshots") else Nil }, scriptedLaunchOpts ++= Seq( "-Xmx1024M", diff --git a/project/plugins.sbt b/project/plugins.sbt index a56a9b21..5a8060ea 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -2,4 +2,3 @@ libraryDependencies += "org.scala-sbt" %% "scripted-plugin" % sbtVersion.value addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12") addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.0") -addSbtPlugin("com.scalawilliam.esbeetee" % "sbt-vspp" % "0.4.11")