chore: Changed the repo's default branch to 'main' (#579)

Author: palpatim

AmplifyPlugins/DataStore/AWSDataStoreCategoryPlugin/Sync/InitialSync/InitialSyncOperation.swift

@@ -66,7 +66,7 @@ final class InitialSyncOperation: AsynchronousOperation {
             return nil
         }
 
-        //TODO: Update to use TimeInterval.milliseconds when it is pushed to master branch
+        //TODO: Update to use TimeInterval.milliseconds when it is pushed to main branch
         // https://github.com/aws-amplify/amplify-ios/issues/398
         let lastSyncDate = Date(timeIntervalSince1970: TimeInterval(lastSync) / 1_000)
         let secondsSinceLastSync = (lastSyncDate.timeIntervalSinceNow * -1)

AmplifyPlugins/DataStore/AWSDataStoreCategoryPluginIntegrationTests/README.md

@@ -7,7 +7,7 @@ The following steps demonstrate how to set up DataStore with a conflict resoluti
 
 1. `amplify init` and choose `iOS` for type of app you are building
 
-2. Create the `schema.graphql` file in the same directory and use the schema from [AmplifyTestCommon](https://github.com/aws-amplify/amplify-ios/blob/master/AmplifyTestCommon/Models/schema.graphql)
+2. Create the `schema.graphql` file in the same directory and use the schema from [AmplifyTestCommon](https://github.com/aws-amplify/amplify-ios/blob/main/AmplifyTestCommon/Models/schema.graphql)
 
 3. `amplify add api`
 

CHANGELOG.md

@@ -4,13 +4,15 @@ All notable changes to this project will be documented in this file. See [standa
 
 ## Unreleased
 
-### ⚠ BREAKING CHANGES
-* **Tools:** Update Amplify tools script to resolve min CLI version for codegen changes ([#554](https://github.com/aws-amplify/amplify-ios/pull/554))
-
 ### Bug Fixes
 
 * **DataStore:** Fixed a DataStore issue where lazy `List<M>` initialization would fail for relationships 3+ levels deep ([#534](https://github.com/aws-amplify/amplify-ios/pull/534))
 * **Tools:** Update Amplify tools script to resolve node correctly when NVM is installed ([#524](https://github.com/aws-amplify/amplify-ios/pull/524))
+* **Tools:** Update Amplify tools script to resolve min CLI version for codegen changes ([#554](https://github.com/aws-amplify/amplify-ios/pull/554))
+
+### Misc
+
+* Changed the repo's default branch to 'main' ([#579](https://github.com/aws-amplify/amplify-ios/pull/579))
 
 ## 1.0.1 (2020-06-05)
 

CONTRIBUTING.md

@@ -156,20 +156,20 @@ Create a commit with the proposed change changes:
 ### Step 6: Pull Request
 
 - Push your changes to your GitHub fork
-- Submit a Pull Requests on the aws-sdk-ios repo to the `master` branch and add the Amplify Native team using @aws-amplify/amplify-native so we can approve/provide feedback.
+- Submit a Pull Requests on the amplify-ios repo to the `main` branch and add the Amplify Native team using @aws-amplify/amplify-native so we can approve/provide feedback.
 - The title of your PR must be descriptive to the specific change.
 - No period at the end of the title.
 - Pull Request message should indicate which issues are fixed: `fixes #<issue>` or `closes #<issue>`.
 - PR messaged should include shout out to collaborators.
 - If not obvious (i.e. from unit tests), describe how you verified that your change works.
 - If this PR includes breaking changes, they must be listed at the top of the changelog as described above in the Pull Request Checklist.
 - Discuss review comments and iterate until you get at least one “Approve”. When iterating, push new commits to the same branch. 
-- Usually all these are going to be squashed when you merge to master.
+- Usually all these are going to be squashed when you merge to main.
 - Make sure to update the PR title/description if things change. 
-- Rebase with master if the master branch has commits ahead of your fork.
+- Rebase with the `main` branch if it has commits ahead of your fork.
 
 ### Step 7: Merge
-Once your PR has been approved and tested, we will merge it into `master` for you and barring any unforeseen circumstances, your changes will be released in our next version. Yay!! 
+Once your PR has been approved and tested, we will merge it into `main` for you and barring any unforeseen circumstances, your changes will be released in our next version. Yay!! 
 
 ## Troubleshooting
 
@@ -206,6 +206,6 @@ If you discover a potential security issue in this project we ask that you notif
 
 ## Licensing
 
-See the [LICENSE](https://github.com/aws-amplify/amplify-ios/blob/master/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
+See the [LICENSE](https://github.com/aws-amplify/amplify-ios/blob/main/LICENSE) file for our project's licensing. We will ask you to confirm the licensing of your contribution.
 
 We may ask you to sign a [Contributor License Agreement (CLA)](http://en.wikipedia.org/wiki/Contributor_License_Agreement) for larger changes.