Update default branch to trunk

Author: oguzkocer

docs/UI-TESTS.md

@@ -20,7 +20,7 @@ You can run the tests locally with these steps:
 3. With the `WooCommerce` scheme selected in Xcode, navigate to Product > Test Plan and select `UITests`, or open the Test Navigator and select the `UITests` test plan.
 4. Navigate to Product > Test to run all the tests, or use the Test Navigator to run specific tests or test suites.
 
-We also run the UI tests on CircleCI on every commit to the `develop` or `release/*` branches. (See the [CircleCI config](../.circleci/config.yml) for device and workflow details.)
+We also run the UI tests on CircleCI on every commit to the `trunk` or `release/*` branches. (See the [CircleCI config](../.circleci/config.yml) for device and workflow details.)
 
 ## Adding tests
 

docs/app-local-settings.md

@@ -8,15 +8,15 @@ Initial goals were:
 - make data typed
 - inject storage layer as dependency.
 
-Retrieving and storing the data is done via [`AppSettingsAction`](https://github.com/woocommerce/woocommerce-ios/blob/develop/Yosemite/Yosemite/Actions/AppSettingsAction.swift) and most of the logic happens in [`AppSettingsStore`](https://github.com/woocommerce/woocommerce-ios/blob/develop/Yosemite/Yosemite/Stores/AppSettingsStore.swift).
+Retrieving and storing the data is done via [`AppSettingsAction`](https://github.com/woocommerce/woocommerce-ios/blob/trunk/Yosemite/Yosemite/Actions/AppSettingsAction.swift) and most of the logic happens in [`AppSettingsStore`](https://github.com/woocommerce/woocommerce-ios/blob/trunk/Yosemite/Yosemite/Stores/AppSettingsStore.swift).
 There are a few data models + plist files separated for specific features and use cases.
 
 ## General use cases
 
-- [`GeneralAppSettings`](https://github.com/woocommerce/woocommerce-ios/blob/develop/Storage/Storage/Model/GeneralAppSettings.swift) handles settings universal to all stores.
-- [`GeneralStoreSettings`](https://github.com/woocommerce/woocommerce-ios/blob/develop/Storage/Storage/Model/GeneralStoreSettings.swift) handles settings unique for each store. Cleared on logout.
-- [`StoredProductSettings`](https://github.com/woocommerce/woocommerce-ios/blob/develop/Networking/Networking/Model/Product/StoredProductSettings.swift) handles products-specific settings, unique for each store. Cleared on logout.
-- [`StoredOrderSettings`](https://github.com/woocommerce/woocommerce-ios/blob/develop/Networking/Yosemite/Model/Product/StoredOrderSettings.swift) handles orders-specific settings, unique for each store. Cleared on logout.
+- [`GeneralAppSettings`](https://github.com/woocommerce/woocommerce-ios/blob/trunk/Storage/Storage/Model/GeneralAppSettings.swift) handles settings universal to all stores.
+- [`GeneralStoreSettings`](https://github.com/woocommerce/woocommerce-ios/blob/trunk/Storage/Storage/Model/GeneralStoreSettings.swift) handles settings unique for each store. Cleared on logout.
+- [`StoredProductSettings`](https://github.com/woocommerce/woocommerce-ios/blob/trunk/Networking/Networking/Model/Product/StoredProductSettings.swift) handles products-specific settings, unique for each store. Cleared on logout.
+- [`StoredOrderSettings`](https://github.com/woocommerce/woocommerce-ios/blob/develop/Yosemite/Yosemite/Model/Orders/StoredOrderSettings.swift) handles orders-specific settings, unique for each store. Cleared on logout.
 
 
 ## How to add new property

docs/creating-core-data-model-versions.md

@@ -12,14 +12,14 @@ The sequential version numbers are important because that sequence is used by th
 
 ## Avoid Modifying Existing Model Versions
 
-Once a model version is merged in `develop`, consider creating a new model version instead. This helps us avoid issues like:
+Once a model version is merged in `trunk`, consider creating a new model version instead. This helps us avoid issues like:
 
-- Different model version sequences between production and `develop`.
+- Different model version sequences between production and `trunk`.
 - Inconsistent model version references if multiple model versions, created by different developers, refer to the same model version.
 
 These scenarios can lead to users' databases to be incompatible with the current model and they would be **unable to load** their data. The app would end up recreating the database. It's not an ideal scenario.
 
-Also, avoid modifying model versions in release branches. If possible, model version changes should be done and merged swiftly in `develop`.
+Also, avoid modifying model versions in release branches. If possible, model version changes should be done and merged swiftly in `trunk`.
 
 ## Always Add Unit Tests
 

docs/fakeable.md

@@ -4,20 +4,20 @@ Instantiating models for tests is not a simple task. Sometimes, the initializer
 This inconvenience hurts our ability to efficiently unit test our app, which could discourage members from writing them at all.
 
 To help with this, we have introduced a new framework called `Fakes.framework`. This framework defines `.fake()` functions for all of our networking models.
-The `.fake()` function instantiates a type with fake values. As of now, we are [defining](https://github.com/woocommerce/woocommerce-ios/blob/develop/Fakes/Fakes/Fake.swift) fake values as empty values.
+The `.fake()` function instantiates a type with fake values. As of now, we are [defining](https://github.com/woocommerce/woocommerce-ios/blob/trunk/Fakes/Fakes/Fake.swift) fake values as empty values.
 
-This, in conjunction with the [copiable pattern](https://github.com/woocommerce/woocommerce-ios/blob/develop/docs/copiable.md) allow us to write tests like:
+This, in conjunction with the [copiable pattern](https://github.com/woocommerce/woocommerce-ios/blob/trunk/docs/copiable.md) allow us to write tests like:
 
 ```swift
 func test() {
      // Given
      let initialProduct = Product.fake()
      let expectedProduct = initialProduct.copy(name: "new-name")
      let ViewModel = ViewModel(product: initialProduct)
-     
+
      // When
      viewModel.updateName("new_name")
-     
+
      // Then
      XCTAssertEqual(viewModel.product, expectedProduct)
 }
@@ -49,14 +49,14 @@ To generate a `fake()` method:
     $ rake generate
     ```
 
-    This will update the [Fakes.generated](https://github.com/woocommerce/woocommerce-ios/blob/develop/Fakes/Fakes/Fakes.generated.swift) file with the new `fake()` method.
+    This will update the [Fakes.generated](https://github.com/woocommerce/woocommerce-ios/blob/trunk/Fakes/Fakes/Fakes.generated.swift) file with the new `fake()` method.
 
 5. Compile the project.
 
 
 ## Modifying The Fakeable Code Generation
 
-The [`rake generate`](../Rakefile) command executes the Sourcery configuration files located in the [`CodeGeneration/Sourcery/Fakes` folder](../CodeGeneration/Sourcery/Fakes). 
+The [`rake generate`](../Rakefile) command executes the Sourcery configuration files located in the [`CodeGeneration/Sourcery/Fakes` folder](../CodeGeneration/Sourcery/Fakes).
 
 ```
 Networking module → Networking-Fakes.yaml

fastlane/Fastfile

@@ -86,7 +86,7 @@ platform :ios do
   # bundle exec fastlane code_freeze
   # 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 = ios_codefreeze_prechecks(options)
 
@@ -115,7 +115,7 @@ platform :ios do
   # bundle exec fastlane complete_code_freeze
   # bundle exec fastlane complete_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 :complete_code_freeze do |options|
     ios_completecodefreeze_prechecks(options)
     ios_localize_project

fastlane/Pluginfile

@@ -6,6 +6,7 @@ group :screenshots, optional: true do
   gem 'rmagick', '~> 3.2.0'
 end
 
+ # TODO: Update to the next major version after: https://github.com/wordpress-mobile/release-toolkit/pull/319
 gem 'fastlane-plugin-wpmreleasetoolkit', '~> 2.0'
 gem 'fastlane-plugin-sentry', '~> 1.0'
 gem 'fastlane-plugin-appcenter', '~> 1.6'