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

Update default branch to trunk

Author: oguzkocer

Gemfile.lock

@@ -153,7 +153,7 @@ GEM
       xcpretty-travis-formatter (>= 0.0.3)
     fastlane-plugin-appcenter (1.6.0)
     fastlane-plugin-sentry (1.6.0)
-    fastlane-plugin-wpmreleasetoolkit (1.3.1)
+    fastlane-plugin-wpmreleasetoolkit (2.3.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       chroma (= 0.2.0)
@@ -164,13 +164,13 @@ GEM
       octokit (~> 4.18)
       parallel (~> 1.14)
       progress_bar (~> 1.3)
-      rake (~> 12.3)
+      rake (>= 12.3, < 14.0)
       rake-compiler (~> 1.0)
     ffi (1.14.2)
     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-api-client (0.38.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -230,7 +230,7 @@ GEM
     memoist (0.16.2)
     mini_magick (4.11.0)
     mini_mime (1.0.3)
-    mini_portile2 (2.5.3)
+    mini_portile2 (2.7.1)
     minitest (5.14.4)
     molinillo (0.6.6)
     multi_json (1.15.0)
@@ -239,13 +239,13 @@ GEM
     nap (1.1.0)
     naturally (2.2.1)
     netrc (0.11.0)
-    nokogiri (1.11.7)
-      mini_portile2 (~> 2.5.0)
+    nokogiri (1.13.1)
+      mini_portile2 (~> 2.7.0)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)
       sawyer (~> 0.8.0, >= 0.5.3)
-    oj (3.12.1)
+    oj (3.13.11)
     optimist (3.0.1)
     options (2.3.2)
     os (1.1.1)
@@ -257,10 +257,10 @@ GEM
       highline (>= 1.6, < 3)
       options (~> 2.3.0)
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rainbow (3.0.0)
     rake (12.3.3)
-    rake-compiler (1.1.1)
+    rake-compiler (1.1.7)
       rake
     rchardet (1.8.0)
     regexp_parser (2.1.1)
@@ -337,7 +337,7 @@ DEPENDENCIES
   fastlane (~> 2)
   fastlane-plugin-appcenter (= 1.6.0)
   fastlane-plugin-sentry
-  fastlane-plugin-wpmreleasetoolkit (~> 1.3)
+  fastlane-plugin-wpmreleasetoolkit (~> 2.3)
   octokit (~> 4.0)
   rake (~> 12.3)
   rubocop (~> 1.18)

fastlane/Fastfile

@@ -14,6 +14,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'
 
 USER_ENV_FILE_PATH = File.join(Dir.home, '.simplenotemacos-env.default')
 
@@ -114,7 +115,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)
 
@@ -234,7 +235,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)
-    
+
     ios_update_metadata(options)
     ios_bump_version_beta()
 
@@ -417,4 +418,4 @@ end
       job_params: { app_store_build: true }
     )
   end
-  
+

fastlane/Pluginfile

@@ -2,6 +2,6 @@
 #
 # Ensure this file is checked in to source control!
 
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 1.3'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 2.3'
 gem 'fastlane-plugin-sentry'
 gem 'fastlane-plugin-appcenter', '1.6.0'