diff --git a/build.sbt b/build.sbt index 84a431c8d..a267ff26c 100644 --- a/build.sbt +++ b/build.sbt @@ -1,5 +1,3 @@ -pgpPassphrase := Some(getEnvVar("PGP_PASSPHRASE").getOrElse("").toCharArray) - lazy val root = (project in file(".")) .settings(moduleName := "github4s-root") .aggregate(github4s) @@ -33,4 +31,4 @@ lazy val docs = (project in file("docs")) .enablePlugins(MicrositesPlugin) addCommandAlias("ci-test", "+scalafmtCheck; +scalafmtSbtCheck; +docs/mdoc; +test") -addCommandAlias("ci-docs", "docs/mdoc") +addCommandAlias("ci-docs", "docs/mdoc; headerCreateAll") diff --git a/project/ProjectPlugin.scala b/project/ProjectPlugin.scala index e313ec27f..4769ce971 100644 --- a/project/ProjectPlugin.scala +++ b/project/ProjectPlugin.scala @@ -3,21 +3,16 @@ import microsites._ import microsites.MicrositesPlugin.autoImport._ import sbt.Keys._ import sbt._ -import sbtorgpolicies.OrgPoliciesKeys.orgBadgeListSetting -import sbtorgpolicies.OrgPoliciesPlugin -import sbtorgpolicies.OrgPoliciesPlugin.autoImport._ -import sbtorgpolicies.templates.badges._ -import sbtorgpolicies.runnable.syntax._ import scoverage.ScoverageKeys import scoverage.ScoverageKeys._ +import com.alejandrohdezma.sbt.github.SbtGithubPlugin import mdoc.MdocPlugin.autoImport._ -import sbtorgpolicies.model.GitHubSettings object ProjectPlugin extends AutoPlugin { override def trigger: PluginTrigger = allRequirements - override def requires: Plugins = OrgPoliciesPlugin + override def requires: Plugins = SbtGithubPlugin object autoImport { @@ -35,6 +30,13 @@ object ProjectPlugin extends AutoPlugin { val silencer: String = "1.6.0" } + lazy val noPublishSettings = Seq( + publish := ((): Unit), + publishLocal := ((): Unit), + publishArtifact := false, + publishMavenStyle := false // suppress warnings about intransitive deps (not published anyway) + ) + lazy val micrositeSettings = Seq( micrositeName := "Github4s", micrositeDescription := "Github API wrapper written in Scala", @@ -102,19 +104,13 @@ object ProjectPlugin extends AutoPlugin { override def projectSettings: Seq[Def.Setting[_]] = Seq( name := "github4s", - orgGithubSetting := GitHubSettings( - organization = "47degrees", - project = (name in LocalRootProject).value, - organizationName = "47 Degrees", - groupId = "com.47deg", - organizationHomePage = url("http://47deg.com"), - organizationEmail = "hello@47deg.com" - ), - orgProjectName := "Github4s", + organization := "com.47deg", + organizationName := "47 Degrees", + organizationHomepage := Some(url("https://www.47deg.com")), + homepage := Option(url("https://47degrees.github.io/github4s/")), description := "Github API wrapper written in Scala", startYear := Option(2016), resolvers += Resolver.sonatypeRepo("snapshots"), - scalaVersion := V.scala213, crossScalaVersions := Seq(V.scala212, V.scala213), scalacOptions := { val withStripedLinter = scalacOptions.value filterNot Set("-Xlint", "-Xfuture").contains @@ -123,20 +119,8 @@ object ProjectPlugin extends AutoPlugin { case _ => withStripedLinter }) :+ "-language:higherKinds" }, - orgGithubTokenSetting := "GITHUB_TOKEN", - orgBadgeListSetting := List( - TravisBadge.apply(_), - GitterBadge.apply(_), - CodecovBadge.apply(_), - MavenCentralBadge.apply(_), - LicenseBadge.apply(_), - ScalaLangBadge.apply(_), - GitHubIssuesBadge.apply(_) - ), - orgScriptTaskListSetting ++= List( - (ScoverageKeys.coverageAggregate in Test).asRunnableItemFull, - "docs/mdoc".asRunnableItem - ), + coverageMinimum := 70d, + coverageFailOnMinimum := true, coverageExcludedPackages := ";github4s\\.scalaz\\..*", // This is necessary to prevent packaging the BuildInfo with // sensible information like the Github token. Do not remove. @@ -146,5 +130,5 @@ object ProjectPlugin extends AutoPlugin { !toPath.startsWith("github4s/BuildInfo") } } - ) ++ shellPromptSettings ++ sharedScoverageSettings(70d) + ) } diff --git a/project/plugins.sbt b/project/plugins.sbt index 24b998dc8..2f1c34620 100644 --- a/project/plugins.sbt +++ b/project/plugins.sbt @@ -1,8 +1,12 @@ -addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.13.3") -addSbtPlugin("com.47deg" % "sbt-microsites" % "1.1.5") -addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") -addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") -addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5") -addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.2") -addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.11") -addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.2") +addSbtPlugin("com.eed3si9n" % "sbt-buildinfo" % "0.9.0") +addSbtPlugin("com.geirsson" % "sbt-ci-release" % "1.5.2") +addSbtPlugin("com.47deg" % "sbt-microsites" % "1.1.5") +addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.6.1") +addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.3.2") +addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.1.5") +addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.4.0") +addSbtPlugin("com.alejandrohdezma" %% "sbt-github" % "0.6.0") +addSbtPlugin("com.alejandrohdezma" % "sbt-github-header" % "0.6.0") +addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % "0.6.0") +addSbtPlugin("com.alejandrohdezma" % "sbt-mdoc-toc" % "0.2") +addSbtPlugin("io.github.davidgregory084" % "sbt-tpolecat" % "0.1.11") diff --git a/secret_key.asc.enc b/secret_key.asc.enc deleted file mode 100644 index 1da8740db..000000000 Binary files a/secret_key.asc.enc and /dev/null differ diff --git a/version.sbt b/version.sbt deleted file mode 100644 index 07983374f..000000000 --- a/version.sbt +++ /dev/null @@ -1 +0,0 @@ -version in ThisBuild := "0.23.1-SNAPSHOT"