Skip to content

Commit 2abbaa3

Browse files
authored
Merge pull request #359 from wordpress-mobile/release/4.1.0
Release 4.1.0 into trunk
2 parents fa05bce + fb72adc commit 2abbaa3

File tree

5 files changed

+20
-8
lines changed

5 files changed

+20
-8
lines changed

CHANGELOG.md

Lines changed: 15 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,28 @@
22

33
---
44

5-
## Develop
5+
## Trunk
66

77
### Breaking Changes
88

99
_None_
1010

1111
### New Features
1212

13+
_None_
14+
15+
### Bug Fixes
16+
17+
_None_
18+
19+
### Internal Changes
20+
21+
_None_
22+
23+
## 4.1.0
24+
25+
### New Features
26+
1327
* Add the option for `an_localize_libs` to provide a `source_id` for each library being merged.
1428
If provided, that identifier will be added as an `a8c-src-lib` XML attribute to the `<string>` nodes being updated with strings from said library.
1529
This can be useful to help identify where each string come from in the resulting, merged `strings.xml`. [#351]

Gemfile.lock

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PATH
22
remote: .
33
specs:
4-
fastlane-plugin-wpmreleasetoolkit (4.0.0)
4+
fastlane-plugin-wpmreleasetoolkit (4.1.0)
55
activesupport (~> 5)
66
bigdecimal (~> 1.4)
77
buildkit (~> 1.5)
@@ -270,7 +270,6 @@ GEM
270270
method_source (0.9.2)
271271
mini_magick (4.11.0)
272272
mini_mime (1.1.2)
273-
mini_portile2 (2.8.0)
274273
minitest (5.14.4)
275274
molinillo (0.8.0)
276275
multi_json (1.15.0)
@@ -280,8 +279,7 @@ GEM
280279
naturally (2.2.1)
281280
netrc (0.11.0)
282281
no_proxy_fix (0.1.2)
283-
nokogiri (1.13.3)
284-
mini_portile2 (~> 2.8.0)
282+
nokogiri (1.13.3-x86_64-darwin)
285283
racc (~> 1.4)
286284
octokit (4.21.0)
287285
faraday (>= 0.9)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ module Android
1111
module LocalizeHelper
1212
LIB_SOURCE_XML_ATTR = 'a8c-src-lib'.freeze
1313

14-
# Checks if `string_node` has the content_override flag set
14+
# Checks if `string_node` has the `content_override` flag set
1515
def self.skip_string_by_tag?(string_node)
1616
skip = string_node.attr('content_override') == 'true' unless string_node.attr('content_override').nil?
1717
if skip
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Fastlane
22
module Wpmreleasetoolkit
3-
VERSION = '4.0.0'
3+
VERSION = '4.1.0'
44
end
55
end

rakelib/changelog_parser.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
class ChangelogParser
2-
PENDING_SECTION_TITLE = 'Develop'.freeze
2+
PENDING_SECTION_TITLE = 'Trunk'.freeze
33
EMPTY_PLACEHOLDER = '_None_'.freeze
44
SUBSECTIONS_SEMVER_MAP = { 'Breaking Changes': 3, 'New Features': 2, 'Bug Fixes': 1, 'Internal Changes': 1 }.freeze
55

0 commit comments

Comments
 (0)