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

Jump to bottom

Try to update to sbt-typelevel #449

Merged
merged 17 commits into from
Mar 6, 2022
Merged

Try to update to sbt-typelevel #449

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
8da4d62
Try to update to sbt-typelevel
johnynek Mar 5, 2022
66f2798
add headers
johnynek Mar 5, 2022
735483c
do headerCheckAll
johnynek Mar 5, 2022
3f388e1
fix weird Generators broken code, remove warnings
johnynek Mar 5, 2022
2b5f878
format, remove noPublish
johnynek Mar 5, 2022
01acd3a
format build.sbt, clean a few things
johnynek Mar 5, 2022
d468770
try to disable native on scala3
johnynek Mar 6, 2022
3483468
generate workflow
johnynek Mar 6, 2022
db9355b
disable warning in CI :(
johnynek Mar 6, 2022
c783cb7
try once again...
johnynek Mar 6, 2022
de3b869
address scala 3 warning
johnynek Mar 6, 2022
892c9b2
keep on trying
johnynek Mar 6, 2022
dd9f0f6
fix another warning
johnynek Mar 6, 2022
c51b070
Add jvmopts
johnynek Mar 6, 2022
7565797
add typelevel-set, coverage
johnynek Mar 6, 2022
272493e
update github ci
johnynek Mar 6, 2022
28a15c7
keep on hacking
johnynek Mar 6, 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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ c.render(60)
// )
```

For more examples, see the [tutorial](docs/src/main/mdoc/intro.md).
For more examples, see the [tutorial](docs/src/main/mdoc/index.md).

## Benchmarks

Expand Down
19 changes: 17 additions & 2 deletions build.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,22 @@ ThisBuild / crossScalaVersions := Seq(Scala213, Scala212, Scala3Version)
ThisBuild / githubWorkflowBuildMatrixExclusions +=
MatrixExclude(Map("project" -> "rootNative", "scala" -> Scala3Version))

// Setup coverage
ThisBuild / githubWorkflowAddedJobs +=
WorkflowJob(
id = "coverage",
name = "Generate coverage report",
scalas = List("2.13.8"),
steps = List(WorkflowStep.Checkout) ++ WorkflowStep.SetupJava(
githubWorkflowJavaVersions.value.toList
) ++ githubWorkflowGeneratedCacheSteps.value ++ List(
WorkflowStep.Sbt(List("coverage", "rootJVM/test", "coverageAggregate")),
WorkflowStep.Run(List("bash <(curl -s https://codecov.io/bash)"))
)
)

ThisBuild / tlCiReleaseBranches := Seq("master")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
ThisBuild / tlCiReleaseBranches := Seq("master")
ThisBuild / tlCiReleaseBranches := Seq("master")
ThisBuild / tlSitePublishBranch := Some("master")


lazy val root = tlCrossRootProject.aggregate(core, cats)

ThisBuild / developers := List(
Expand Down Expand Up @@ -93,8 +109,7 @@ lazy val benchmark = project
lazy val docs = project
.in(file("docs"))
.dependsOn(coreJVM, catsJVM)
.enablePlugins(MdocPlugin)
.enablePlugins(NoPublishPlugin)
.enablePlugins(TypelevelSitePlugin)
.settings(
crossScalaVersions := List(Scala212),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
crossScalaVersions := List(Scala212),
crossScalaVersions := List(Scala213),

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or actually, you can remove this setting completely.

name := "paiges-docs",
Expand Down
0 docs/src/main/mdoc/intro.md → docs/src/main/mdoc/index.md
View file
Open in desktop
File renamed without changes.
1 change: 1 addition & 0 deletions project/plugins.sbt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ addSbtPlugin("org.scalameta" % "sbt-mdoc" % "2.3.1")
addSbtPlugin("org.scalameta" % "sbt-scalafmt" % "2.4.6")
addSbtPlugin("org.scoverage" % "sbt-scoverage" % "1.9.3")
addSbtPlugin("org.typelevel" % "sbt-typelevel" % "0.4.6")
addSbtPlugin("org.typelevel" % "sbt-typelevel-site" % "0.4.6")
addSbtPlugin("pl.project13.scala" % "sbt-jmh" % "0.4.3")