From 5b73e96cc01582d6480c8cf18328ecb4d0afb2a9 Mon Sep 17 00:00:00 2001 From: Michael Stringer Date: Wed, 3 Jul 2024 15:46:20 +0100 Subject: [PATCH 1/5] Update sbt to 1.10.0 --- build.sbt | 2 +- project/build.properties | 2 +- project/plugins.sbt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.sbt b/build.sbt index 1394047..30c1ea0 100644 --- a/build.sbt +++ b/build.sbt @@ -25,7 +25,7 @@ scriptedLaunchOpts := { Seq("-Xmx1024M", "-Dplugin.version=" + version.value) } -ThisBuild / scapegoatVersion := "2.1.0" +ThisBuild / scapegoatVersion := "2.1.6" developers := List( Developer("stringbean", "Michael Stringer", "@the_stringbean", url("https://github.com/stringbean")), diff --git a/project/build.properties b/project/build.properties index 8b9a0b0..081fdbb 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1 +1 @@ -sbt.version=1.8.0 +sbt.version=1.10.0 diff --git a/project/plugins.sbt b/project/plugins.sbt index 40eb63d..578adf6 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -5,7 +5,7 @@ addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13") // code style addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0") -addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.1.1") +addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.4") addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") // documentation From 07c4a248f05e58a530b39770701e9dde6d1939e5 Mon Sep 17 00:00:00 2001 From: Michael Stringer Date: Wed, 3 Jul 2024 15:52:03 +0100 Subject: [PATCH 2/5] Update sbt plugins --- build.sbt | 2 +- project/plugins.sbt | 15 +++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/build.sbt b/build.sbt index 30c1ea0..067b72c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,7 +1,7 @@ name := "sbt-dependency-lock" organization := "software.purpledragon" -enablePlugins(SbtPlugin, ParadoxSitePlugin, GhpagesPlugin) +enablePlugins(SbtPlugin, SitePreviewPlugin, ParadoxSitePlugin, GhpagesPlugin) val circeVersion = "0.14.3" diff --git a/project/plugins.sbt b/project/plugins.sbt index 578adf6..4c6c435 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,14 +1,13 @@ // publishing -addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2") -addSbtPlugin("com.github.sbt" % "sbt-release" % "1.1.0") -addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.13") +addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1") +addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0") +addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.0") // code style -addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.7.0") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0") addSbtPlugin("com.sksamuel.scapegoat" %% "sbt-scapegoat" % "1.2.4") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2") // documentation -addSbtPlugin("com.typesafe.sbt" % "sbt-site" % "1.4.1") -addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.2") -addSbtPlugin("com.typesafe.sbt" % "sbt-ghpages" % "0.6.3") +addSbtPlugin("com.github.sbt" % "sbt-site-paradox" % "1.5.0") +addSbtPlugin("com.github.sbt" % "sbt-ghpages" % "0.8.0") From 2d3bdc26c78073d67dd57c435c923ba4bb92a6c7 Mon Sep 17 00:00:00 2001 From: Michael Stringer Date: Wed, 3 Jul 2024 15:53:09 +0100 Subject: [PATCH 3/5] Update dependencies --- build.sbt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sbt b/build.sbt index 067b72c..b8fa3fa 100644 --- a/build.sbt +++ b/build.sbt @@ -3,7 +3,7 @@ organization := "software.purpledragon" enablePlugins(SbtPlugin, SitePreviewPlugin, ParadoxSitePlugin, GhpagesPlugin) -val circeVersion = "0.14.3" +val circeVersion = "0.14.9" libraryDependencies ++= Seq( "io.circe" %% "circe-core", @@ -13,12 +13,12 @@ libraryDependencies ++= Seq( libraryDependencies ++= Seq( "software.purpledragon" %% "text-utils" % "1.3.1", - "org.scalatest" %% "scalatest" % "3.2.14" % Test, + "org.scalatest" %% "scalatest" % "3.2.19" % Test, ) organizationName := "Michael Stringer" startYear := Some(2019) -licenses += ("Apache-2.0", new URL("https://www.apache.org/licenses/LICENSE-2.0.txt")) +licenses += ("Apache-2.0", url("https://www.apache.org/licenses/LICENSE-2.0.txt")) scriptedLaunchOpts := { scriptedLaunchOpts.value ++ @@ -39,7 +39,7 @@ scmInfo := Some( git.remoteRepo := "git@github.com:stringbean/sbt-dependency-lock.git" publishTo := sonatypePublishToBundle.value -import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations._ +import sbtrelease.ReleasePlugin.autoImport.ReleaseTransformations.* releasePublishArtifactsAction := PgpKeys.publishSigned.value From db91cdecd0946b526babfb2b343cff22dbd8e616 Mon Sep 17 00:00:00 2001 From: Michael Stringer Date: Wed, 3 Jul 2024 15:55:22 +0100 Subject: [PATCH 4/5] Update scalafmt --- .scalafmt.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.scalafmt.conf b/.scalafmt.conf index df754a2..6621024 100644 --- a/.scalafmt.conf +++ b/.scalafmt.conf @@ -1,4 +1,4 @@ -version = 3.6.1 +version = 3.8.2 runner.dialect = scala212source3 maxColumn = 120 From a1cdcc93a4715518718c415d78b795a3df1e5ef3 Mon Sep 17 00:00:00 2001 From: Michael Stringer Date: Wed, 3 Jul 2024 15:59:59 +0100 Subject: [PATCH 5/5] Use Scala 3 source --- .../software/purpledragon/sbt/lock/DependencyLockIO.scala | 6 +++--- .../purpledragon/sbt/lock/DependencyLockPlugin.scala | 2 +- .../software/purpledragon/sbt/lock/util/MessageUtil.scala | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/scala/software/purpledragon/sbt/lock/DependencyLockIO.scala b/src/main/scala/software/purpledragon/sbt/lock/DependencyLockIO.scala index c89a37a..7f746b5 100644 --- a/src/main/scala/software/purpledragon/sbt/lock/DependencyLockIO.scala +++ b/src/main/scala/software/purpledragon/sbt/lock/DependencyLockIO.scala @@ -18,10 +18,10 @@ package software.purpledragon.sbt.lock import java.io.File -import io.circe.parser._ -import io.circe.syntax._ +import io.circe.parser.* +import io.circe.syntax.* import sbt.io.IO -import software.purpledragon.sbt.lock.model.Decoders._ +import software.purpledragon.sbt.lock.model.Decoders.* import software.purpledragon.sbt.lock.model.DependencyLockFile object DependencyLockIO { diff --git a/src/main/scala/software/purpledragon/sbt/lock/DependencyLockPlugin.scala b/src/main/scala/software/purpledragon/sbt/lock/DependencyLockPlugin.scala index f5ec208..9654ed9 100644 --- a/src/main/scala/software/purpledragon/sbt/lock/DependencyLockPlugin.scala +++ b/src/main/scala/software/purpledragon/sbt/lock/DependencyLockPlugin.scala @@ -141,7 +141,7 @@ object DependencyLockPlugin extends AutoPlugin { }.value, ) - override def globalSettings: Seq[Def.Setting[_]] = Seq( + override def globalSettings: Seq[Def.Setting[?]] = Seq( dependencyLockAutoCheck := DependencyLockUpdateMode.WarnOnError, dependencyLockModuleFilter := DependencyFilter.fnToModuleFilter(_ => false), dependencyLockConfigurationFilter := DependencyFilter.fnToConfigurationFilter(_ => false), diff --git a/src/main/scala/software/purpledragon/sbt/lock/util/MessageUtil.scala b/src/main/scala/software/purpledragon/sbt/lock/util/MessageUtil.scala index 025e100..35018b0 100644 --- a/src/main/scala/software/purpledragon/sbt/lock/util/MessageUtil.scala +++ b/src/main/scala/software/purpledragon/sbt/lock/util/MessageUtil.scala @@ -25,11 +25,11 @@ object MessageUtil { val messages: ResourceBundle = ResourceBundle.getBundle("messages") def format(template: String, args: Any*): String = { - MessageFormat.format(template, args.map(unwrapArg): _*) + MessageFormat.format(template, args.map(unwrapArg)*) } def formatMessage(key: String, args: Any*): String = { - format(messages.getString(key), args.map(unwrapArg): _*) + format(messages.getString(key), args.map(unwrapArg)*) } def formatPlural(baseKey: String, count: Int, args: Any*): String = { @@ -40,7 +40,7 @@ object MessageUtil { ) val choice = new ChoiceFormat(Array(0, 1, 2), formatStrings) - format(choice.format(count), count +: args: _*) + format(choice.format(count), (count +: args)*) } @SuppressWarnings(Array("AsInstanceOf"))