Merge pull request #659 from mkurz/rename_main_50x

[5.0.x] Rename master branch to main

.github/settings.yml

@@ -7,7 +7,7 @@ repository:
   # We don't need wiki since the documentation lives in playframework.com
   has_wiki: false
   has_downloads: true
-  default_branch: master
+  default_branch: main
   allow_squash_merge: true
   allow_merge_commit: false
   allow_rebase_merge: false

.gitignore

@@ -22,3 +22,5 @@ bin
 
 # IntelliJ IDEA specific
 .idea
+
+.bsp/

.scalafmt.conf

@@ -1,4 +1,4 @@
-# This file was originally copied from https://github.com/playframework/playframework/blob/master/.scalafmt.conf
+# This file was originally copied from https://github.com/playframework/playframework/blob/main/.scalafmt.conf
 align = true
 assumeStandardLibraryStripMargin = true
 danglingParentheses = true

CONTRIBUTING.md

@@ -28,13 +28,13 @@ Before making a contribution, it is important to make sure that the change you w
         * Java APIs should go to `framework/play/src/main/java`, package structure is `play.myapipackage.xxxx`
         * Scala APIs should go to `framework/play/src/main/scala`, where the package structure is `play.api.myapipackage`
         * Features are forever, always think about whether a new feature really belongs to the core framework or if it should be implemented as a module
-        * Code must conform to standard style guidelines and pass all tests (see [validatePullRequest](https://github.com/playframework/playframework/blob/master/framework/validatePullRequest))
+        * Code must conform to standard style guidelines and pass all tests (see [validatePullRequest](https://github.com/playframework/playframework/blob/main/framework/validatePullRequest))
     6. New files must:
         * Have a Typesafe copyright header in the style of ``Copyright (C) 2009-2015 Typesafe Inc. <http://www.typesafe.com>``.
         * Not use ``@author`` tags since it does not encourage [Collective Code Ownership](http://www.extremeprogramming.org/rules/collective.html).
 3. Ensure that your commits are squashed.  See [working with git](https://playframework.com/documentation/latest/WorkingWithGit) for more information.
 4. Submit a pull request.
 
-If the pull request does not meet the above requirements then the code should **not** be merged into master, or even reviewed - regardless of how good or important it is. No exceptions.
+If the pull request does not meet the above requirements then the code should **not** be merged into main, or even reviewed - regardless of how good or important it is. No exceptions.
 
 The pull request will be reviewed according to the [implementation decision process](https://playframework.com/community-process#Implementation-decisions).

README.md

@@ -1,6 +1,6 @@
 # Play Slick
 
-[![Build Status](https://travis-ci.org/playframework/play-slick.png?branch=master)](https://travis-ci.org/playframework/play-slick) [![codecov.io](https://codecov.io/github/playframework/play-slick/coverage.svg?branch=master)](https://codecov.io/github/playframework/play-slick?branch=master)
+[![Build Status](https://travis-ci.org/playframework/play-slick.png?branch=main)](https://travis-ci.org/playframework/play-slick) [![codecov.io](https://codecov.io/github/playframework/play-slick/coverage.svg?branch=main)](https://codecov.io/github/playframework/play-slick?branch=main)
 
 The Play Slick module makes [Slick] a first-class citizen of [Play]. It consists of two features:
 

RELEASING.md

@@ -16,8 +16,8 @@ Releasing a new version of play-slick is truly simple.
 That will start the build. The output should be similar to
 
 ```shell
-play ▶ [] ~/deploy$ ./release --project play-slick --branch master --tag 5.0.0
-This will release play-slick from branch master using JDK8, continue? [y/n] y
+play ▶ [] ~/deploy$ ./release --project play-slick --branch main --tag 5.0.0
+This will release play-slick from branch main using JDK8, continue? [y/n] y
 java version "1.8.0_31"
 ...
 ```
@@ -33,7 +33,7 @@ Once the binaries are successfully deployed, you will be prompted if you wish to
 [info] Setting version to '1.0.2-SNAPSHOT'.
 [info] Reapplying settings...
 [info] Set current project to play-slick-root (in build file:/home/play/deploy/play-slick/)
-[info] [master fa73a4f] Setting version to 1.0.2-SNAPSHOT
+[info] [main fa73a4f] Setting version to 1.0.2-SNAPSHOT
 [info]  1 file changed, 1 insertion(+), 1 deletion(-)
 Push changes to the remote repository (y/n)? [y]
 ```

docs/manual/working/scalaGuide/main/sql/slick/PlaySlick.md

@@ -75,7 +75,7 @@ slick.dbs.default.db.dataSourceClass = "slick.jdbc.DatabaseUrlDataSource"
 slick.dbs.default.db.properties.driver = "org.postgresql.Driver"
 ```
 
-On some platforms, such as Heroku, you may [substitute](https://github.com/lightbend/config/blob/master/HOCON.md#substitution-fallback-to-environment-variables) the `JDBC_DATABASE_URL` environment variable, which is in the format `jdbc:vendor://host:port/db?args`, if it is available. For example:
+On some platforms, such as Heroku, you may [substitute](https://github.com/lightbend/config/blob/main/HOCON.md#substitution-fallback-to-environment-variables) the `JDBC_DATABASE_URL` environment variable, which is in the format `jdbc:vendor://host:port/db?args`, if it is available. For example:
 
 ```conf
 slick.dbs.default.profile="slick.jdbc.PostgresProfile$"