Skip to content

Commit 15982d4

Browse files
author
Gerardo Pacheco
authored
Merge pull request #1335 from wordpress-mobile/release/1.19.5
Release 1.19.5
2 parents 918ef34 + 4642343 commit 15982d4

File tree

11 files changed

+63
-63
lines changed

11 files changed

+63
-63
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,11 @@ orbs:
66
git: wordpress-mobile/[email protected]
77

88
xcode_version: &xcode_version
9-
xcode-version: "12.1.0"
9+
xcode-version: "12.4.0"
1010

1111
iphone_test_device: &iphone_test_device
1212
device: iPhone 11
13-
ios-version: "14.1"
13+
ios-version: "14.4"
1414

1515
workflows:
1616
test_and_validate:

‎.ruby-version‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
2.6.4

‎Aztec/Classes/Converters/ElementsToAttributedString/Implementations/GenericElementConverter.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ class GenericElementConverter: ElementConverter {
1111
/// At some point we should modify how the conversion works, so that any supported element never goes through this
1212
/// converter at all, and this converter is turned into an `UnsupportedElementConverter()` exclusively.
1313
///
14-
private static let supportedElements: [Element] = [.a, .aztecRootNode, .b, .br, .blockquote, .del, .div, .em, .figure, .figcaption, .h1, .h2, .h3, .h4, .h5, .h6, .hr, .i, .img, .li, .ol, .p, .pre, .s, .span, .strike, .strong, .u, .ul, .video, .code, .sup, .sub]
14+
private static let supportedElements: [Element] = [.a, .aztecRootNode, .b, .br, .blockquote, .del, .div, .em, .figure, .figcaption, .h1, .h2, .h3, .h4, .h5, .h6, .hr, .i, .img, .li, .ol, .p, .pre, .s, .span, .strike, .strong, .u, .ul, .video, .code, .sup, .sub, .mark]
1515

1616
// MARK: - Built-in formatter instances
1717

‎Aztec/Classes/EditorView/EditorView.swift‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,11 +269,11 @@ extension EditorView: UITextInput {
269269
return activeView.characterRange(byExtending: position, in: direction)
270270
}
271271

272-
public func baseWritingDirection(for position: UITextPosition, in direction: UITextStorageDirection) -> UITextWritingDirection {
272+
public func baseWritingDirection(for position: UITextPosition, in direction: UITextStorageDirection) -> NSWritingDirection {
273273
return activeView.baseWritingDirection(for: position, in: direction)
274274
}
275275

276-
public func setBaseWritingDirection(_ writingDirection: UITextWritingDirection, for range: UITextRange) {
276+
public func setBaseWritingDirection(_ writingDirection: NSWritingDirection, for range: UITextRange) {
277277
activeView.setBaseWritingDirection(writingDirection, for: range)
278278
}
279279

‎Aztec/Classes/Libxml2/DOM/Data/Element.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public struct Element: RawRepresentable, Hashable {
3030
public static var mergeableBlockLevelElements = Set<Element>([.blockquote, .div, .figure, .figcaption, .h1, .h2, .h3, .h4, .h5, .h6, .hr, .li, .ol, .ul, .p, .pre])
3131

3232
/// List of style HTML elements that can be merged together when they are sibling to each other
33-
public static var mergeableStyleElements = Set<Element>([.i, .em, .b, .strong, .strike, .u, .code, .cite, .a, .sup, .sub])
33+
public static var mergeableStyleElements = Set<Element>([.i, .em, .b, .strong, .strike, .u, .code, .cite, .a, .sup, .sub, .mark])
3434

3535
/// List of block level elements that can be merged but only when they have a single children that is also mergeable
3636
///
@@ -121,6 +121,7 @@ extension Element {
121121
public static let video = Element("video")
122122
public static let wbr = Element("wbr")
123123
public static let body = Element("body")
124+
public static let mark = Element("mark")
124125

125126
}
126127

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
1.19.5
2+
-------
3+
* Addd support for the Mark HTML tag.
4+
15
1.19.4
26
-------
37
* Fix Carthage build for Xcode 12

‎Documentation/ReleaseProcess.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ Open a PR on github where you target the `trunk` branch with the `release/x.y.z`
3434

3535
### Step 2: Testing the Integration ###
3636

37-
Before going any further, tt's normally good practice to test the Aztec integration into [WordPress-iOS project](https://github.com/wordpress-mobile/WordPress-iOS), to make sure we won’t have to do the release process twice.
37+
Before going any further, it's normally good practice to test the Aztec integration into [WordPress-iOS project](https://github.com/wordpress-mobile/WordPress-iOS), to make sure we won’t have to do the release process twice.
3838

3939
Make sure WordPress-iOS’s podfile specifies the SAME (and latest) commit number for both of these:
4040
```
@@ -59,13 +59,13 @@ Create a new release on Github targetting the trunk branch and name it `Release
5959

6060
Set a tag with the value `x.y.z` .
6161

62-
On the description field and the content of the changelog for this version
62+
On the description field add the content of the changelog for this version
6363

6464
Press the `Publish release` button
6565

6666
At this moment the CI automation should notice your tag and after some minutes you should get the new pod publish on CocoaPods.
6767

68-
If this for some reason fails chech the manual process bellow
68+
If this for some reason fails check the manual process below. Also note that the CI checks for a merged release PR can sometimes fail if the checks run prior to CocoaPods populating the new version through the CDN. Waiting a little while (e.g. 30-60 minutes) and rerunning the CI checks can sometimes repair the checks.
6969

7070
*Manual Process*
7171

‎Example/Example/SampleContent/content.html‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,3 +159,9 @@ <h3>Unsupported HTML</h3>
159159
</table>
160160

161161
<hr/>
162+
163+
<h3>Mark</h3>
164+
165+
<p>Donec ipsum dolor, <mark style="color:#ff0000">tempor sed</mark> bibendum <mark style="color:#1100ff">vita</mark>.</p>
166+
167+
<hr/>

‎Example/Example/SampleContent/gutenberg.html‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,3 +140,11 @@ <h2 style="text-align:center">The WordPress of tomorrow</h2>
140140
<!-- /wp:separator -->
141141

142142
<!-- wp:latest-posts /-->
143+
144+
<!-- wp:separator -->
145+
<hr class="wp-block-separator" />
146+
<!-- /wp:separator -->
147+
148+
<!-- wp:paragraph -->
149+
<p>Donec ipsum dolor, <mark style="color:#ff0000">tempor sed</mark> bibendum <mark style="color:#1100ff">vita</mark>.</p>
150+
<!-- /wp:paragraph -->

‎WordPress-Aztec-iOS.podspec‎

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,42 +1,31 @@
1-
#
2-
# Be sure to run `bundle exec pod lib lint WordPress-Aztec-iOS.podspec' to ensure this is a
3-
# valid spec before submitting.
4-
#
5-
# Any lines starting with a # are optional, but their use is encouraged
6-
# To learn more about a Podspec see http://guides.cocoapods.org/syntax/podspec.html
7-
#
8-
91
Pod::Spec.new do |s|
10-
s.name = 'WordPress-Aztec-iOS'
11-
s.version = '1.19.4'
12-
s.summary = 'The native HTML Editor.'
2+
s.name = 'WordPress-Aztec-iOS'
3+
s.version = '1.19.5'
4+
5+
s.summary = 'The native HTML Editor.'
6+
s.description = <<-DESC
7+
The native HTML Editor by Automattic Inc.
138
14-
# This description is used to generate tags and improve search results.
15-
# * Think: What does it do? Why did you write it? What is the focus?
16-
# * Try to keep it short, snappy and to the point.
17-
# * Write the description between the DESC delimiters below.
18-
# * Finally, don't worry about the indent, CocoaPods strips it!
9+
This library provides a UITextView subclass with HTML visual editing capabilities.
10+
DESC
1911

20-
s.description = <<-DESC
21-
The native HTML Editor by Automattic Inc.
22-
DESC
12+
s.homepage = 'https://github.com/wordpress-mobile/AztecEditor-iOS'
13+
s.license = { :type => 'MPLv2', :file => 'LICENSE.md' }
14+
s.author = { 'The WordPress Mobile Team' => '[email protected]' }
2315

24-
s.homepage = 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS'
25-
# s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2'
26-
s.license = { :type => 'MPLv2', :file => 'LICENSE.md' }
27-
s.author = { 'Automattic' => '[email protected]', 'Diego Rey Mendez' => '[email protected]', 'Sergio Estevao' => '[email protected]', 'Jorge Leandro Perez' => '[email protected]' }
28-
s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s }
2916
s.ios.deployment_target = '11.0'
3017
s.swift_version = '5.0'
3118

19+
s.source = { :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :tag => s.version.to_s }
3220
s.module_name = "Aztec"
3321
s.source_files = 'Aztec/Classes/**/*'
3422
s.resource_bundles = {
3523
'WordPress-Aztec-iOS': [
3624
"Aztec/Assets/**/*"
3725
]
3826
}
39-
40-
s.xcconfig = {'OTHER_LDFLAGS' => '-lxml2',
41-
'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'}
27+
s.xcconfig = {
28+
'OTHER_LDFLAGS' => '-lxml2',
29+
'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'
30+
}
4231
end

0 commit comments

Comments
 (0)