Skip to content

Commit

Permalink
build on sbt 1.6.1
Browse files Browse the repository at this point in the history
  • Loading branch information
ennru committed Jan 27, 2022
1 parent 80725b8 commit addb2f9
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 14 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ jobs:
include:
- java: 8
- java: 11
- java: 17
steps:
- name: Checkout
uses: actions/checkout@v2
Expand Down
5 changes: 2 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,10 @@ lazy val root = (project in file("."))
packageDoc := (configLib / Compile / packageDoc).value
checkstyle / aggregate := false
checkstyle := (configLib / Compile / checkstyle).value
useGpg := true
PgpKeys.publishSigned / aggregate := false
PgpKeys.publishSigned := (PgpKeys.publishSigned in configLib).value
PgpKeys.publishSigned := (configLib / PgpKeys.publishSigned).value
PgpKeys.publishLocalSigned / aggregate := false
PgpKeys.publishLocalSigned := (PgpKeys.publishLocalSigned in configLib).value
PgpKeys.publishLocalSigned := (configLib / PgpKeys.publishLocalSigned).value
})

lazy val configLib = Project("config", file("config"))
Expand Down
2 changes: 1 addition & 1 deletion project/build.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.2.8
sbt.version=1.6.1
10 changes: 5 additions & 5 deletions project/linksource.scala
Original file line number Diff line number Diff line change
Expand Up @@ -14,17 +14,17 @@ object LinkSourcePlugin extends AutoPlugin {
override def requires = JvmPlugin
override lazy val projectSettings: Seq[Def.Setting[_ >: Option[String] with Task[Seq[String]] with Task[File] <: Product]] = Seq(
javadocSourceBaseUrl := None,
javacOptions in (Compile, doc) := {
val old = (javacOptions in doc).value
Compile / doc / javacOptions := {
val old = (doc / javacOptions).value
if (old.contains("-linksource"))
old
else
"-linksource" +: old
},
(doc in Compile) := {
val result = (doc in Compile).value
(Compile / doc) := {
val result = (Compile / doc).value

val dir = (target in doc in Compile).value
val dir = (Compile / doc / target).value

(javadocSourceBaseUrl.value, streams.value) match {
case (Some(url), streamz) =>
Expand Down
10 changes: 5 additions & 5 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
addSbtPlugin("com.github.sbt" % "sbt-findbugs" % "2.0.0")
addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.1.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.0.0-M2")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.3")
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.2")
addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.4.0")
addSbtPlugin("com.jsuereth" % "sbt-pgp" % "2.1.1")
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.9.6")
addSbtPlugin("org.scalariform" % "sbt-scalariform" % "1.8.3")

addSbtPlugin("com.etsy" % "sbt-checkstyle-plugin" % "3.1.1")

addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.0")
addSbtPlugin("com.typesafe.sbt" % "sbt-git" % "1.0.2")
addSbtPlugin("com.eed3si9n" % "sbt-nocomma" % "0.1.0")

0 comments on commit addb2f9

Please sign in to comment.