Merge pull request #632 from xuwei-k/update-sbt-plugins

eed3si9n · Oct 6, 2023 · e2b1c58 · e2b1c58
2 parents 09ffb6c + f29a2dd
commit e2b1c58
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/build.sbt b/build.sbt
@@ -65,7 +65,7 @@ lazy val app = (project in file("cli"))
       else prev
     }
     assembly / mainClass           := Some("scalaxb.compiler.Main")
-    assembly / assemblyOption      := (assembly / assemblyOption).value.copy(prependShellScript = Some(sbtassembly.AssemblyPlugin.defaultShellScript))
+    assembly / assemblyOption      := (assembly / assemblyOption).value.withPrependShellScript(Some(sbtassembly.AssemblyPlugin.defaultShellScript))
     assembly / assemblyOutputPath  := file(s"./${name.value}-${version.value}")
   })
 

diff --git a/project/buildinfo.sbt b/project/buildinfo.sbt
diff --git a/project/common.scala b/project/common.scala
@@ -43,7 +43,7 @@ object Common {
   val codegenSettings: Seq[Def.Setting[_]] = scalaxbCodegenSettings ++ Seq(
     Compile / unmanagedSourceDirectories += baseDirectory.value / "src_managed",
     buildInfoPackage := "scalaxb",
-    buildInfoKeys := BuildInfoKey.ofN(name, version, scalaVersion, sbtVersion,
+    buildInfoKeys := Seq[BuildInfoKey](name, version, scalaVersion, sbtVersion,
       "defaultDispatchVersion" -> Dependencies.defaultDispatchVersion,
       "defaultHttp4sVersion" -> Dependencies.defaultHttp4sVersion,
       "defaultGigahorseVersion" -> Dependencies.defaultGigahorseVersion,

diff --git a/project/plugins.sbt b/project/plugins.sbt
@@ -1,7 +1,7 @@
 addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.1")
-addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "0.14.9")
-addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
-addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.8.0")
+addSbtPlugin("com.eed3si9n" % "sbt-assembly" % "2.1.3")
+addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.2.1")
+addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.11.0")
 
 // resolvers += Resolver.sonatypeRepo("public")
 // comment this out for production otherwise chicken-egg will entail.