From 935901bef55788b7f5e633a3d28dd8410fb47f69 Mon Sep 17 00:00:00 2001 From: Matthias Kurz Date: Sat, 5 Feb 2022 19:18:26 +0100 Subject: [PATCH] Rename master branch to main --- .github/workflows/release-drafter.yml | 2 +- .mergify.yml | 4 ++-- .travis.yml | 2 +- README.md | 2 +- src/main/scala/interplay/Omnidoc.scala | 2 +- src/main/scala/interplay/PlayBuildBase.scala | 4 ++-- src/sbt-test/interplay/library/build.sbt | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/release-drafter.yml b/.github/workflows/release-drafter.yml index 17fdb96..896edaf 100644 --- a/.github/workflows/release-drafter.yml +++ b/.github/workflows/release-drafter.yml @@ -3,7 +3,7 @@ name: Release Drafter on: push: branches: - - master + - main jobs: update_release_draft: diff --git a/.mergify.yml b/.mergify.yml index f9b20e7..9ef1b93 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -33,14 +33,14 @@ pull_request_rules: label: remove: [status:needs-backport-1.3] - - name: forward patches to master branch + - name: forward patches to main branch conditions: - merged - label=status:needs-forwardport actions: backport: branches: - - master + - main label: remove: [status:needs-forwardport] diff --git a/.travis.yml b/.travis.yml index 6171a34..84ff99a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,7 @@ stages: - name: check - name: publish - if: ((branch = master AND type = push) OR (tag IS present)) AND NOT fork + if: ((branch = main AND type = push) OR (tag IS present)) AND NOT fork cache: directories: diff --git a/README.md b/README.md index 45792e1..a94653d 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ Interplay is a set of sbt plugins for Play builds, sharing common configuration between Play builds so that they can be configured in one place. -[![Build Status](https://travis-ci.org/playframework/interplay.svg?branch=master)](https://travis-ci.org/playframework/interplay) +[![Build Status](https://travis-ci.org/playframework/interplay.svg?branch=main)](https://travis-ci.org/playframework/interplay) ## Usage diff --git a/src/main/scala/interplay/Omnidoc.scala b/src/main/scala/interplay/Omnidoc.scala index 0d6358b..0499880 100644 --- a/src/main/scala/interplay/Omnidoc.scala +++ b/src/main/scala/interplay/Omnidoc.scala @@ -29,7 +29,7 @@ object Omnidoc extends AutoPlugin { override def projectSettings = Seq( omnidocSourceUrl := omnidocGithubRepo.?.value map { repo => - val development: String = (omnidocSnapshotBranch ?? "master").value + val development: String = (omnidocSnapshotBranch ?? "main").value val tagged: String = (omnidocTagPrefix ?? "v").value + version.value val tree: String = if (isSnapshot.value) development else tagged val prefix: String = "/" + (omnidocPathPrefix ?? "").value diff --git a/src/main/scala/interplay/PlayBuildBase.scala b/src/main/scala/interplay/PlayBuildBase.scala index adc12c9..c3379d6 100644 --- a/src/main/scala/interplay/PlayBuildBase.scala +++ b/src/main/scala/interplay/PlayBuildBase.scala @@ -22,7 +22,7 @@ object PlayBuildBase extends AutoPlugin { // This is not using sbt-git because we need a more stable way to set // the current branch in a more stable way, for example, we may want to - // get the current branch as "master" even if we are at a detached commit. + // get the current branch as "main" even if we are at a detached commit. // // This is useful when running tasks on Travis, where the builds runs in // a detached commit. See the discussion here: @@ -93,7 +93,7 @@ object PlayBuildBase extends AutoPlugin { } orElse { sys.props.get("currentBranch") } getOrElse { - "master" + "main" }, pomExtra := { diff --git a/src/sbt-test/interplay/library/build.sbt b/src/sbt-test/interplay/library/build.sbt index 0998d07..f341dc5 100644 --- a/src/sbt-test/interplay/library/build.sbt +++ b/src/sbt-test/interplay/library/build.sbt @@ -17,7 +17,7 @@ InputKey[Unit]("contains") := { TaskKey[Unit]("verifyOmnidocSourceUrl") := { import java.util.jar.JarFile - val expected = "https://github.com/playframework/mock/tree/master" + val expected = "https://github.com/playframework/mock/tree/main" val sourceUrl = omnidocSourceUrl.value sourceUrl match {