Merge pull request #1478 from Automattic/update/default-branch-to-trunk

Update default branch to trunk

.circleci/config.yml

@@ -138,7 +138,7 @@ jobs:
             success_message: '${SLACK_SUCCESS_MESSAGE}'
   UI Tests:
     # Props to work done by others in this file and in
-    # https://github.com/wordpress-mobile/WordPress-iOS/blob/develop/.circleci/config.yml
+    # https://github.com/wordpress-mobile/WordPress-iOS/blob/trunk/.circleci/config.yml
     # this is a combined rip-off from both
     parameters:
       device:

Gemfile.lock

@@ -153,7 +153,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-appcenter (1.11.1)
     fastlane-plugin-sentry (1.6.0)
-    fastlane-plugin-wpmreleasetoolkit (2.1.0)
+    fastlane-plugin-wpmreleasetoolkit (2.3.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       chroma (= 0.2.0)
@@ -170,7 +170,7 @@ GEM
     fourflusher (2.3.1)
     fuzzy_match (2.0.4)
     gh_inspector (1.1.3)
-    git (1.9.1)
+    git (1.10.2)
       rchardet (~> 1.8)
     google-apis-androidpublisher_v3 (0.5.0)
       google-apis-core (~> 0.1)
@@ -226,7 +226,7 @@ GEM
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.1.0)
-    mini_portile2 (2.6.1)
+    mini_portile2 (2.7.1)
     minitest (5.14.4)
     molinillo (0.6.6)
     multi_json (1.15.0)
@@ -235,15 +235,15 @@ GEM
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
-    nokogiri (1.12.5-x86_64-darwin)
+    nokogiri (1.13.1-x86_64-darwin)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.13.9)
+    oj (3.13.11)
     optimist (3.0.1)
     options (2.3.2)
     os (1.1.1)
@@ -255,7 +255,7 @@ GEM
     public_suffix (4.0.6)
     racc (1.6.0)
     rake (12.3.3)
-    rake-compiler (1.1.1)
+    rake-compiler (1.1.7)
       rake
     rchardet (1.8.0)
     representable (3.1.1)
@@ -323,7 +323,7 @@ DEPENDENCIES
   fastlane (~> 2)
   fastlane-plugin-appcenter (~> 1.11)
   fastlane-plugin-sentry (~> 1.6)
-  fastlane-plugin-wpmreleasetoolkit (~> 2.1)
+  fastlane-plugin-wpmreleasetoolkit (~> 2.3)
   octokit (~> 4.0)
   rmagick (~> 3.2.0)
   xcpretty-travis-formatter

fastlane/Fastfile

@@ -48,6 +48,7 @@ ENV["PROJECT_ROOT_FOLDER"]="./"
 ENV['APP_STORE_STRINGS_FILE_NAME']='AppStoreStrings.pot'
 ENV["PUBLIC_CONFIG_FILE"]="./config/Version.Public.xcconfig"
 ENV["DOWNLOAD_METADATA"]="./fastlane/download_metadata.swift"
+ENV['FL_RELEASE_TOOLKIT_DEFAULT_BRANCH'] = 'trunk'
 REPOSITORY_NAME="simplenote-ios"
 APP_STORE_BUNDLE_IDENTIFIER = 'com.codality.NotationalFlow'.freeze
 
@@ -75,7 +76,7 @@ end
   # 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)
 
@@ -237,7 +238,7 @@ end
     UI.user_error!('To finalize a hotfix, please use the finalize_hotfix_release lane instead') if ios_current_branch_is_hotfix
 
     ios_finalize_prechecks(options)
-    
+
     UI.message('Checking app strings translation status...')
     check_translation_progress(
       glotpress_url: 'https://translate.wordpress.com/projects/simplenote/ios/',
@@ -719,7 +720,7 @@ end
   #####################################################################################
 
   # Props to work done by others in this file and in
-  # https://github.com/wordpress-mobile/WordPress-iOS/blob/develop/fastlane/Fastfile
+  # https://github.com/wordpress-mobile/WordPress-iOS/blob/trunk/fastlane/Fastfile
   # this is a combined rip-off from both
 
   #####################################################################################

fastlane/Pluginfile

@@ -2,7 +2,7 @@
 #
 # Ensure this file is checked in to source control!
 #
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 2.1'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 2.3'
 gem 'fastlane-plugin-sentry', '~> 1.6'
 gem 'fastlane-plugin-appcenter', '~> 1.11'