From dc18de3f6c4988d898b2502d7bc4a759729053e6 Mon Sep 17 00:00:00 2001 From: Juan Pedro Moreno <4879373+juanpedromoreno@users.noreply.github.com> Date: Wed, 8 Apr 2020 09:59:36 +0200 Subject: [PATCH] Removes sbt-org-policies (#436) --- build.sbt | 4 +-- project/ProjectPlugin.scala | 48 ++++++++++++------------------------ project/plugins.sbt | 20 +++++++++------ secret_key.asc.enc | Bin 1856 -> 0 bytes version.sbt | 1 - 5 files changed, 29 insertions(+), 44 deletions(-) delete mode 100644 secret_key.asc.enc delete mode 100644 version.sbt 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 1da8740db293c5bdd5bd220b438fb050c4dd32e8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1856 zcmV-G2fz5=Bo5kSsTWtpoe4-J11`FUy^FN_eo(B?Il9=7Y4=&az@M{In|C>5N%~0y z|B;AM=oG+N9rA2;Z?E@*4)~)o>z_a8-Iu^jzz$L1D4N)Oe~JWZtY#+h-tgJouauAH zAQcc;z^1fIPTb0NI-rCdbegGcce+O1l4SO0j^5C!%OrsWX}3-~6I8&Fvem=EbO}%V z|FHqxCm-w2%!lBt-;kPJm)sIMF(J-|B!OI%p@pXeuy zxOFD%oW%+lXCz4XB*P*ksm$ z2BfPzV55iu&URzBb^=pu{&{!e&sVm!!yqzc{)fDhRNJsB7(t!$;r^HV`W#=H7M?Iz z9-%G0f1cm=4T5;Ne+_qnBzGJEBer!q=9ag*_mpOp&XdV)pgW@+hsGB1xYZ5Oc^p1D zFJ4QIAtkQE1<^s*FIXFSA)sJxCj?QgpC{-4a3#2~3gL`|+YY*yTx;lkp}MTBBv}r?TyzD~9Z61%$mlt8 zaOd*`T7~b@?rvlg1DKW5Fz+sWR*5T=yk<(+rdY}9{}^RF_ATnv8~|rAerviRbKgP3 zBq#0Nr1hu8e zt`vEr9Y?wLXFdQ$B;E~vv{x#EL9nRx$GOjV5VkBNhihEm?HBnnzr3j$j-)fjxGn}T z9CPE?Sw=}kja1Et$wjsFl4ZKnwJ^qlk@P=>I8Lom`dKBhEeu68_0YYYC?ce%I%LFw zzPM<+DB0n**jIGxcR{m_q3F73 zE(a}bmWm5tB<_544NmedSfr5-5-#l@>vG{#VEvm~%&m@Pope%WG$=v9FO(1<;QLe3 zEPeq8ZkWcM$@Uje(#7u8i%^tJlt*A&X{FX1Z!{Q<)~@`?@G53Fu62^&&zeSRwjA?a zZ7*?&vadQW9tE^uR97OP*d&^-xa7iW<_)vy+apeF*!TM^cS_~-yrB>`v09t*KX0Pk zXFdVIY4Sv+pGh{zG6!XsW+J4F$o$Y;7tCF6ha5CRv7WB=f^AkjRg`7!N6FBef2a;& zBanuC$9;7JfuU-BT{i<=_q@^XdSkp*ZMA`0CRZEG-%PA<%Dt%%bmk%M!aUnm3&3y5 z6NRSz_=AS`Rb%fKj7uvuf45@RSJh6MGd-xOdKbtw2Z04CWBTrkO3cqYti z?`bX<&mlvsk&1N7YIt(vsph_Ci}>SkPIbmz*$lV>7f1-^5@|*R`#VCw?(4YW6DiNp zKVSv~q;pWmq_HkKnM5K}Ps_oK4$6PE-$mqbp#&$%4~gdqGW~~C>lZiB0NGp)795N7 zlIJ?HZ&?dz9!CD#@pHUWpBG$m?zhSF<%0SiYu32~saI-Y1aG!3vO!P0{ms?qt1q8j z|4VH+NI5@2?6DOM3tsLyHJ)!fts^G*AC8AM7NPeMOpG>n?Ur&Zb;UmurN1k*v&A3+ zDNjE^r{|4j{a!;zS?jM#uHB?+h1W5)hMh$NShAAit)}4=rr~KCaZ8Tak$dLRQ&y949*7E|;(X 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"