Skip to content

Commit

Permalink
Merge pull request #520 from alejandrohdezma/update/all
Browse files Browse the repository at this point in the history
Dependency Updates
  • Loading branch information
github-actions[bot] authored Aug 10, 2024
2 parents bc24dfa + c1febea commit ea1705e
Show file tree
Hide file tree
Showing 32 changed files with 4,923 additions and 4,181 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,13 @@ jobs:
- 17
steps:
- name: Checkout project
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
ref: ${{ github.head_ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
fetch-depth: 0

- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
distribution: "liberica"
java-version: ${{ matrix.jdk }}
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout project
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0

- name: Check latest tag follows semantic versioning
if: github.event_name == 'push'
uses: alejandrohdezma/actions/check-semver-tag@v1

- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
distribution: "liberica"
java-version: "11"
Expand All @@ -59,13 +59,13 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout project
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
with:
fetch-depth: 0
ref: main
token: ${{ secrets.ADMIN_GITHUB_TOKEN }}

- uses: actions/setup-java@387ac29b308b003ca37ba93a6cab5eb57c8f5f93 # v4.0.0
- uses: actions/setup-java@99b8673ff64fbf99d8d325f52d9a5bdedb8483e9 # v4.2.1
with:
distribution: "liberica"
java-version: "17"
Expand Down
8 changes: 4 additions & 4 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ ThisBuild / scalaVersion := _root_.scalafix.sbt.BuildInfo.scala
ThisBuild / organization := "com.alejandrohdezma"
ThisBuild / pluginCrossBuild / sbtVersion := "1.2.8"
ThisBuild / Test / parallelExecution := false
ThisBuild / versionPolicyIntention := Compatibility.BinaryAndSourceCompatible
ThisBuild / versionPolicyIntention := Compatibility.BinaryCompatible

addCommandAlias("ci-test", "fix --check; versionPolicyCheck; mdoc; test; publishLocal; scripted")
addCommandAlias("ci-docs", "github; mdoc; headerCreateAll; docusaurusPublishGhpages")
Expand All @@ -24,9 +24,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.5.1")
.settings(libraryDependencies += "org.scalameta" %% "munit" % "0.7.29" % Test)
.settings(libraryDependencies += "org.http4s" %% "http4s-dsl" % "0.23.26" % Test)
.settings(libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.6.0")
.settings(libraryDependencies += "org.scalameta" %% "munit" % "1.0.0" % Test)
.settings(libraryDependencies += "org.http4s" %% "http4s-dsl" % "0.23.27" % Test)
.settings(libraryDependencies += "org.http4s" %% "http4s-blaze-server" % "0.23.16" % Test)

lazy val `sbt-github-mdoc` = module
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % sys.props("plugin.version"))
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % sys.props("plugin.version"))
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
ThisBuild / scmInfo := Some(
ScmInfo(url("http://example.com"), "scm:git:https://github.com/alejandrohdezma/sbt-github.git")
)
ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.12", "3.3.0")
ThisBuild / crossScalaVersions := Seq("2.12.19", "2.13.12", "3.3.0") // scala-steward:off
ThisBuild / organization := "my.org"
ThisBuild / githubEnabled := true
ThisBuild / githubAuthToken := Some(AuthToken("1234"))
Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("com.alejandrohdezma" % "sbt-github-mdoc" % sys.props("plugin.version"))
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,6 @@ object SbtGithubPlugin extends AutoPlugin {
private def onGithub[A](default: A)(f: Def.Initialize[A]) =
Def.settingDyn(if (githubEnabled.value) f else Def.setting(default))

@SuppressWarnings(Array("scalafix:Disable.Option.get"))
private def onRepo[A](default: A)(f: Def.Initialize[Repository => A]) =
Def.settingDyn {
if (githubEnabled.value) Def.setting(f.value(repository.value.get)) else Def.setting(default)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ final case class Collaborators(list: List[Collaborator]) {
.groupBy(_.login)
.values
.toList
.map(_.head) /* scalafix:ok */
.map(_.head)
.sortBy(collaborator => collaborator.name -> collaborator.login)
}

Expand Down
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
@@ -1 +1 @@
sbt.version=1.9.9
sbt.version=1.10.1
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ class ClientSuite extends munit.FunSuite {
val result = client.get[String](url)

interceptMessage[IOException](s"Server returned HTTP response code: 403 for URL: $url") {
result.get // scalafix:ok Disable.Try.get
result.get
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ package object github {
implicit def CreatorToCollaborator(creator: Collaborator.Creator): Collaborator =
creator(AuthToken("123"))(GithubEntryPoint(url"http://example.com"))(
Logger.Null
).get // scalafix:ok Disable.Try.get
).get

implicit class URLInterpolator(private val sc: StringContext) extends AnyVal {

Expand All @@ -48,7 +48,7 @@ package object github {
implicit class RequestLinkOps(req: Request[IO]) {

def urlTo(path: String): String = {
val host = req.headers.get[Host].get // scalafix:ok Disable.Option.get
val host = req.headers.get[Host].get

s"http://${host.host}:${host.port.getOrElse(8080)}/$path"
}
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.9.9
sbt.version=1.10.1
2 changes: 1 addition & 1 deletion project/dependencies.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@ Compile / unmanagedSourceDirectories ++= Seq(
(ThisBuild / baseDirectory).value.getParentFile / "modules" / "sbt-github" / "src" / "main" / "scala"
)

libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.5.1"
libraryDependencies += "org.typelevel" %% "jawn-parser" % "1.6.0"
6 changes: 3 additions & 3 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.12.0")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.12.1")
addSbtPlugin("ch.epfl.scala" % "sbt-version-policy" % "3.2.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-ci" % "2.15.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-fix" % "0.7.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-modules" % "0.3.1")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafix-defaults" % "0.13.0")
addSbtPlugin("com.alejandrohdezma" % "sbt-scalafmt-defaults" % "0.9.0")
addSbtPlugin("com.github.sbt" % "sbt-ci-release" % "1.5.12")
addSbtPlugin("de.heikoseeberger" % "sbt-header" % "5.10.0")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.2")
addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.5.4")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.5.2")
addSbtPlugin("org.typelevel" % "sbt-tpolecat" % "0.5.1")
6 changes: 4 additions & 2 deletions website/docusaurus.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import {themes as prismThemes} from 'prism-react-renderer';

/** @type {import('@docusaurus/types').Config} */
const config = {
title: 'sbt-github',
Expand Down Expand Up @@ -70,8 +72,8 @@ const config = {
],
},
prism: {
theme: require('prism-react-renderer/themes/github'),
darkTheme: require('prism-react-renderer/themes/dracula'),
theme: prismThemes.github,
darkTheme: prismThemes.dracula,
additionalLanguages: ['java', 'scala'],
},
}),
Expand Down
20 changes: 10 additions & 10 deletions website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@
"write-heading-ids": "docusaurus write-heading-ids"
},
"dependencies": {
"@docusaurus/core": "2.3.1",
"@docusaurus/preset-classic": "2.3.1",
"@mdx-js/react": "^1.6.22",
"clsx": "^1.2.1",
"prism-react-renderer": "^1.3.5",
"react": "^17.0.2",
"react-dom": "^17.0.2"
"@docusaurus/core": "3.4.0",
"@docusaurus/preset-classic": "3.4.0",
"@mdx-js/react": "^3.0.0",
"prism-react-renderer": "^2.1.0",
"react": "^18.2.0",
"react-dom": "^18.2.0"
},
"devDependencies": {
"@docusaurus/module-type-aliases": "2.3.1"
"@docusaurus/module-type-aliases": "3.0.0",
"@docusaurus/types": "3.0.0"
},
"engines": {
"node": ">=16.14"
"node": ">=18.0"
}
}
}
Loading

0 comments on commit ea1705e

Please sign in to comment.