Skip to content

Commit 270861d

Browse files
committed
Format with scalafmt
1 parent bbd085d commit 270861d

File tree

4 files changed

+36
-40
lines changed

4 files changed

+36
-40
lines changed

Diff for: package.sbt

+4-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
enablePlugins(JavaAppPackaging)
22

33
Universal / mappings += {
4-
// we are using the reference.conf as default application.conf
5-
// the user can override settings here
6-
val conf = (Compile / resourceDirectory).value / "reference.conf"
7-
conf -> "conf/application.conf"
4+
// we are using the reference.conf as default application.conf
5+
// the user can override settings here
6+
val conf = (Compile / resourceDirectory).value / "reference.conf"
7+
conf -> "conf/application.conf"
88
}
99

1010
// add jvm parameter for typesafe config
1111
bashScriptExtraDefines += """addJava "-Dconfig.file=${app_home}/../conf/application.conf""""
12-

Diff for: project/plugins.sbt

+6-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
1-
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
2-
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
3-
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
4-
5-
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3")
6-
7-
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.6")
8-
9-
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")
1+
addSbtPlugin("com.github.sbt" % "sbt-release" % "1.0.15")
2+
addSbtPlugin("com.github.sbt" % "sbt-pgp" % "2.1.2")
3+
addSbtPlugin("org.xerial.sbt" % "sbt-sonatype" % "3.9.7")
4+
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.5.3")
5+
addSbtPlugin("com.typesafe.sbt" % "sbt-native-packager" % "1.7.6")
6+
addSbtPlugin("com.typesafe.sbt" % "sbt-twirl" % "1.5.1")

Diff for: publish.sbt

+16-16
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Test / publishArtifact := false
77
publishTo := Some(if (isSnapshot.value) Opts.resolver.sonatypeSnapshots else Opts.resolver.sonatypeStaging)
88

99
Global / PgpKeys.useGpg := true // workaround with pgp and sbt 1.2.x
10-
pgpSecretRing := pgpPublicRing.value // workaround with pgp and sbt 1.2.x
10+
pgpSecretRing := pgpPublicRing.value // workaround with pgp and sbt 1.2.x
1111

1212
pomExtra in Global := {
1313
<developers>
@@ -19,22 +19,22 @@ pomExtra in Global := {
1919
</developers>
2020
}
2121

22-
releaseTagComment := s"Releasing ${(ThisBuild / version).value}"
23-
releaseCommitMessage := s"Setting version to ${(ThisBuild / version).value}"
22+
releaseTagComment := s"Releasing ${(ThisBuild / version).value}"
23+
releaseCommitMessage := s"Setting version to ${(ThisBuild / version).value}"
2424
releaseNextCommitMessage := s"[ci skip] Setting version to ${(ThisBuild / version).value}"
2525

2626
import ReleaseTransformations._
2727
releaseProcess := Seq[ReleaseStep](
28-
checkSnapshotDependencies,
29-
inquireVersions,
30-
//runClean,
31-
runTest,
32-
setReleaseVersion,
33-
commitReleaseVersion,
34-
tagRelease,
35-
publishArtifacts,
36-
setNextVersion,
37-
commitNextVersion,
38-
releaseStepCommand("sonatypeReleaseAll"),
39-
pushChanges
40-
)
28+
checkSnapshotDependencies,
29+
inquireVersions,
30+
//runClean,
31+
runTest,
32+
setReleaseVersion,
33+
commitReleaseVersion,
34+
tagRelease,
35+
publishArtifacts,
36+
setNextVersion,
37+
commitNextVersion,
38+
releaseStepCommand("sonatypeReleaseAll"),
39+
pushChanges
40+
)

Diff for: tracing.sbt

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
2-
Compile / resourceGenerators += Def.task {
3-
val dir = (Compile / sourceManaged).value
4-
val projectName = name.value
5-
val projectGroup = organization.value
6-
val projectPage=homepage.value.map(_.toString).getOrElse("https://github.com/dacr")
1+
Compile / resourceGenerators += Def.task {
2+
val dir = (Compile / sourceManaged).value
3+
val projectName = name.value
4+
val projectGroup = organization.value
5+
val projectPage = homepage.value.map(_.toString).getOrElse("https://github.com/dacr")
76
val projectVersion = version.value
8-
val buildDateTime = java.time.Instant.now().toString
9-
val buildUUID = java.util.UUID.randomUUID.toString
10-
val file = dir / "cem-meta.conf"
11-
IO.write(file,
7+
val buildDateTime = java.time.Instant.now().toString
8+
val buildUUID = java.util.UUID.randomUUID.toString
9+
val file = dir / "cem-meta.conf"
10+
IO.write(
11+
file,
1212
s"""code-examples-manager-config {
1313
| meta-info {
1414
| project-name = "$projectName"

0 commit comments

Comments
 (0)