Update default branch to trunk

Author: oguzkocer

.circleci/config.yml

@@ -354,11 +354,11 @@ workflows:
               ignore: /pull\/[0-9]+/
       - Connected Tests:
           post-to-slack: true
-          # Always run connected tests on develop and release branches
+          # Always run connected tests on trunk and release branches
           filters:
             branches:
               only:
-                - develop
+                - trunk
                 - /^release.*/
                 - /^gutenberg\/integrate_release_.*/
   Optional Tests:
@@ -373,7 +373,7 @@ workflows:
           filters:
             branches:
               ignore:
-                - develop
+                - trunk
                 - /^release.*/
                 - /^gutenberg\/integrate_release_.*/
                 - /pull\/[0-9]+/

docs/coding-style.md

@@ -27,7 +27,7 @@ Once installed, you can configure the plugin here:
 
 `Android Studio > Preferences... > Tools > Checkstyle`
 
-From there, add and enable the custom configuration file, located at [config/checkstyle.xml](https://github.com/wordpress-mobile/WordPress-Android/blob/develop/config/checkstyle.xml).
+From there, add and enable the custom configuration file, located at [config/checkstyle.xml](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/config/checkstyle.xml).
 
 ## ktlint
 
@@ -53,4 +53,4 @@ Once installed, you can configure the plugin here:
 
 `Android Studio > Preferences... > Tools > Detekt`
 
-From there, add and enable the custom configuration file, located at [config/detekt/detekt.yml](https://github.com/wordpress-mobile/WordPress-Android/blob/develop/config/detekt/detekt.yml).
+From there, add and enable the custom configuration file, located at [config/detekt/detekt.yml](https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/config/detekt/detekt.yml).

docs/pull-request-guidelines.md

@@ -6,11 +6,11 @@ Please read [Feature Branches](https://make.wordpress.org/mobile/handbook/genera
 
 ## Commits
 
-As you commit code to these branches, don’t tag the issue number in the individual commit messages as it pollutes the pull request and makes it messier, just attach the issue number to the final pull request. Before you submit your final pull request, make sure all your branches are up to date with `develop`.
+As you commit code to these branches, don’t tag the issue number in the individual commit messages as it pollutes the pull request and makes it messier, just attach the issue number to the final pull request. Before you submit your final pull request, make sure all your branches are up to date with `trunk`.
 
 ## Anatomy of a Good Pull Request
 
-When you are ready, please, spend time crafting a good Pull Request, since it will have a huge impact on the work of reviewers, release managers and testers. 
+When you are ready, please, spend time crafting a good Pull Request, since it will have a huge impact on the work of reviewers, release managers and testers.
 
 **Title**: A good descriptive title.
 
@@ -26,4 +26,4 @@ When you are ready, please, spend time crafting a good Pull Request, since it wi
 
 
 
-_Thank you very much for contributing to WordPress for Android!_
+_Thank you very much for contributing to WordPress for Android!_

fastlane/Fastfile

@@ -132,7 +132,7 @@ REPOSITORY_NAME = 'WordPress-Android'
   # bundle exec fastlane code_freeze update_release_branch_version:false
   # bundle exec fastlane code_freeze skip_confirm:true
   #####################################################################################
-  desc 'Creates a new release branch from the current develop'
+  desc 'Creates a new release branch from the current trunk'
   lane :code_freeze do |options|
     old_version = android_codefreeze_prechecks(skip_confirm: options[:skip_confirm])
 

fastlane/Pluginfile

@@ -6,5 +6,6 @@ group :screenshots, optional: true do
   gem 'rmagick', '~> 4.1'
 end
 
-# gem 'fastlane-plugin-wpmreleasetoolkit', git: '[email protected]:wordpress-mobile/release-toolkit.git', branch: 'develop'
+# gem 'fastlane-plugin-wpmreleasetoolkit', git: '[email protected]:wordpress-mobile/release-toolkit.git', branch: 'trunk'
+# TODO: Update to the next major version after: https://github.com/wordpress-mobile/release-toolkit/pull/319
 gem 'fastlane-plugin-wpmreleasetoolkit', '~> 2.0'

gradle.properties-example

@@ -14,7 +14,7 @@ android.useAndroidX=true
 android.enableJetifier=true
 
 # For more details on what these properties do visit
-# https://github.com/wordpress-mobile/WordPress-Android/blob/develop/README.md
+# https://github.com/wordpress-mobile/WordPress-Android/blob/trunk/README.md
 
 wp.oauth.app_id = wordpress
 wp.oauth.app_secret = wordpress

libs/mocks/README.md

@@ -9,7 +9,7 @@ Network mocking for testing the WordPress mobile apps
 To use this library in your project, you must set it up as a subtree.
 From the root of your main project, add the subtree:
 
-    $ git subtree add --prefix=libs/mocks [email protected]:wordpress-mobile/WordPressMocks.git develop
+    $ git subtree add --prefix=libs/mocks [email protected]:wordpress-mobile/WordPressMocks.git trunk
 
 This will create a new directory, `libs/mocks`, containing the contents of this repository.
 
@@ -49,7 +49,7 @@ Here `8282` is the port to run the server on. It can now be accessed from `http:
 
 You can fetch the latest changes made to this library into your project using:
 
-    $ git subtree pull --prefix=libs/mocks [email protected]:wordpress-mobile/WordPressMocks.git develop --squash
+    $ git subtree pull --prefix=libs/mocks [email protected]:wordpress-mobile/WordPressMocks.git trunk --squash
 
 And you can push your own changes upstream to `WordPressMocks` using:
 
@@ -61,17 +61,17 @@ Note: You can add this repository as a remote to simplify the `git subtree push`
 
 This will allow to use this form instead:
 
-    $ git subtree pull --prefix=libs/mocks mockslib develop --squash
-    
-    
-## Creating a mock file 
+    $ git subtree pull --prefix=libs/mocks mockslib trunk --squash
 
-The JSON files used by WireMock to handle requests and are located in `src/main/assets`.  To generate one of these files 
+
+## Creating a mock file
+
+The JSON files used by WireMock to handle requests and are located in `src/main/assets`.  To generate one of these files
 you're first going to want to set up [Charles Proxy](https://www.charlesproxy.com/) (or similar) to work with your Android emulator.
- If you've never done this I found 
-[this article](https://medium.com/@daptronic/the-android-emulator-and-charles-proxy-a-love-story-595c23484e02) to be a 
+ If you've never done this I found
+[this article](https://medium.com/@daptronic/the-android-emulator-and-charles-proxy-a-love-story-595c23484e02) to be a
 good place to start. Once you've done that you'll want to walk through the specfic flow you're testing and store the JSON contents
-of the necessary responses in the `jsonBody` field of the `response` field in the mock file. 
+of the necessary responses in the `jsonBody` field of the `response` field in the mock file.
 
 Here's an example of what this might look like,
 
@@ -93,10 +93,10 @@ Here's an example of what this might look like,
         }
     }
 }
-``` 
+```
 
-These files are used to match network requests while the tests are being run. For more on request matching with 
-WireMock check out [their documentation](http://wiremock.org/docs/request-matching/). 
+These files are used to match network requests while the tests are being run. For more on request matching with
+WireMock check out [their documentation](http://wiremock.org/docs/request-matching/).
 
 ## License ##