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

Rename master branch to main #713

Merged
merged 1 commit into from
Feb 7, 2022
Merged

Rename master branch to main #713

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .scala-steward.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ pullRequests.frequency = "@weekly"

updates.pin = [
// Play JSON should follow the Jackson version in Akka to avoid conflicts in Playframework
// https://github.com/akka/akka/blob/master/project/Dependencies.scala#L24
// https://github.com/akka/akka/blob/main/project/Dependencies.scala#L24
{ groupId = "com.fasterxml.jackson.core", version = "2.11." }
{ groupId = "com.fasterxml.jackson.datatype", version = "2.11." }
]
Expand Down
4 changes: 2 additions & 2 deletions project/Omnidoc.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import sbt._

/**
* Copied in from
* https://github.com/playframework/interplay/blob/master/src/main/scala/interplay/Omnidoc.scala
* https://github.com/playframework/interplay/blob/main/src/main/scala/interplay/Omnidoc.scala
*
* This AutoPlugin adds the `Omnidoc-Source-URL` key on the MANIFEST.MF of artifact-sources.jar so
* later Omnidoc can use that value to link scaladocs to GitHub sources.
Expand Down Expand Up @@ -32,7 +32,7 @@ object Omnidoc extends AutoPlugin {

override def projectSettings = Seq(
omnidocSourceUrl := omnidocGithubRepo.map { repo =>
val development: String = (omnidocSnapshotBranch ?? "master").value
val development: String = (omnidocSnapshotBranch ?? "main").value
val tagged: String = omnidocTagPrefix.getOrElse("v") + version.value
val tree: String = if (isSnapshot.value) development else tagged
val prefix: String = "/" + (omnidocPathPrefix ?? "").value
Expand Down