Skip to content

Commit 32a4874

Browse files
reid-spencerclaude
andcommitted
Upgrade 15 plugin dependencies and Scala 2.12 to latest versions
- sbt-dynver 5.0.1 → 5.1.1 - sbt-native-packager 1.10.4 → 1.11.7 - sbt-git 2.0.1 → 2.1.0 - sbt-pgp 2.2.1 → 2.3.1 - sbt-unidoc 0.5.0 → 0.6.1 - sbt-sonatype 3.11.1 → 3.11.2 - sbt-paradox 0.9.2 → 0.10.7 - sbt-scalafix 0.14.5 → 0.14.6 - sbt-scoverage 2.4.1 → 2.4.4 - sbt-scala-native 0.5.9 → 0.5.11 - sbt-scalajs 1.20.1 → 1.21.0 - sbt-mima-plugin 1.1.4 → 1.1.5 - sbt-tasty-mima 1.2.0 → 1.4.0 - sbt-idea-plugin 5.0.4 → 5.1.0 - Scala 2.12.19 → 2.12.21 sbt-idea-plugin upgrade required migrating from deprecated intellijVMOptions to customIntellijVMOptions API. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
1 parent a8195a0 commit 32a4874

3 files changed

Lines changed: 31 additions & 30 deletions

File tree

build.sbt

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ lazy val `sbt-ossuminc` = project
2828
sbtPlugin := true,
2929
licenses += "Apache V2.0" -> url("https://www.apache.org/licenses/LICENSE-2.0"),
3030
name := "sbt-ossuminc",
31-
scalaVersion := "2.12.19",
31+
scalaVersion := "2.12.21",
3232
// Scripted == sbt plugin tests
3333
scriptedLaunchOpts := {
3434
scriptedLaunchOpts.value ++
@@ -42,30 +42,30 @@ lazy val `sbt-ossuminc` = project
4242
)
4343

4444
// Generic plugins from github.sbt project
45-
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
46-
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
47-
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")
48-
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
45+
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1")
46+
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.7")
47+
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
48+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
4949
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
50-
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
50+
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.6.1")
5151

5252
// Helpers from other sources
5353
addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")
5454
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
5555
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
56-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.1")
56+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.2")
5757
addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3")
58-
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2")
58+
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
5959

6060
// Scala specific from various places
61-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.5")
61+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.6")
6262
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
63-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.1")
63+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4")
6464
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15")
65-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.9")
66-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
65+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.11")
66+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.21.0")
6767
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
6868
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
69-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
70-
addSbtPlugin("ch.epfl.scala" % "sbt-tasty-mima" % "1.2.0")
71-
addSbtPlugin("org.jetbrains.scala" % "sbt-idea-plugin" % "5.0.4")
69+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5")
70+
addSbtPlugin("ch.epfl.scala" % "sbt-tasty-mima" % "1.4.0")
71+
addSbtPlugin("org.jetbrains.scala" % "sbt-idea-plugin" % "5.1.0")

project/plugins.sbt

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@
1515
*/
1616

1717
// Generic plugins from github.sbt project
18-
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.0.1")
18+
addSbtPlugin("com.github.sbt" % "sbt-dynver" % "5.1.1")
1919

20-
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
20+
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.11.7")
2121

22-
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.0.1")
22+
addSbtPlugin("com.github.sbt" % "sbt-git" % "2.1.0")
2323

24-
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
24+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.3.1")
2525

2626
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.4.0")
2727

28-
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.5.0")
28+
addSbtPlugin("com.github.sbt" % "sbt-unidoc" % "0.6.1")
2929

3030
addDependencyTreePlugin
3131

@@ -36,36 +36,36 @@ addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
3636

3737
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.6.4")
3838

39-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.1")
39+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.11.2")
4040

4141
addSbtPlugin("com.codecommit" % "sbt-github-packages" % "0.5.3")
4242

43-
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.9.2")
43+
addSbtPlugin("com.lightbend.paradox" % "sbt-paradox" % "0.10.7")
4444

4545
// Scala specific from various places
46-
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.5")
46+
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.6")
4747

4848
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
4949

50-
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.1")
50+
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "2.4.4")
5151

5252
addSbtPlugin("org.scoverage" % "sbt-coveralls" % "1.3.15")
5353

54-
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.9")
54+
addSbtPlugin("org.scala-native" % "sbt-scala-native" % "0.5.11")
5555

56-
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.20.1")
56+
addSbtPlugin("org.scala-js" % "sbt-scalajs" % "1.21.0")
5757

5858
addSbtPlugin("org.portable-scala" % "sbt-scalajs-crossproject" % "1.3.2")
5959

6060
addSbtPlugin("org.portable-scala" % "sbt-scala-native-crossproject" % "1.3.2")
6161

6262
addSbtPlugin("org.portable-scala" % "sbt-platform-deps" % "1.0.2")
6363

64-
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.4")
64+
addSbtPlugin("com.typesafe" % "sbt-mima-plugin" % "1.1.5")
6565

66-
addSbtPlugin("ch.epfl.scala" % "sbt-tasty-mima" % "1.2.0")
66+
addSbtPlugin("ch.epfl.scala" % "sbt-tasty-mima" % "1.4.0")
6767

68-
addSbtPlugin("org.jetbrains.scala" % "sbt-idea-plugin" % "5.0.4")
68+
addSbtPlugin("org.jetbrains.scala" % "sbt-idea-plugin" % "5.1.0")
6969

7070
libraryDependencies ++= Seq(
7171
"org.scala-sbt" %% "scripted-plugin" % sbtVersion.value

src/main/scala/com/ossuminc/sbt/helpers/IdeaPlugin.scala

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import org.jetbrains.sbtidea.SbtIdeaPlugin
44
import sbt.*
55
import sbt.Keys.*
66
import org.jetbrains.sbtidea.SbtIdeaPlugin.autoImport.*
7+
import org.jetbrains.sbtidea.runIdea.CustomIntellijVMOptions
78
import org.jetbrains.sbtidea.verifier.FailureLevel
89

910
object IdeaPlugin extends AutoPluginHelper {
@@ -59,7 +60,7 @@ object IdeaPlugin extends AutoPluginHelper {
5960
xml.sinceBuild = (ThisBuild / intellijBuild).value
6061
xml.untilBuild = "351.*"
6162
},
62-
ThisBuild / intellijVMOptions := intellijVMOptions.value.copy(xmx = maxMem, xms = 256),
63+
ThisBuild / customIntellijVMOptions := CustomIntellijVMOptions(xmx = Some(maxMem), xms = Some(256)),
6364
ThisBuild / pluginVerifierOptions := pluginVerifierOptions.value.copy(
6465
offline = true, // forbid the verifier from reaching the internet
6566
failureLevels = Set(

0 commit comments

Comments
 (0)