Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
pme123 committed Jan 1, 2025
2 parents af82b22 + 791f39b commit ae70c4a
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ case class CompanySbtGenerator()(using
):
lazy val companyName = config.companyName

lazy val sbtGenerator = SbtGenerator()
lazy val sbtGenerator = SbtGenerator()
lazy val generate: Unit =
createIfNotExists(buildSbtDir, buildSbt)
sbtGenerator.generateBuildProperties(helperCompanyDoNotAdjustText)
Expand All @@ -32,7 +32,7 @@ case class CompanySbtGenerator()(using

private lazy val settings =
s"""$helperCompanyDoNotAdjustText
|
|
|import com.typesafe.config.ConfigFactory
|import laika.ast.Path.Root
|import laika.config.{LinkValidation, SyntaxHighlighting, Version, Versions}
Expand Down Expand Up @@ -169,7 +169,6 @@ case class CompanySbtGenerator()(using
|}
|""".stripMargin


private lazy val buildSbt =
s"""// $howToResetText
|import sbt.*
Expand Down Expand Up @@ -277,7 +276,7 @@ case class CompanySbtGenerator()(using
|addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.12.0")
|
|// docs
|addSbtPlugin("org.typelevel" % "laika-sbt" % "1.2.1")
|addSbtPlugin("org.typelevel" % "laika-sbt" % "1.3.0")
|
|// docker (optional)
|addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.0")
Expand Down
4 changes: 2 additions & 2 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.10.4")
// https://github.com/djspiewak/sbt-github-actions
//addSbtPlugin("com.codecommit" % "sbt-github-actions" % "0.13.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.9.0")
addSbtPlugin("org.typelevel" % "laika-sbt" % "1.2.1")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.2")
addSbtPlugin("org.typelevel" % "laika-sbt" % "1.3.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.6.2")

addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.13.1")

Expand Down

0 comments on commit ae70c4a

Please sign in to comment.