Release 3.0.0 into trunk

CHANGELOG.md

@@ -6,20 +6,36 @@
 
 ### Breaking Changes
 
-* Removes the `drawText` binary from the gem (instead depending on it being installed via `brew`). Because this update can not be safely applied with no side effects, it's considered a breaking change.
+_None_
 
 ### New Features
 
-* Introduce new `ios_merge_strings_files` action. [#329]
-* Introduce new `buildkite_trigger_build` action. [#333]
-* Introduce new `ios_download_strings_files_from_glotpress` action. [#331]
+_None_
 
 ### Bug Fixes
 
 _None_
 
 ### Internal Changes
 
+_None_
+
+## 3.0.0
+
+### Breaking Changes
+
+* Removes the `drawText` binary from the gem (instead depending on it being installed via `brew`). Because this update can not be safely applied with no side effects, it's considered a breaking change. [#312]
+* When doing Git operations, if no branch is provided, we'll use `trunk` as a default instead of `develop` [#335]
+* Remove deprecated `android_merge_translators_strings`, `android_update_metadata`, and `ios_merge_translators_strings` actions [#337]
+
+### New Features
+
+* Introduce new `ios_merge_strings_files` action. [#329]
+* Introduce new `buildkite_trigger_build` action. [#333]
+* Introduce new `ios_download_strings_files_from_glotpress` action. [#331]
+
+### Internal Changes
+
 * Ensure that the `gem push` step only runs on CI if lint, test and danger steps passed before it. [#325]
 * Rename internal `Ios::L10nHelper` to `Ios::L10nLinterHelper`. [#328]
 * Provide new `run_described_fastlane_action` to run Fastlane actions more thoroughly in unit tests [#330]

Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fastlane-plugin-wpmreleasetoolkit (2.3.0)
+    fastlane-plugin-wpmreleasetoolkit (3.0.0)
       activesupport (~> 5)
       bigdecimal (~> 1.4)
       buildkit (~> 1.4)
@@ -270,7 +270,6 @@ GEM
     method_source (0.9.2)
     mini_magick (4.11.0)
     mini_mime (1.1.2)
-    mini_portile2 (2.6.1)
     minitest (5.14.4)
     molinillo (0.8.0)
     multi_json (1.15.0)
@@ -280,8 +279,7 @@ GEM
     naturally (2.2.1)
     netrc (0.11.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.12.5)
-      mini_portile2 (~> 2.6.1)
+    nokogiri (1.12.5-x86_64-darwin)
       racc (~> 1.4)
     octokit (4.21.0)
       faraday (>= 0.9)

lib/fastlane/plugin/wpmreleasetoolkit/helper/android/android_git_helper.rb

@@ -27,26 +27,6 @@ def self.commit_version_bump
             )
           end
         end
-
-        # Calls the `tools/update-translations.sh` script from the project repo, then lint them using the provided gradle task
-        #
-        # Deprecated. Use the `android_download_translations` action instead.
-        #
-        # @env PROJECT_ROOT_FOLDER The path to the git root of the project
-        # @env PROJECT_NAME The name of the directory containing the project code (especially containing the `build.gradle` file)
-        #
-        # @param [String] validate_translation_command The name of the gradle task to run to validate the translations
-        #
-        # @todo Remove this once every client has migrated to `android_download_translations` and we got rid of that legacy action.
-        #
-        def self.update_metadata(validate_translation_command)
-          Action.sh('./tools/update-translations.sh')
-          Action.sh('git', 'submodule', 'update', '--init', '--recursive')
-          Action.sh('./gradlew', validate_translation_command)
-
-          res_dir = File.join(ENV['PROJECT_ROOT_FOLDER'], ENV['PROJECT_NAME'], 'src', 'main', 'res')
-          Fastlane::Helper::GitHelper.commit(message: 'Update translations', files: res_dir, push: true)
-        end
       end
     end
   end

lib/fastlane/plugin/wpmreleasetoolkit/helper/git_helper.rb

@@ -5,10 +5,8 @@ module Helper
     # Helper methods to execute git-related operations
     #
     module GitHelper
-      # Fallback default branch of the client repository. It's currently set to 'develop' for
-      # backwards compatibility.
-      # TODO: Set to 'trunk' for the next major release.
-      DEFAULT_GIT_BRANCH = 'develop'.freeze
+      # Fallback default branch of the client repository.
+      DEFAULT_GIT_BRANCH = 'trunk'.freeze
 
       # Checks if the given path, or current directory if no path is given, is
       # inside a Git repository

lib/fastlane/plugin/wpmreleasetoolkit/models/file_reference.rb

@@ -10,10 +10,7 @@ def initialize(params = {})
       end
 
       def source_contents
-        # TODO: This works only on CircleCI. I chose this variable because it's the one checked by Fastlane::is_ci.
-        # Fastlane::is_ci doesn't work here, so reimplementing the code has been necessary.
-        # (This should be updated if we change CI or if fastlane is updated.)
-        return File.read(secrets_repository_file_path) unless self.encrypt || ENV.key?('CIRCLECI')
+        return File.read(secrets_repository_file_path) unless self.encrypt || FastlaneCore::Helper.is_ci?
         return nil unless File.file?(encrypted_file_path)
 
         encrypted = File.read(encrypted_file_path)

lib/fastlane/plugin/wpmreleasetoolkit/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module Wpmreleasetoolkit
-    VERSION = '2.3.0'
+    VERSION = '3.0.0'
   end
 end