Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ThisBuild / scalaVersion := _root_.scalafix.sbt.BuildInfo.scala212
ThisBuild / crossScalaVersions := Seq(scalaVersion.value, "3.8.4")
ThisBuild / organization := "com.alejandrohdezma"
ThisBuild / pluginCrossBuild / sbtVersion := scalaVersion.value.on(2)("1.12.1").getOrElse("2.0.0")
ThisBuild / pluginCrossBuild / sbtVersion := scalaVersion.value.on(2)("1.12.13").getOrElse("2.0.0")
ThisBuild / Test / parallelExecution := false
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible

Expand All @@ -25,9 +25,9 @@ lazy val website = project
lazy val `sbt-github` = module
.enablePlugins(SbtPlugin)
.settings(scriptedLaunchOpts += s"-Dplugin.version=${version.value}")
.settings(libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.6.0")
.settings(libraryDependencies += "org.scalameta" %% "munit" % "1.2.1" % Test)
.settings(libraryDependencies += "org.http4s" %% "http4s-dsl" % "0.23.33" % Test)
.settings(libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.7.0")
.settings(libraryDependencies += "org.scalameta" %% "munit" % "1.2.4" % Test)
.settings(libraryDependencies += "org.http4s" %% "http4s-dsl" % "0.23.36" % Test)
.settings(libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.17" % Test)

lazy val `sbt-github-mdoc` = module
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ object SbtGithubMdocPlugin extends AutoPlugin {
Seq(
displayName := SbtGithubPlugin.info.value._2,
removeVersionTimestampInMdoc := true,
mdocVariables ++= Map(
mdocVariables ++= Map(
"ORGANIZATION" -> organization.value,
"NAME" -> displayName.value,
"REPO" -> repository.value.map(_.name).getOrElse(""),
Expand All @@ -108,7 +108,7 @@ object SbtGithubMdocPlugin extends AutoPlugin {
"COLLABORATORS" -> collaborators.value.markdownList,
"COLLABORATORS_LIST" -> collaborators.value.markdownList,
"COLLABORATORS_TABLE" -> collaborators.value.markdownTable,
"COPYRIGHT_OWNER" -> organizationHomepage.value
"COPYRIGHT_OWNER" -> organizationHomepage.value
.map(url => s"${organizationName.value} <$url>")
.getOrElse(organizationName.value)
)
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.8.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.9.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % sys.props("plugin.version"))
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.8.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.9.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % sys.props("plugin.version"))
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.8.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.9.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % sys.props("plugin.version"))
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ object SbtGithubPlugin extends AutoPlugin {
excludedContributors := List("scala-steward", """.*\[bot\]""", "traviscibot", "actions-user"),
extraCollaborators := List(),
githubAuthToken := sys.env.get("GITHUB_TOKEN").map(AuthToken(_)),
repository := onGithub(default = Option.empty[Repository])(Def.setting {
repository := onGithub(default = Option.empty[Repository])(Def.setting {
implicit val (auth: Authentication, log: Logger, entryPoint: GithubEntryPoint) = configuration.value

Option(Repository.get(info.value._1, info.value._2).getOrThrow)
Expand Down Expand Up @@ -100,7 +100,7 @@ object SbtGithubPlugin extends AutoPlugin {
}).value,
developers := collaborators.value.developers,
homepage := repository.value.map(repo => PluginCompat.homepage(repo.url)).orElse(homepage.value),
licenses := repository.value
licenses := repository.value
.map(_.licenses.map { case (id, uri) => PluginCompat.license(id, uri) })
.getOrElse(licenses.value),
startYear := repository.value.map(_.startYear).orElse(startYear.value),
Expand All @@ -116,7 +116,7 @@ object SbtGithubPlugin extends AutoPlugin {

override def projectSettings =
Seq(
description := repository.value.map(_.description).getOrElse(description.value),
description := repository.value.map(_.description).getOrElse(description.value),
organizationName := organizationMetadata.value
.flatMap(_.name)
.getOrElse(organizationName.value),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ class OrganizationSuite extends munit.FunSuite {

test("Organization.get should return Organization if everything is present") {
withServer {
case r @ GET -> Root => Ok(s"""{ "organization_url": "${r.urlTo("{org}")}" } """)
case r @ GET -> Root => Ok(s"""{ "organization_url": "${r.urlTo("{org}")}" } """)
case GET -> Root / "org" =>
Ok("""{
"name": "My Organization",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class RepositorySuite extends munit.FunSuite {

test("Repository.get should return Repository if everything is present") {
withServer {
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case GET -> Root / "user" / "repo" =>
Ok("""{
"full_name": "user/repo",
Expand Down Expand Up @@ -76,7 +76,7 @@ class RepositorySuite extends munit.FunSuite {

test("Repository.get should return None organization if it is not present") {
withServer {
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case GET -> Root / "user" / "repo" =>
Ok("""{
"full_name": "user/repo",
Expand Down Expand Up @@ -120,7 +120,7 @@ class RepositorySuite extends munit.FunSuite {

test("Repository.get should return error if description is not present") {
withServer {
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case GET -> Root / "user" / "repo" =>
Ok("""{
"full_name": "user/repo",
Expand Down Expand Up @@ -155,7 +155,7 @@ class RepositorySuite extends munit.FunSuite {

test("Repository.get should return error if license is not present") {
withServer {
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case GET -> Root / "user" / "repo" =>
Ok("""{
"full_name": "user/repo",
Expand Down Expand Up @@ -187,7 +187,7 @@ class RepositorySuite extends munit.FunSuite {

test("Repository.get should return error if license's `spdx_id` is not present") {
withServer {
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case GET -> Root / "user" / "repo" =>
Ok("""{
"full_name": "user/repo",
Expand Down Expand Up @@ -222,7 +222,7 @@ class RepositorySuite extends munit.FunSuite {

test("Repository.get should return error if license's `url` is not present") {
withServer {
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case GET -> Root / "user" / "repo" =>
Ok("""{
"full_name": "user/repo",
Expand Down Expand Up @@ -257,7 +257,7 @@ class RepositorySuite extends munit.FunSuite {

test("Repository.get should return generic error in other cases") {
withServer {
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case r @ GET -> Root => Ok(s"""{ "repository_url": "${r.urlTo("{owner}/{repo}")}" } """)
case GET -> Root / "user" / "repo" =>
Ok("""{
"full_name": "user/repo",
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.12.1
sbt.version=1.12.13
2 changes: 1 addition & 1 deletion project/dependencies.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Compile / unmanagedSourceDirectories ++= Seq(
(ThisBuild / baseDirectory).value.getParentFile / "modules" / "sbt-github" / "src" / "main" / "scala-2.12"
)

libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.6.0"
libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.7.0"
22 changes: 11 additions & 11 deletions project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.5")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "4.0.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.2")
addSbtPlugin("com.alejandrohdezma" % "sbt-modules" % "0.3.2")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafix-defaults" % "0.14.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafmt-defaults" % "0.9.1")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.11.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.7")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.3.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "5.0.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.13.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-modules" % "0.6.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafix-defaults" % "0.16.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafmt-defaults" % "0.9.2")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.12.0")
addSbtPlugin("com.github.sbt" % "sbt-header" % "5.11.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.8.2")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.6")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.6")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.9.0")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.6.1")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.7")
Loading