Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.4 -> main #359

Merged
merged 8 commits into from
Aug 22, 2022
Merged

0.4 -> main #359

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
421d048
Update typelevel-scalafix to 0.1.5
typelevel-steward[bot] Jul 18, 2022
195bfa5
Merge pull request #346 from typelevel/update/typelevel-scalafix-0.1.5
mergify[bot] Jul 18, 2022
0063f6e
Update scalafmt-core to 3.5.9
typelevel-steward[bot] Aug 11, 2022
3f68700
Reformat with scalafmt 3.5.9
typelevel-steward[bot] Aug 11, 2022
5bfd073
Add 'Reformat with scalafmt 3.5.9' to .git-blame-ignore-revs
typelevel-steward[bot] Aug 11, 2022
d8a628f
Merge pull request #354 from typelevel/update/scalafmt-core-3.5.9
armanbilge Aug 12, 2022
89baeb7
Fallback to apiURL if javadocioUrl does not exist
valencik Aug 14, 2022
25c24d6
Merge pull request #356 from typelevel/apiURL-fallback
armanbilge Aug 14, 2022
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
Prev Previous commit
Next Next commit
Fallback to apiURL if javadocioUrl does not exist 
Format and wrap in lazy val
  • Loading branch information
@valencik
valencik committed Aug 14, 2022
commit 89baeb7db87a20d09820f864592f703081f406e4
6 changes: 5 additions & 1 deletion site/src/main/scala/org/typelevel/sbt/TypelevelSitePlugin.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,12 @@ object TypelevelSitePlugin extends AutoPlugin {
val p = tlSiteApiPackage.value.fold("")(_.replace('.', '/') + "/index.html")
url(s"https://www.javadoc.io/doc/$o/$n/$v/$p")
}
lazy val fallbackUrl = for {
moduleId <- (ThisProject / tlSiteApiModule).value
apiURL <- moduleId.extraAttributes.get("e:info.apiURL")
} yield url(apiURL)

tlSiteApiUrl.value.orElse(javadocioUrl)
tlSiteApiUrl.value.orElse(javadocioUrl).orElse(fallbackUrl)
},
tlSiteHeliumConfig := {
Helium
Expand Down