From 8ab5d09630de478d73645200a07df952f8d7ac5e Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sun, 6 Feb 2022 22:05:24 +0100 Subject: [PATCH] Rename master branch to main --- .scala-steward.conf | 2 +- project/Omnidoc.scala | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.scala-steward.conf b/.scala-steward.conf index e66bd9908..c8d6b66c0 100644 --- a/.scala-steward.conf +++ b/.scala-steward.conf @@ -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." } ] diff --git a/project/Omnidoc.scala b/project/Omnidoc.scala index fe9509f08..39c93cf7b 100644 --- a/project/Omnidoc.scala +++ b/project/Omnidoc.scala @@ -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. @@ -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