From a540706c980598392fb102d2fd7339f77227b703 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Mon, 8 Jun 2020 22:03:30 +0100 Subject: [PATCH 01/28] Add release documentation. --- Aztec.xcodeproj/project.pbxproj | 12 ++++ Documentation/ReleaseProcess.md | 112 ++++++++++++++++++++++++++++++++ 2 files changed, 124 insertions(+) create mode 100644 Documentation/ReleaseProcess.md diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj index ca22c3c9d..2d8f7af96 100644 --- a/Aztec.xcodeproj/project.pbxproj +++ b/Aztec.xcodeproj/project.pbxproj @@ -235,6 +235,7 @@ FF437B6620D7CB83000D9666 /* LiFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF437B6520D7CB83000D9666 /* LiFormatter.swift */; }; FF48CAC8234DD5D3007FFC79 /* NSMutableAttributedString+ReplaceAttributes.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF48CAC7234DD5D3007FFC79 /* NSMutableAttributedString+ReplaceAttributes.swift */; }; FF4E26601EA8DF1E005E8E42 /* ImageAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF4E265F1EA8DF1E005E8E42 /* ImageAttachment.swift */; }; + FF5DCBF2248ED900006D9FC7 /* ReleaseProcess.md in Resources */ = {isa = PBXBuildFile; fileRef = FF5DCBF1248ED900006D9FC7 /* ReleaseProcess.md */; }; FF61909E202481F4004BCD0A /* CodeFormatter.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF61909D202481F4004BCD0A /* CodeFormatter.swift */; }; FF7A1C511E5651EA00C4C7C8 /* LineAttachment.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF7A1C501E5651EA00C4C7C8 /* LineAttachment.swift */; }; FF7C89B01E3BC52F000472A8 /* NSAttributedString+FontTraits.swift in Sources */ = {isa = PBXBuildFile; fileRef = FF7C89AF1E3BC52F000472A8 /* NSAttributedString+FontTraits.swift */; }; @@ -521,6 +522,7 @@ FF4E265F1EA8DF1E005E8E42 /* ImageAttachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageAttachment.swift; sourceTree = ""; }; FF5B98E21DC29D0C00571CA4 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; }; FF5B98E41DC355B400571CA4 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; }; + FF5DCBF1248ED900006D9FC7 /* ReleaseProcess.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = ReleaseProcess.md; sourceTree = ""; }; FF61909D202481F4004BCD0A /* CodeFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeFormatter.swift; sourceTree = ""; }; FF7A1C481E51EFB600C4C7C8 /* WordPress-Aztec-iOS.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "WordPress-Aztec-iOS.podspec"; sourceTree = ""; }; FF7A1C4A1E51F05700C4C7C8 /* CONTRIBUTING.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = CONTRIBUTING.md; sourceTree = ""; }; @@ -604,6 +606,7 @@ 5951CB841D8BC93600E1866F = { isa = PBXGroup; children = ( + FF5DCBF0248ED900006D9FC7 /* Documentation */, FF7A1C481E51EFB600C4C7C8 /* WordPress-Aztec-iOS.podspec */, FF5B98E41DC355B400571CA4 /* LICENSE */, FF5B98E21DC29D0C00571CA4 /* README.md */, @@ -1390,6 +1393,14 @@ path = Processor; sourceTree = ""; }; + FF5DCBF0248ED900006D9FC7 /* Documentation */ = { + isa = PBXGroup; + children = ( + FF5DCBF1248ED900006D9FC7 /* ReleaseProcess.md */, + ); + path = Documentation; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXHeadersBuildPhase section */ @@ -1510,6 +1521,7 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + FF5DCBF2248ED900006D9FC7 /* ReleaseProcess.md in Resources */, FF1F56A3239562B900E93A30 /* html_colors.json in Resources */, FF0714021EFD78AF00E50713 /* Media.xcassets in Resources */, ); diff --git a/Documentation/ReleaseProcess.md b/Documentation/ReleaseProcess.md new file mode 100644 index 000000000..ae6493179 --- /dev/null +++ b/Documentation/ReleaseProcess.md @@ -0,0 +1,112 @@ +## Release Process ## + +### Step 1: Creating a release branch ### + +The branch structure in Aztec iOS is based on the GIT Flow methodology. + +These are the main branches involved in the release process: +``` +master: Kept up to date with the latest release. +develop: Bleeding edge branch with all of the latest changes. +release/x.y.z: Version branch, which we will use during the release process. +``` +The first step in the process is creating the version branch. + +The version branch is what allows work to continue in develop while also having a frozen snapshot of what we’re releasing. + +Using the command line, the process is pretty straightforward: + +``` +git checkout develop +git pull +git checkout -b release/x.y.z +git push origin -u release/x.y.z +``` + +Make sure to update the field `s.version` in both of these files to the `x.y.z` number +``` +WordPress-Aztec-iOS.podspec +WordPress-Editor-iOS.podespec +``` + +Open a PR on github where you target the `master` branch with the `release/x.y.z` branch and call it `Release x.y.z` + + +### Step 2: Testing the Integration ### + +Before going any further, It's normally good practice to test the Aztec integration into WordPress-iOS project, to make sure I won’t have to do the release process twice. + +Make sure WordPress-iOS’s podfile specifies the SAME (and latest) commit number for both of these: + +pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => 'e0fc55abb4809b3b23b6d8b56791798af864025d' +pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => 'e0fc55abb4809b3b23b6d8b56791798af864025d' + +The things we want to look out for are: + +- That the pod can be properly installed in WPiOS. +- That WPiOS builds properly. +- That you can open a post through the App, using both the classic editor and Gutenberg. + +### Step 3: Merge the branch ### + +If the release PR is approved and all is working correctly in WP-iOS merge the release branch to master. + +### Step 4: Push the POD. ### + +*Automated Process* + +Create a new release on Github targetting the master branch and name it `Release x.y.z` + +Set a tag with the value `x.y.z` . + +On the description field and the content of the changelog for this version + +Press the `Publish release` button + +At this moment the CI automation should notice your tag and after some minutes you should get the new pod publish on CocoaPods master trunk. + +If this for some reason fails chech the manual process bellow + +*Manual Process* + +Pushing the PODs is a bit different than in other repos due to the fact that this repo has two podspecs. + +The recommended steps are: + +Lint the core library +``` +bundle exec pod lib lint WordPress-Aztec-iOS.podspec +``` + +If all is good proceed to +``` +bundle exec pod trunk push WordPress-Aztec-iOS.podspec +``` + +Then lint the Editor library +``` +bundle exec pod lib lint WordPress-Editor-iOS.podspec +``` + +If all is good, push it +``` +bundle exec pod trunk push WordPress-Editor-iOS.podspec +``` + +### Step 5: Closing the milestone ### + +For simplicity Aztec uses a single milestone named “Next Stable”. The purpose of this milestone is to be used to assign to it all of the regular issues that are closed and merged into develop during the regular development process. + +At this point in the release process you should rename the milestone to the version you’re about to release. + +Once renamed, you can create a new “Next Stable” milestone and assign all pending open issues to it. + +At this point you’re ready to close the version milestone in GitHub. + +### Step 6: Merge Master to develop ### + +Following the git Flow methodology you now need to merge the master branch back to develop. + +Create a new PR in GitHub that targets `develop` with the master branch. + +After review, if all is ok, merge that PR and your work is done. From cad322a845069a61f53c72e3929c7b92236bccae Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Mon, 8 Jun 2020 22:06:04 +0100 Subject: [PATCH 02/28] Fix style in documentation. --- Documentation/ReleaseProcess.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/ReleaseProcess.md b/Documentation/ReleaseProcess.md index ae6493179..6506c0bae 100644 --- a/Documentation/ReleaseProcess.md +++ b/Documentation/ReleaseProcess.md @@ -37,10 +37,10 @@ Open a PR on github where you target the `master` branch with the `release/x.y.z Before going any further, It's normally good practice to test the Aztec integration into WordPress-iOS project, to make sure I won’t have to do the release process twice. Make sure WordPress-iOS’s podfile specifies the SAME (and latest) commit number for both of these: - +``` pod 'WordPress-Aztec-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => 'e0fc55abb4809b3b23b6d8b56791798af864025d' pod 'WordPress-Editor-iOS', :git => 'https://github.com/wordpress-mobile/AztecEditor-iOS.git', :commit => 'e0fc55abb4809b3b23b6d8b56791798af864025d' - +``` The things we want to look out for are: - That the pod can be properly installed in WPiOS. From 2cff1dbb4854a367421850a9590cab94053e5f88 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Tue, 9 Jun 2020 15:13:32 +0100 Subject: [PATCH 03/28] Fix some errors and add links. --- Documentation/ReleaseProcess.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Documentation/ReleaseProcess.md b/Documentation/ReleaseProcess.md index 6506c0bae..5b1747157 100644 --- a/Documentation/ReleaseProcess.md +++ b/Documentation/ReleaseProcess.md @@ -2,7 +2,7 @@ ### Step 1: Creating a release branch ### -The branch structure in Aztec iOS is based on the GIT Flow methodology. +The branch structure in Aztec iOS is based on the [Git Flow](https://nvie.com/posts/a-successful-git-branching-model/) methodology. These are the main branches involved in the release process: ``` @@ -34,7 +34,7 @@ Open a PR on github where you target the `master` branch with the `release/x.y.z ### Step 2: Testing the Integration ### -Before going any further, It's normally good practice to test the Aztec integration into WordPress-iOS project, to make sure I won’t have to do the release process twice. +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. Make sure WordPress-iOS’s podfile specifies the SAME (and latest) commit number for both of these: ``` @@ -97,7 +97,7 @@ bundle exec pod trunk push WordPress-Editor-iOS.podspec For simplicity Aztec uses a single milestone named “Next Stable”. The purpose of this milestone is to be used to assign to it all of the regular issues that are closed and merged into develop during the regular development process. -At this point in the release process you should rename the milestone to the version you’re about to release. +At this point in the release process you should rename the milestone to the version you've just released. Once renamed, you can create a new “Next Stable” milestone and assign all pending open issues to it. From ac7617a10ea35312c7518423658d4d24209d0cd0 Mon Sep 17 00:00:00 2001 From: Chip Date: Wed, 8 Jul 2020 14:49:15 -0400 Subject: [PATCH 04/28] [Gutenberg] Correct Color for RichText links in Dark Mode - Expose helper method (#1295) * Expose the color coversion helper for use in subclasses * Revert Podfile version bump * Fix lint error --- Aztec/Classes/Extensions/UIColor+Parsers.swift | 2 +- WordPress-Aztec-iOS.podspec | 2 -- WordPress-Editor-iOS.podspec | 2 -- 3 files changed, 1 insertion(+), 5 deletions(-) diff --git a/Aztec/Classes/Extensions/UIColor+Parsers.swift b/Aztec/Classes/Extensions/UIColor+Parsers.swift index e19361692..01ef6542c 100644 --- a/Aztec/Classes/Extensions/UIColor+Parsers.swift +++ b/Aztec/Classes/Extensions/UIColor+Parsers.swift @@ -1,6 +1,6 @@ import UIKit -extension UIColor { +public extension UIColor { /// Creates a color based on a hexString. If the string is not a valid hexColor it return nil /// Example of colors: #FF0000, #00FF0000 diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec index 083f661c3..c0a4f8fc0 100644 --- a/WordPress-Aztec-iOS.podspec +++ b/WordPress-Aztec-iOS.podspec @@ -41,5 +41,3 @@ Pod::Spec.new do |s| s.xcconfig = {'OTHER_LDFLAGS' => '-lxml2', 'HEADER_SEARCH_PATHS' => '/usr/include/libxml2'} end - - diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec index 8971b3f46..ff8b66512 100644 --- a/WordPress-Editor-iOS.podspec +++ b/WordPress-Editor-iOS.podspec @@ -39,5 +39,3 @@ Pod::Spec.new do |s| s.dependency "WordPress-Aztec-iOS", s.version.to_s end - - From 3dd803c084a385a00466c8855652db9b2dfa716a Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Mon, 14 Sep 2020 15:49:12 +0200 Subject: [PATCH 05/28] Change the license from GPL v2 to MPL v2 --- LICENSE | 339 --------------------------------- LICENSE.md | 355 +++++++++++++++++++++++++++++++++++ README.md | 3 +- WordPress-Aztec-iOS.podspec | 2 +- WordPress-Editor-iOS.podspec | 2 +- 5 files changed, 358 insertions(+), 343 deletions(-) delete mode 100644 LICENSE create mode 100644 LICENSE.md diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 23cb79033..000000000 --- a/LICENSE +++ /dev/null @@ -1,339 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - {description} - Copyright (C) {year} {fullname} - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - {signature of Ty Coon}, 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. diff --git a/LICENSE.md b/LICENSE.md new file mode 100644 index 000000000..cd44203cd --- /dev/null +++ b/LICENSE.md @@ -0,0 +1,355 @@ +Mozilla Public License Version 2.0 +================================== + +### 1. Definitions + +**1.1. “Contributor”** + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +**1.2. “Contributor Version”** + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +**1.3. “Contribution”** + means Covered Software of a particular Contributor. + +**1.4. “Covered Software”** + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +**1.5. “Incompatible With Secondary Licenses”** + means + +* **(a)** that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or +* **(b)** that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +**1.6. “Executable Form”** + means any form of the work other than Source Code Form. + +**1.7. “Larger Work”** + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +**1.8. “License”** + means this document. + +**1.9. “Licensable”** + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +**1.10. “Modifications”** + means any of the following: + +* **(a)** any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or +* **(b)** any new file in Source Code Form that contains any Covered + Software. + +**1.11. “Patent Claims” of a Contributor** + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +**1.12. “Secondary License”** + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +**1.13. “Source Code Form”** + means the form of the work preferred for making modifications. + +**1.14. “You” (or “Your”)** + means an individual or a legal entity exercising rights under this + License. For legal entities, “You” includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, “control” means **(a)** the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or **(b)** ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + + +### 2. License Grants and Conditions + +#### 2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +* **(a)** under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and +* **(b)** under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +#### 2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +#### 2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +* **(a)** for any code that a Contributor has removed from Covered Software; + or +* **(b)** for infringements caused by: **(i)** Your and any other third party's + modifications of Covered Software, or **(ii)** the combination of its + Contributions with other software (except as part of its Contributor + Version); or +* **(c)** under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +#### 2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +#### 2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +#### 2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +#### 2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + + +### 3. Responsibilities + +#### 3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +#### 3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +* **(a)** such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +* **(b)** You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +#### 3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +#### 3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +#### 3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + + +### 4. Inability to Comply Due to Statute or Regulation + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: **(a)** comply with +the terms of this License to the maximum extent possible; and **(b)** +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + + +### 5. Termination + +**5.1.** The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated **(a)** provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and **(b)** on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +**5.2.** If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +**5.3.** In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + + +### 6. Disclaimer of Warranty + +> Covered Software is provided under this License on an “as is” +> basis, without warranty of any kind, either expressed, implied, or +> statutory, including, without limitation, warranties that the +> Covered Software is free of defects, merchantable, fit for a +> particular purpose or non-infringing. The entire risk as to the +> quality and performance of the Covered Software is with You. +> Should any Covered Software prove defective in any respect, You +> (not any Contributor) assume the cost of any necessary servicing, +> repair, or correction. This disclaimer of warranty constitutes an +> essential part of this License. No use of any Covered Software is +> authorized under this License except under this disclaimer. + +### 7. Limitation of Liability + +> Under no circumstances and under no legal theory, whether tort +> (including negligence), contract, or otherwise, shall any +> Contributor, or anyone who distributes Covered Software as +> permitted above, be liable to You for any direct, indirect, +> special, incidental, or consequential damages of any character +> including, without limitation, damages for lost profits, loss of +> goodwill, work stoppage, computer failure or malfunction, or any +> and all other commercial damages or losses, even if such party +> shall have been informed of the possibility of such damages. This +> limitation of liability shall not apply to liability for death or +> personal injury resulting from such party's negligence to the +> extent applicable law prohibits such limitation. Some +> jurisdictions do not allow the exclusion or limitation of +> incidental or consequential damages, so this exclusion and +> limitation may not apply to You. + + +### 8. Litigation + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + + +### 9. Miscellaneous + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + + +### 10. Versions of the License + +#### 10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +#### 10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +#### 10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +#### 10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +## Exhibit A - Source Code Form License Notice + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +## Exhibit B - “Incompatible With Secondary Licenses” Notice + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. diff --git a/README.md b/README.md index 063253f9c..e27e6d3e1 100644 --- a/README.md +++ b/README.md @@ -93,5 +93,4 @@ If you have questions about getting setup or just want to say hi, join the [Word ## License -WordPress-Aztec-iOS is available under the GPLv2 license. See the [LICENSE file](./LICENSE) for more info. -WordPress-Editor-iOS is available under the GPLv2 license. See the [LICENSE file](./LICENSE) for more info. +AztecEditor-iOS and WordPress-Editor-iOS are open source projects covered by the [Mozilla Public License Version 2.0](LICENSE.md). diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec index 64462f97e..4738fad13 100644 --- a/WordPress-Aztec-iOS.podspec +++ b/WordPress-Aztec-iOS.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS' # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' - s.license = { :type => 'GPLv2', :file => 'LICENSE' } + s.license = { :type => 'MPLv2', :file => 'LICENSE' } s.author = { 'Automattic' => 'mobile@automattic.com', 'Diego Rey Mendez' => 'diego.rey.mendez@automattic.com', 'Sergio Estevao' => 'sergioestevao@gmail.com', 'Jorge Leandro Perez' => 'jorge.perez@automattic.com' } s.social_media_url = "http://twitter.com/WordPressiOS" s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec index 537f7a6e9..dbb027336 100644 --- a/WordPress-Editor-iOS.podspec +++ b/WordPress-Editor-iOS.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS' # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' - s.license = { :type => 'GPLv2', :file => 'LICENSE' } + s.license = { :type => 'MPLv2', :file => 'LICENSE' } s.author = { 'Automattic' => 'mobile@automattic.com', 'Diego Rey Mendez' => 'diego.rey.mendez@automattic.com', 'Sergio Estevao' => 'sergioestevao@gmail.com', 'Jorge Leandro Perez' => 'jorge.perez@automattic.com' } s.social_media_url = "http://twitter.com/WordPressiOS" s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } From c3ddcde6d7957276bea138745df59a2028cba700 Mon Sep 17 00:00:00 2001 From: Maxime Biais Date: Mon, 14 Sep 2020 20:15:26 +0200 Subject: [PATCH 06/28] Update xcode project replace license file reference --- Aztec.xcodeproj/project.pbxproj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj index 2d8f7af96..ee3016bca 100644 --- a/Aztec.xcodeproj/project.pbxproj +++ b/Aztec.xcodeproj/project.pbxproj @@ -293,6 +293,7 @@ 40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementConverter.swift; sourceTree = ""; }; 40A298701FD61B6F00AEDF3B /* ImageElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImageElementConverter.swift; sourceTree = ""; }; 40A298721FD61E1900AEDF3B /* VideoElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VideoElementConverter.swift; sourceTree = ""; }; + 50A1CC6E250FEA93001D5517 /* LICENSE.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = LICENSE.md; sourceTree = ""; }; 5951CB8E1D8BC93600E1866F /* Aztec.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Aztec.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 5951CB921D8BC93600E1866F /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 5951CB971D8BC93600E1866F /* AztecTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = AztecTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -521,7 +522,6 @@ FF48CAC7234DD5D3007FFC79 /* NSMutableAttributedString+ReplaceAttributes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSMutableAttributedString+ReplaceAttributes.swift"; sourceTree = ""; }; FF4E265F1EA8DF1E005E8E42 /* ImageAttachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ImageAttachment.swift; sourceTree = ""; }; FF5B98E21DC29D0C00571CA4 /* README.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = README.md; sourceTree = SOURCE_ROOT; }; - FF5B98E41DC355B400571CA4 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = SOURCE_ROOT; }; FF5DCBF1248ED900006D9FC7 /* ReleaseProcess.md */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = net.daringfireball.markdown; path = ReleaseProcess.md; sourceTree = ""; }; FF61909D202481F4004BCD0A /* CodeFormatter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CodeFormatter.swift; sourceTree = ""; }; FF7A1C481E51EFB600C4C7C8 /* WordPress-Aztec-iOS.podspec */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "WordPress-Aztec-iOS.podspec"; sourceTree = ""; }; @@ -608,7 +608,7 @@ children = ( FF5DCBF0248ED900006D9FC7 /* Documentation */, FF7A1C481E51EFB600C4C7C8 /* WordPress-Aztec-iOS.podspec */, - FF5B98E41DC355B400571CA4 /* LICENSE */, + 50A1CC6E250FEA93001D5517 /* LICENSE.md */, FF5B98E21DC29D0C00571CA4 /* README.md */, FF7A1C4A1E51F05700C4C7C8 /* CONTRIBUTING.md */, FFC2BBF81F2A25CF00E404FB /* CHANGELOG.md */, From b9c66aa6910e6136f481d1ca67fd2c62a4e3a91e Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Tue, 17 Nov 2020 16:22:07 +0000 Subject: [PATCH 07/28] Add architecture documentation. --- Aztec.xcodeproj/project.pbxproj | 2 + Documentation/Architecture.md | 102 ++++++++++++++++++ .../resources/html_to_nsattributedstring.png | Bin 0 -> 56959 bytes .../resources/nsattributedstring_to_html.png | Bin 0 -> 37398 bytes 4 files changed, 104 insertions(+) create mode 100644 Documentation/Architecture.md create mode 100644 Documentation/resources/html_to_nsattributedstring.png create mode 100644 Documentation/resources/nsattributedstring_to_html.png diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj index ee3016bca..ea4ec9c1a 100644 --- a/Aztec.xcodeproj/project.pbxproj +++ b/Aztec.xcodeproj/project.pbxproj @@ -541,6 +541,7 @@ FFD3C1702344DB4E00AE8DA0 /* ForegroundColorCSSAttributeMatcher.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForegroundColorCSSAttributeMatcher.swift; sourceTree = ""; }; FFD3C1722344DCA900AE8DA0 /* ForegroundColorElementAttributeConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ForegroundColorElementAttributeConverter.swift; sourceTree = ""; }; FFD436971E3180A500A0E26F /* FontFormatterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FontFormatterTests.swift; sourceTree = ""; }; + FFE859252564232100FAEB12 /* Architecture.md */ = {isa = PBXFileReference; lastKnownFileType = net.daringfireball.markdown; path = Architecture.md; sourceTree = ""; }; FFFA53E423C6277700829A43 /* Configuration.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Configuration.swift; sourceTree = ""; }; FFFA53E623C628E700829A43 /* BoldFormatter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BoldFormatter.swift; sourceTree = ""; }; FFFEC7DA1EA7698900F4210F /* VideoAttachment.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoAttachment.swift; sourceTree = ""; }; @@ -1397,6 +1398,7 @@ isa = PBXGroup; children = ( FF5DCBF1248ED900006D9FC7 /* ReleaseProcess.md */, + FFE859252564232100FAEB12 /* Architecture.md */, ); path = Documentation; sourceTree = ""; diff --git a/Documentation/Architecture.md b/Documentation/Architecture.md new file mode 100644 index 000000000..8e1eb86ea --- /dev/null +++ b/Documentation/Architecture.md @@ -0,0 +1,102 @@ +# Introduction + +Aztec provides a UI component to display and edit HTML content in a performant way. It does not implement its text layout functionality. Instead, it builds on top of Apple's [UITextView](https://developer.apple.com/documentation/uikit/uitextview) provided by the UIKit framework. + +The library is composed of two main systems: + - [TextView](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/TextView.swift) a user interface component that allows the presentation and editing of the HTML + - HTML converters that transform raw HTML to [NSAttributedString](https://developer.apple.com/documentation/foundation/nsattributedstring) and vice-versa + +You can use each of the components separately, but they are all composed under the TextView class to provide a single element to display and edit HTML. + +# TextView + +[TextView](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/TextView.swift) is the core class of the system. It's a `UITextView` subclass that implements custom subclasses of `NSTextStorage`, `NSLayoutManager`, and `NSAttributeString` attributes to allow HTML editing. + +There are two main tasks that this class handles: + + - Maintenance of the custom `NSAttributedString` attributes and attachments as the user edits the content to represent a valid HTML string. + - Presentation of the custom attributes, like lists and quotes + +The TextView and [TextStorage](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/TextStorage.swift) classes are responsible for the maintenance of the `NSAttributedString`. + +They handle user manipulation of formatting (strong, emphasis, lists, blockquotes), embeds (images, videos, separators), and the user interaction with them (line breaks, composition). + +The formatting is implemented by the `toggle(formatter, atRange)` method in combination with AttributeFormatter objects. We split the formatter objects into the following categories: + - [AttributeFormatter](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/Formatters/Base/AttributeFormatter.swift) that handle characters attributes like bold, italic, + - [ParagraphAttributedFormatter](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/Formatters/Base/ParagraphAttributeFormatter.swift), that control paragraph attributes like lists, blockquotes, headings, etc. + +For embeds, like images, videos, separators, tables, etc we use subclasses of the [NSTextAttachment](https://developer.apple.com/documentation/uikit/nstextattachment) object: + - [MediaAttachment](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/MediaAttachment.swift), + - [RenderableAttachment](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/RenderableAttachment.swift) + +The `replace(at:NSRange, with: NSTextAttachment)` handles the insertion of embeds with multiple helpers methods to handle each specific type of embed. + +The attachment objects work by delegating their presentation using the following protocols: + - [TextViewAttachmentDelegate](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/TextView.swift#L7): for media elements where the data can be be downloaded asynchronously from the web. For example `img` and `video` elements. + - [TextViewAttachmentImageProvider](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/TextView.swift#L75): for HTML elements, that have a static presentation like `HR`, HTML comments, `More`, `NextPage`. + +Another essential task is interaction with user input and handling new lines, deleting list items, and indents around: + - Lists + - Quote + - Paragraphs + +The following "ensure..." methods handle all these scenarios: + - ['ensureRemovalOfParagraphAttributesWhenPressingEnterInAnEmptyParagraph'](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/TextView.swift#L1945) + - [ensureInsertionOfEndOfLine](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/TextView.swift#L697) + - [evaluateRemovalOfSingleLineParagraphAttributesAfterSelectionChange](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/TextView.swift#L1884) + +These methods check if you and adding or removing new paragraphs around lists or quotes and update the attributes accordingly. + +# Presentation of the custom attributes + +The [LayoutManager](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/LayoutManager.swift) class handles the presentation for the custom attributes that the standard [NSLayoutManager](https://developer.apple.com/documentation/uikit/nslayoutmanager) is unable to do: + + - Backgrounds and vertical bars for Quotes: `drawBlockquotes` + - Backgrounds for Pre: `drawHTMLPre` + - List bullets: `drawLists` + +The layout manager uses the extra information provided by the [ParagraphStyle](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/ParagraphStyle.swift) class to be able to render the correct background and bullets for each element. + +# HTML Converter + +The [HTMLConverter](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/NSAttributedString/Conversions/HTMLConverter.swift) class handles all the conversation between HTML and NSAttributedString. The main entry points are: + - [attributedString(from:html, defaultAttributes)](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/NSAttributedString/Conversions/HTMLConverter.swift#L58), converts from HTML to a NSAttributedString object + - [html(from:NSAttributedString, pretify)](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/NSAttributedString/Conversions/HTMLConverter.swift#L110) converts from NSAttributedString to HTML + +# Converting from HTML to NSAttributedString + +Two classes are responsible for the conversion: + - [HTMLParser](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/Libxml2/Converters/In/HTMLParser.swift) transforms from HTML text to an in-memory XML tree. + - [AttributedStringSerializer](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/NSAttributedString/Conversions/AttributedStringSerializer.swift) converts from the in-memory tree to NSAttributedString. + + + +The `HTMLParser` class uses the libXML2 library to read the raw HTML. It then transforms the document returned to a more developer-friendly DOM node tree. +The DOM node tree implementation has classes representing elements, text, CSS attributes, CSS values, and comments. +`AttributedStringSerializer` then converts this DOM tree to an NSAttributedString. + +The specialized `NSAttributedString` has custom attributes that add extra information about the HTML elements that the string contains: + - [HTMLRepresentation](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/NSAttributedString/Attributes/HTMLRepresentation.swift) stores the original HTML elements and attributes that were in the initial HTML + - [ParagraphStyle](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/ParagraphStyle.swift) is a subclass on [NSParagraphMutableStyle](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/ParagraphStyle.swift), that allows representation of a hierarchy of elements, for example, nested lists, blockquote inside lists, and others. + +Specialized [Converter](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/GenericElementConverter.swift) classes transform from HTML Elements to NSAttributedString text and attributes, for example: + - [ImageElementConverter](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/ImageElementConverter.swift) converts `img `elements to a custom attachment, + - [GenericElementConverter](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/GenericElementConverter.swift) transform `strong` elements to a font attribute + - [LIElementConverter](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/GenericElementConverter.swift) transform `li` elements from a list to `ParagrahStyle` + +# Converting NSAttributedString to HTML + +In a mirror process from the HTML to NSAttributed conversion, we have the following classes: + - [AttributedStringParser](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/NSAttributedString/Conversions/AttributedStringParser.swift) converts from the `NSAttributedString` to an in-memory tree + - [HTMLSerializer](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/Libxml2/Converters/Out/HTMLSerializer.swift) transforms from the in-memory tree to an HTML string. + + + +The `AttributedStringParser` transforms the `NSAttributedString` to a DOM tree. On a first pass, it iterates paragraph by paragraph and uses [StringAttributesConverters](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/GenericElementConverter.swift) and [AttachmentConverters](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/Converters/ElementsToAttributedString/Implementations/GenericElementConverter.swift) to convert from `NSStringAttributes` and `NSAttachments` to the DOM. +Then it goes through the DOM tree and merges nodes to create a simplified version of the tree. + +We then use the `HTMLSerializer` to convert the DOM Tree to an HTML string. + + + + diff --git a/Documentation/resources/html_to_nsattributedstring.png b/Documentation/resources/html_to_nsattributedstring.png new file mode 100644 index 0000000000000000000000000000000000000000..daf7e8f6d6e40d348fb2cf65c29c0d80ecf04dcc GIT binary patch literal 56959 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%0A->k1gj4Bxm?0aT}ulO)Rmz%vJRAUI+Tx(|ix ztNwyq&Ltw1EYpPBvGpI~Tf=$rt;uMcP73YDWJ-0cF*pEpFDQuAZ}~d6JWpm4g}lBA z2+Aq*InJUjG)^dV1d(W>Z^9`IgPlFXvG93?bUJh;Kf@o;VH$!AL1^b-5yMaCLEI2k zRHmWOA&3n*s5*@2TzbIyP*evI>9D!excbwm3DOFG6i}+iNT%u*0O91`o6B@Mr3OtF8e&@(QuBU6p4&HAoRa(5S}PSWB}KS_|9^%r3U))`vr*jF7%8Ng*Ov34!1Ep;VR zr-Z#(H=U!gTp{NjRKUo%umC~=knkAgXZL2kHq>oVKDskDzzrwY?&BOS-i$t}zL49i zrj_PcO3keDs;=v$R58Hg#>OYpsx^L>tjRe`Ha=`4zDsTja3k5%T_}V2T!4z`2Z#s5 z7q_UaCF=3EEvK}B-7J}jVsb_D`qA#2Bk29zUtLDCVBEryiQ zBVnqkctsd~@k1!VnRIGczdEqao#hOQfHM8tO4LeE3d#NW5`%~S!%#1L&DQpL6u7hV zq{cw{f$_jINnpwQcTkqwW$*+HbqvE1Od2y-QWXOftfqv5 z!!p4gx#d4oU5s_X+7Y-6GYr225qIHltU09x!v`jRKrydCVD}=>{dN*@i7YtuU7g zk8dD))E<@m9K2`>8YV*``=`*QT%qSsF&i4N_lpUtKt}w1@Zi3^vYj!Vy|I642QD=z z=2O23vXh^AsoZPb>WaS!!oLbbgoV5Xab`r63D?Z#U$qeHoSI+A_#Mme`5B8wGaKTo z{+jwha%Y-EeA<%M10*wSwZqgn9@Q;gO8rqmB+to8++{^VLP}8w8q~W`fp3qto|tTb zY1r{lT=OfeUmCJ}fqZf4A2^KkAEzQ+?=y~I8?JiI9C86sn%6K$*Rv@W_3{1sTrN$E zW6QsRxf{n9ovKhGMOXVfK;WsM$>`D!=|Ll-6l5Nffnt2YSWnN;sna-W2wq_hE^g$y zOv6H9Q7UWGwDtuhPM4!y^nJP(F0Ei0f%tse+5%R63VT&?L!j0ujNT4xE+CfAw~vry ziMi09aU~D;MR@0bGPvH<$d{Z{$0he+!0CU-BUxf(r8daSIXG}aWp32VEqyX_VLm~A z+6?4$2KaU!mAoO>ZvbMls#R7T<>ZwCmA~*&*axGTjU^5qHI;ILSl7>X9&ygYv5_sm zsHsXOt*k+ua2z6ErH&M{b;0yshf>Z8QQ{US>O`2%X#)rTyxFv`k%$Fu9r&4#BJ;}q3mpnDY=wWoqqAsW9kwM|U7c&2M3LD3*p6 z5y>9?q6Dx<==6F0K*pCNo)S%2f!`S;x*RTeg+Bypjxp=3)w1-T-cQuSi4YMqf;&u% zr*jLES4D7|VR4p;&L=t)8;r{6aE*p&cbTY$Sm7!?L#Jx#wU?`eJ z-kU%wrL-XO9ti&c)hYu(^`#6%UI4v)tGi)9|674qiJ@DUsXiuD8#5yrcV_0!pBn~Y z!|G>Q+!uW&=8WabO0K+`&%9hL#* zgwqhBQ~8V7dCkl)cOq>}cDa}u`JY-hH%=tvOl88@8|ZTFOHr)XWY`%hP5>= z#FEJuuxe&Y)>oA1l=u#V^)H()*y#povGH?Yg->>oE^wOZWQ&WL= zFXV$$rG&wB`TlsC_NicIP6QRCn_52|ThOBh6s>s85E$OlKImA(03CS$SSnVzd%xna zH?g9wDbM7KK`IrL`Hh|FBu2PeGIutk1~mS#J)N7SD0av8*o@UDBjr??B*ing(gs z7(9rm%8B6OgUcwlhAgUik4yLqiJpw(Y1q@o$W-K=JyHn;CB-!Lc8#S6HE0oV@)2+p zBIXarDNhaTMTn*$( zeRt5{WKrsm6hLHURasn#$FX=!!A-;sw^swV1;LDgsY5+jrfpj~CoOoc*Tu(hrrm=o zZn(_iOc@4URrd&lq#;hmD7 zGlZZP3;{7A%&?q@AmnN#^z{@_%prTm-99PIMhGt8+;FqKXAhy$qB?DMX0&BXW)|cY zcV81((E0_%G9~!4jxqurhy)=q)3C1|`}PnkgqA3=uAV{Si0nbuk~?XgYLo~$)m}1XVUbQD|ov`48+hyud3lI4R>8}B6GXr z3;?Qp+@GEZ8i!w$po?Dn`7{s=$zFTe{qf$$xC8I-Z1mQiblSBj)BLk&`c$xX5xo)y zbw=P=4FgW!b0YkS&zqt0md=~P!Q;Ou@toO(y{QLt)!VHe$ovK};CDuh`Q$l>nm~FC zhQL_=6JSqN{b>S4*XEZHOim=ZDopSsbH^HTrp4vLQPQ@5Qr(pPfRIXox9zwOPqAnr zLi)OpxKkNmoKO`hRMid>U7eVU?~u?%t7=_j*tMR$=Gf%Rv-A<=ihMV~D%+Q0;?tE%%jq1X| zDt=EKAHA6d!WhepSCsYX(%VEd&sMF7M5Dfr9a|h#Ng`i}etjHGvXGDTnP7ypkN@F_ zO!KGz;oCU35V8Ky)baE6$!XHkC#IDYkyWn^e@?&4T6k08zEkN!cSC#M&Pe7a(+J;Gu>5%9{)fCF?8pr z!Z1*>jQ9x2$BmjMVVcj*0O>5~A_NiR6MIJ{V5X+C#yz!|H?yUaR;(5+iD+1#6^~o6 zu+W6bj9IN~Y%dd@8_slI(C{_*^nxYs>TI~zY0A@}p#@_{vDPJ89gBW(rxJ?S(u)5q z6J9&)9FTR^uqMjqlM&Ul$`8^PAB<#>pxmQ1c5Y5h>KJ-v-xj{1HQ=ePpeR~FP4_6> z*L8bc49(2w~pd=PqQzmo7ka^r zOAFl@zN!XO5tmh8a2XCLj8dF@s?7)0*)M5cUg-N&Ub-`oQ&Oej2>;Dd)geQ#@!zL- zZhk*;*pv9+0QbRHT0irrSL#q1h`{Y<=O#F&H5%bv&YVu`ZvTeKkfOt^2Y_lTI&9>+ z*C?5l1Q_wdz3s*is3GXMk!aQ=uFDQ1?h@uSF@~2aq(+1g%DvgprMg<8XnIde6#)Oe;?NiAXCIE*wF4Db zW~DMA?(WRV5v4=ZiBYSCG5Jg(Wv|Q11r~+iN~gxv+rFDlYbKaiok8ucW~E_96*f>x z_iw%|B-MeQH;nAK#*{juxUJ~Vf+N)`Jn?GGsVY11EhyIpFaB;IA zX*DxS!TZGtDv8Hz*!7ZO?=eQB4cdi=kLAqts$YJye)bRhQN=9-nY;hkiGbP&Ky_bJ z&wkYPK8O>QNzr(BbJ?3v{W5KZVuXT>;2|h>+lA%x^VKk&R5;FQjl)kD5vcs`wOxJ^ z!WL7``iG@XY07uB;K?^g-@&d2JqY6cH>EX%<`)2g!%g`62q;JnC$k5a7mbWE7gP+S+ z{Q@Q=X=JX?82iuENvWRD3%03e1`g!#kbjiR2rTqi4c4EzDyfu-tOzie%B%WETHGsa z|E~YxL{q%*BZF;UP7lrv2@fBk+L%+3U|(IoVjygCNj8BWcol-bqLOVFgc1XL96^U` z{|Cuu9v9S72xV9lgD=L>?Y5dBe;}|S7Edi$OyIJqBi2`4oS?V99b{_4rFl|*p_l&y z@05gsw=5fhLmRCa;u!tcfM17vF*h{|$5*^x;-6|q1tLxZz@`Qg9ODgaYAynWt%Z5O zf9erA&tygtgD||VSq#o!Qmeqs{U`1*wKxS)+eM*@MH|&suuc zwL~zRdOL@r9~4i5HSKl3e&rnq??FasCtK>+fgm@{ArnA{?vtHaFMNqcw>Hd)EZ$^m z@~mC^SnO>&$M8yJo@3!^Rlut85_cM(3hXe9fso)$q6JEtE)FyW<#V&%9aWM$#&53T zRbG8}S;97zuewetI)rRcyeJ*~A+=ev6qRo;d!DLi^-Jd5!?(*|2BI1`9c#0{!r@n2 zm38PJ>I-Lb#n4$qZ6BwFq3KNZ;s)JZ+1DZN?q|~+e@ z4A+lqxGBh-F@z;BO}5~8PrHHr@Lsj&{kzs5bl6$K6ELV0uJBfGr}7cj=rR%Cfk@#q z##!-E!eCx}DRd~C5K!Yhc`5_8`rh$@IujUqdQ!nf z+2toGus7SPB^h90GBfu&(9>(fl-OYEJ1`?wRWIh`WAvp_)Sh!8>+)t#=jGZYh=%EAntB({GR_D-1zfDd=++CIi^87z#IhS@xp==e_WIv&Ge z*KBNlFuet+ZuzRu&ey5&I{o%M-KyhH8tla&o~r?&{NQi*$AJ^EB-%RomEtuU(oJ@7m5}s5~NV1#ofIvUZ4~x?(Q1gDOLg$ zFYfM6aQC3a0;IS*1n2NS-}=@%>s;j`7kT%}?Afztp5OD5bW@%o0jKu<6A>sWi?~&z zDL&D}`oL_`iPxk=W6@I5J=P=UxEF44(|IK>sb5;Py#Cn{l_EL$MmbqUq;R@t_xItS z8IFoGH2#8ZU)@crr`B)%*PYbF`v6y2^!&2OhrxuTjDRON)B}ZuQ|pnpzpfxQlD+TI!QVs6aGe15`&pPr@K@5euA-hB%AyZ>v0RtU$%q z2=le0N?^L!h~b!n6N5T&&kp5u*NhTXS?uCB9W}k=0CoZp88lc_ZeL0l+m=}0<73O~v z)^K80uH9{-%LOO&0eiLjBzrLdSyY`}E{KmKU-w4khs~j7s^@HQzTObb7`%9E; zB);kjaYPGLJ?2ep(9t*q!-wN7{C52im_5)U!fFy(wk=qnGKCNT z{$UW269wc@yJkwf7OtXs(dKZ0kv=tsAZdsgsBcFmK3kW z&Mi|K#FJT-PKjn+wq39TVO^YKcXeeFX;R(ed_C^*g9nX zexDszb~97MVvE2>%yR2OK^!4~60tM&{bfG=zki3eG<- zxQ~X&k;su}@vXoK)E>?JKX@tq-5|d6-}E`9f%hhIhNglR;2g$g^i7V~5c4kW+j`ou zQ)5T&NnMl4Ac><%sJV*Z>-E15gBjy(MT)6kbb^5|INqo^Et> zt&q`0A_1&s-`S`bx?)6rIb~xGp`>_Rb^6?0spIa+XE9VN82Fe}9b{_+Q%;k}ECyDg z^Jy=p6_HSO5t$K&nfv`Jna($xslkH>(B4w)=p`qg%Ry5dV1jntQGwu;#HWgYl_y604J-LBafoFv6~)nA|8W{1^&Ov?rUQSusZu&1Z;>?O5ovB8;7sZlTa8d?9XwLol%)>@5Gs{gKS{c zWW&gLk#R5Pai=uGz4~6in9r^X+QRM-ocsL^cY9$FQIjMi`$XvCYmww~cRrL#bAe3* zBpGQEf#DY}l!NcT?A9RHgmtjI9O9h|pa~gn)5PzJY1Y@_u;Txc0`n$*D*<2x034A4 z1d0!mq=@EYU#kdlCRqiomH81GrL)8`y?C&f$5mz)`nxvvn>F9ZyN_Y61t(PVI(Pf) ztvvlmAGCpH7zyZm43*x|ozuickHuv?TQl=D{UD_$)(#KCnfNcGYX{kr(>7a)`en(N z+T{8=u}$}d)8I$%m)NqInZN3II(Lv1tMKhZ+@9`>T49dN&4+=fU8)d^oB^>Fzu@=+ zJL$|jRG1{QEah5<)3`ufbkW0-FI4|2Mgo{TZAShRYrk_e{brJDA{;7OFN8rU#y|95 z)A*ZhSMg)^68nKjTp#B@>#(*x*~19*KX*AeJWOs`wup_fkj|5qDjn7q#urgnz50lN z*MB?0+Lzj7?8%4O{E@h4TXj~qPH$$OHzvQZK2d&$#Ayv9q5%C{(kk zk)j7$&{7NPz^_NPEIN#yxmu^SW|f|%Rf^p&5%eM9fcb^m{4av;^;>d;P7e*9whUgb zc}|||gjqkbejC=#WKYq=&{0MX6LaubDugC_mmM>xFqluLMf|5wYt$YQ`S{;rYFmeS zm$87BD2G4vY?(tecFOa$-Vx~@K&<(F^)UP{3+|-L+_PJnVJla`zt~PN?XId@eveA) zYuqOEj!+5A>B4lxdi`+zpW)ccW9e#hU6JNX)WvwH`QOcCRqD(LyjrM*lGL7VlM4^_ zic`G^*XFr13R@e*;Fhubo(`q|4fjo7@X>=yFP>zZwYsdwLwU!0W34!MJ=lLJ>|F28 zf4J*P$7Ia>)3pE;@zMmlT9Z7}_QG}kj||meeDB~jlU8aGhxyuZbI7x|Ft>RG*@yNO||0aKi{Z&U<9`>W3d=~BHXr6)IwcotMoS#Si z7DWNcd8x@~&7DGpc^bUyoX6T(kCl{cybeUBz4xf^=pEc`{-E)v?WA2)iAi5=N0a}W z^dn^JUSj_H(_eDlsx==!D(gGEtEW;O#(v)wi@lE0s2W|eu(HvS5k0pwDM%$thI{+p zy8E5y4(fPcha`Xh*|igmRik!vAdbRfK7^0S@GBCPXG)kSU6u8PNR$pq3ya61Io^BE zyRw#zY)`nUTdKWdeXVD=>6T$QhiK9`S<*NKLyT}6^PRezbLz^OzYe8l0>t|S zl1zCa(XOm(QeSPWsDIX0@g-fd^F{E3taXTag;visUf?j9sggbD=0v$_y>)Bn;H@JX zW}*VgeCgF~p-|sQwDU0OD?r~>{-?^e@%pbUK6twlHvaAfJoB~{9fI=lQU(+~24GBx zpKq|>T6lW^i_SgD-{a5G{P6$Wo;c-6iTg8g`(GHfzWbUl!rkgiI~WVNSA5c5v~1&7 z)ec9@$&JCHw_OKro{#j7Uuz1dRMt5`^+0SD$$k8{R#u#cC-+J_Q=OpC{@hOmCQ_i2 zmC@@0=6JB%1kB#SLzBuAz#ZJv=gi4bu-BoHtX{IyC!+1!&NgauOM2i&n2fV+Tg}pW zm3(w!Aok@c?duDXP^dP}oBVgOd&)uLm)Krr!9?pW?r!>WM)%Yejt%l@quI*n?;!$`2>Ma=KZSE84%SWPfr}{S zM3UF?sa@I5tf6hS8#NEtAh!ii79|f}dO6z+4p@VaJ*6DDEqFk7(0V)kbDO`D?3po2 zyd1HdZdZEI8L`#8b8JuLF{tNeG$Eq&!)v}ac(RDgAuVNf>FK!~N#<+L33c{9_G^{? zMe@f%|=X>eV`1ruj`8R(o33f@4E7TM)=SBWAxkX3C4%NCFJk55ZNHR62ajY zwAsjy|600Zzl&-sT-UBR*!^10;@_MJJ>Cni;pKlI+g3$KM%1^XzQs}?c?EQZF5Rpa zcg3+kvPO|4FWa|NuxRn2%mIFFSt^nJsPMCr+lBu8pq?UxGHSC^q!rT z$5%EItJ+GwEW0OH?7v?V&kjc*MN(cbG>)B&2u4nhG>ql_p8sO8fD9)DOt>Z&1ZAf| z7?D>0Nx<$~J6wWmZ~4-aS}33;TD%!2%|{c?qtQ)?%Oq|lif=pdRxEk^N25p0b)f7Q z+fY^tfHEPr)8x+a8fpEUN)~M_O7Zcon0OQDs5XCe-okKMuVKEnNKUDVN=>N>+`F=K z0;XRHTFa%s3gc4{ru1d#t|(O~8ZXS?yWm@~Bs=|+{o?YhGv~o>m?f_<9+dOmYm&PbJBPF_QK3t(NQo+y8#=qualhJutD}(sn z$;wv|WgG8l+p4U+t)rQS;T}aS>~Kd=mhh}bG#%!Wej+P*z|#T$CMUDCJ>dQ zVNiRiX@X9g)$)*A zHp08|)-TFVNChz_J$j6{Y?jS}fUSsT#E+#?bmuL?khGs$mlp&P3$dsFpm`_ z-V<)W%P6eM>m?AP)&i8}9r`~Z?S3V6+nnWUrn4}&ruOAnk4@g~>`*K(o1m-VB8YMn z3FAo3ebuCh%fC)(|9*5O*8c@tK$5|e>uA{CehF)RQhwcrVqMRFZd>bhY*m2We;7xq z?u*{{wOiL|nv)!|*vyV13FVn9Zr&ij?-*f#6(3hwM(C$*&x~|E`8^AEye!5NG`7E{*+mA7(4d>Lm~Idv!;Zz4#G7D_sc7Q zTqs9|43wj{f)cy6bjEnft;yZ@dSwM!67=If&%MHqZmsZQF8QHV_oi-i9?5&B3cOHw0&+B_h&zsLD zMe}E9Qn~bXm<{6YR}4GyL(6bq#sR+iY$7H`Eyw2+qm+90>dNI4;SQ~~bu&q3F({x9 z!bc5ubFO(xNlo`Z)x#1S4obI$=T4$seY1QzlRXb{uG97B9_Ev7Ud(C~6!L++-@9~Y zlXx#AT*QQbpk8RY2wMpJ>0Rn*{AkqLJvFk87N2OBXP>i@J`CH;E)uzu+~v}G*z;O5 zez?+P4R&01>nimExm|Q9u>bfmA-vHer0KculBs*WV1W?Y$+Qi_fb2Hn3Z#}j-av}x zLeGjsE+QII#6^w=`-3vPO4gEA(x;K{1VUa|jDegQa}&xhXyD4uyPxNyGZW06cm1Cm zE*9L2>_#r0HdD6`nYpanCCb3eW29C)*ho4p)= z@bhL%tE4+&Aw+mLpKd*)UUDaN2G9ElA|rT?m!<7N^?2?NW!=eYC>Ig&z!hosuD|KN zPkI!_uhY})ko>njL1_6eR5PIt()w^CT;zr_zH*g`g1gkz(Q2W-FUT45TF7@60n2(W zoeYqX(u+IUpOG3AIly{EUokZg(`%}_6?^DvA363uSwgBBx2_+4<)=VbrKa{$Dq9Ox z9M$~90oy-at=FEmm5uaU=&P~`98DkJw|reZnGADtG;R`V*(~5yhWZ z>{$1JZ`Q5M9&x2aFNj~vaYell5pvjD&;9(YA2bbod{?m0 zW6!=J8Ez{AIA$^gQ(VqclR*-@h5L(jbJuB!C|M7uSV85+=UllLW;?DX3Pofql5yLZ zb0Q9W%jSNI7hQUz$M+|??%sXijQQz@{l_h#llO*LH&Yf-O=ii^@5llkN=2hR7gZ&< zGuzdb?e1%!q7sF)Wo)&mO!$?NEKhlkd zwAo}mA*`S>$J(7`hQ|V-0eMc=P1QS*`RH!Ghb~Bi0xpf^)Fwouo3h z_QLdwx{J{djP7Az(3aN|C-ftRi2Z-_S0t6r<7uItot@+p|BJyn?_rV2-OC1Le+U~4 zMdco}XA9Z*OLtNHhpnAK;pN`RWp@6gozta=A_H;F&GlDX| zi!{&D!!1<~D(<{rIP1#AC6B@CZUTqAizmcyp}n0&W9G%<`{N(~x>sX#RE#ER^eS~c zqy-Pc-nuTw9~a}J0GDzuu+~FO-gx&{Rk9XkoQ`6}dS<7jLyxk5+kIokx>5|V_ntD_ z(be*M80WT`WfX&4uq=6p?b|^Ly9n(3ykJ@xpt>_ZPMjV6#SkS=^z>H<@1h?%$ z2BheNyUui1o-hPTYUim}XFN%*?0P9GnAzJ~)4itmwrcGs zT;?ei4z5|rS3JF&PF){!aj90+KonyKfauRoum2&(EU-4Nwy}K_zneta@9}Qu$Tv`c zTv)yZ4aVtuT+?rDZYWon3GMeQvqKJRT=+F11wzQc=l+wqnysO?KvmpB5}4-Z2iFUn zrtdN+ulGB5N$yyGiSN+MXn4OYAfstbJrjmh<4e^JS~S0}*q@@5E?tt1*Gub~dVVoN zetw>$&xrY7+uFnSTTtR);)xzMatH(JEBtUtsj&+Y^3(8W%0Z{XuSF1t>4T1w7vl1M z@Di`Rb$(l;`vzUJO9^fly}y^r6GAA7V46$yFEl;fA;6L(((L81}yHS+mXiU-)iGv z1Hy2pa%aTLa8kEmYleW1TQEOwz#g_-V0CLcCy^FPo~Gi@G5e*X_9vPcD`&oDl@H$w zDE@HHj_dF(U+XkGSK9qebHCfTgK{l~T~Ghy-1s8AFI-5oW@a8;t<)Ua5>>^&=9tW` z?}VdCeuO9~h+ioa_wF9o7n#AK<{ZPJ6q=>x^11FtZt0b2$yM!V6R+zsGdFGd^{)5M zvA+5szE(nQSzU9=V?>=_v-OUm;dncP0<%J1>2ro~^-;61f9=4ErM*iq29C3!NiA$v zkZ|R<#ZGI_dQi&F%a=<>9u}Q8R&D>}Nxn87MaeTZ$F5suuqfgTOhCrQP7nuzq@e<1cb;e6L6oh^S7y@ zDBZBV9mKI8_-(~`ki09NDeSZAd$*iXd349x^iY6S>3T-Q@72S^&&9~qL4W7-^JY&vZ%yFbugej_pCP1e5guygwOxS zzICaz?5=ZFOeO~Ea?sH^duMBEUudIgpjTNAQfFjqseMdjv-qC0d>Nlu>7gH2CDoK= zSE^=W7hl%7U^!S6vs20Dh88aaf*90xw1E&E5byiSvhUsXG?vKmDZm&G|la z=4#pZoO`hKH>ZoPs(uYc8m}a@D#VL1x`{pUmYW5bV)AZi9DZN6+X=9OO_+c5A+%?B;}G;Ug_EV%Z0naRTBylN zeQNwlF{h_*>EMR@06*ko)@F)NyYlK&PxRP`tN62lxUMnbh7J6lf8(~$4CZDE$ZI}K`YSAI2e&-_t%YtwWl3Z2 z0698dZMS)xaXxB={7~JP01EHmo(S2aOd|Hr!zaPT;S3fm)uioK^&MB&6zc3FhNkZ` zB)gLTKm*(BI=H!!e}`rk;{$~EznELJCi~r#zf3jxy$+cg=w~zq|J#E|z^iVLN6UHB z;Jk|>T0n8*d8uGkFgo6w*$#R`p1&2|z9qe>(dwmNzeA23PIw(rKc(`4exm@*u<~JC z7#i^13em=cLh34>t{FndOZXFtcZ)4#@mQOjHkJjX*cfn*9}L_9r~A{wcgrOf7@uo; z;o~F8Z%akhvX}&V7@`}-D<5{zK=8T^^BptxiML&8o3*GRTwgu`Rx)%zdSwh;fZ+QE zO7`QZtc;Dq*Rj6{VJ$`e^XZWFk7&qHVEOa~BSaJaDg|Q~MPkL;j$c-CU+2h!$h_52pxS<%~NTSpKb2Lq~I&Ut~uXmkcf_I1JkzcCz zAL;63T8*5*QKAh7Wen#Bn-C7qr$ymq9Bm}fn+n^_{e5(8iF+1n?7-5F0oXB zw0Ak>!Ut&Ju^IRle1VN)?C{W}Nf}^0G}#RfOkPhE+d;J!d)nXwZF{ufn6~6O!xE-x zyYr^QcH~3WcbDeOg;x(h7gU;F^Vlf6QY?KsNhAML;3Kpp=4X=z$$PsST~+Dw`qLWY z*VJsXlcCqb>@!^r!l2_NY_4GTd8E1`ruduu=%=M{TYu=1@DKK0#8yD9IGD*ST>p2C zDElZ=*72S&l{LuC$F^@R3@3hFj{S7%I;v8*Gc7MamGBw@I?2rNFGhdDJ_^&0-1zji zQ*?*4bWu-Cuu6^6@y$XJxKgRMivU5${)tJW<6*;o z{=5ImEaq2fyF{9v;vii$EMj&hug$wlgw~uB65|JR39SqQeEo>zM``gx(&BJaD5QyQL)hK)en?Cx2Hfwa08xdIsmxq8IUI08NHQOX zKWesGj?iII9N5g^IbM!?W9XUa)usL5nox?H26uceAky<%uJU`4w!}FZsGAN@db^0; zKTT2J#3KQh2p?hF4=)+!dL#b+=j%wDB%59!ZbRxcvB004d;5^@hUriP&2(zRO9}Ul zjy(2i8Iaj2{t6!DJn{XVU+saye6QYIj77!?hX1(#{KU}I<8|DD98@~vE#!3gf^)iR zO|Nrh?!#XY60pBk{zj)-0?HC=={P&5#r##h#qPv+OJy6sKd>qQ%B|li^Y+=kZ(+L9 z5_f=Op!}VeA4>egkNrU<3WG~~D5D9szXiqW^9Q_`A_UsN+&#HZAm66|U5(knv&SOa zAj*cBnCGk$Na(qOinw}a2fXoVPeD^h&%!NTtVqDzG(6*z_=wdSq{H`{qGg%M4Fw_;$yPzuOJsK{iu>ek)` z$=%;iyE;nk%pX%t-?_dfs^ydVXOB%wB#xi)&2rhh^L9u*qusC;%85l!Q6^dL@pm>M zh>oJze$9yyFQElQyyV`#_fzNUkc(eAvZRE&BR>C&)RQ)Add25u*c6S>kMqIubj7>} z?87(=DN~xQt#~bzN-}iQY=U>eAXhf5cL8~?zgP`;hTt?;uvQedtrHfZlA_g1&k@^+ zFAMHtV6hugzXQqsz&J1y(yWepjD@+Q2m5*N_aoAyI7IamE(SJR(_zQZw{H9TkK|pd zRby9ue10&2WERJe3%qba&`r?2{K&hfcH;}=MWa|j*e_}d|N0)FJy2OZ(=lts*2*Pu zkiBJvnu-%Y@T1kpp%lN?3)GOnz(n!!QdAyy*OQa9OXsncr9(Bj&0h*w?6s|&!aegvZVSLhjw5=UQNq_ZHDy^ z)P;@Z_THyTop1d|Ix{4KPMCuHCxRF~c78{-}NtNHKq z#_r_#c6&uWlJa0BgWIQbzVi{_-R95iw~u{Sud*-i4PCl^;ex%tc>Yj(&26M^y=6`4X zBkVlF>y*E;clUnmPH8PC(wb!UGnyq_hHsrpO8sZ8O-O=tLS+|0SJFYc%cnJE-KxLh zt%zOzy9P*)TN?dmqN{5_#8JzDpnci?phxZxO~^zE_2ZP*2YAz<5k-mLre7ahdX{&{ zK`Z1wA0l+F2at)WQ@QcW)&@*UoW;^7QQpxB7_+=j_*LC>fMvIl;n&O%D8o$r#a%xs z)bmWF$fGlG*!6mJH+&ZUn7KZvE*?036YMbgcWJw{%zCAy*8+CTeyy|Fo0QdINVw#A z+mfVjI=^$zA{2sw@y`6fK-(<-#2x-sd;~YXb;ATyku%Jy%?lm>EmiW#>eH8@=Pv(j zcIRTq1m)4-scyk>aXtCLA6SLXk$v&Q8p|!N3F9w5dLpQ-q4@I3xBWK{_yZTavHZcx zLL_Shb3HCGj^az?kLg!WnC>|lbVThvSN|Aig?JBYp0VM(H4Io3?`M$bs|-NNYBSo!vY+Ea4rS7Xdnwy?KRiJUaW zL1ijS!?sifPN@VXii{V2^i0h#dq2&X!ijWPwF!rextH8+t^oQD!1~S3m|{=9RVaFv zK$3r~UWHxk*j2fH`Lg2AsNC#3p9(5Ngx$7r+qqg?9@c5X(3>t*+KSXR6H)tg1rmXt zcm08k`4%UPGDlu3r@h2~C##<7p+FyrH}cV{8_ula1O~Z3A_TVIuADhc{F(Wo!m~6> z9#V!xFvRSl>S+=nLX5bL#ld6oQRSubi=nn8&STL!D$;VSW-W_Q+pP$ zuD#-BLyb78_l(Epi$w`bSCRo`@&$0X9e;X_nZ{K#IpvO`Q+lG*9c^=keEXIHyK<7D zi@=SVmkk=7#HiilW1o5o^?twDh#-5n0Tq}ay<-Kiso zw;ZEntf#D9nng#u{8DALiG-NK7we1fm#6sd96tT!fba!~rV~0MchO`i2k!?tzg~zh z;QJl_!N3h^_Ev>U0)zePP~j(ri1r+ItahHnG3b@`P_4_L2CzUh8C zX1!7hJeU6r{|kclnoF7;Galn~^mb?_1iyB~3ZZ0OR>WV}Y>g~JbtHk-?tM_T2! zwzke+vH~qG{@G0s?|<$MlL=^d@b^cO`4vcnA`)p#!)_bBdXh$5VF;H!S=jv6f0EjD z-@4kZ+R6ovQ^pjSnRZ=qCMJgdu|C-0;4g6f9a>2c8AdI+5+Je(DQH*Zn4t=mvZlVuZ&wVs;Aa@2*bIXs;AQx3 zK}t+bX!Eq5Y2*o@#w7+*@=kUApU;Vh7**!4sZDIv0VIeL~8l8SMWP!**Yon|X zE%@PL-SLZYtTQVstNlNzt%MZLUSeV^5}u}w(BlsZ;EY`rUa7yNx@02zXxv|-CtODP zS={STWf;C@7=9!b3Jy$`ygaPI>L)tkP3h@EIUFJ>PhlyTCPb1MX}Byh@HceRsdW#O zI;4fal8L(6agk4#k!oFvlAkULB$bKl#$`e={V*5Meq4}P_^oFc@=+G`#<&ZOjqf1G zN#8R=_REAH_9^?LV|-wq^ct|C&&Ta|26B2e9SSGrKEP@;Q_FUEOqJ$#b5(4ZI+*1) zmDXwG8+-UB;rf@{wt@qaeUTY#+nn&+boG}*%YVU~Yazm`i*rW10`^^mgi(pLUPSFs zQ($Y#bhpuk+7H!n7GtBpaegq`Wf)mTU^AI{Kk=U7_cFTMYj|L-^a%NP)Xg&_D#eeK z4qrvr^jaL}D3?745*129-k{S&*5OHfNQ{q+3^74g&Lzf`$P1+~PnG^r^a+~&+@U|9 zvJks)TL=!u!Xt*h*@EW)SN%r1MzKC5VMPrtk_Jp;I`%zrCo6F?lFtpf33d~u@7Blz zqp_?fa+hNs0laOe$mXvwQAT3(DGE|? zEsnN@q>O&*?O7~I=UxmoaLB@OgbiYtz_VZQz^@4M#N~p%BK;;f_t-lmwplZ~;w4=77muj~Z86Ej(-Xa|hgGTYE@2twi*gckptBVyUh!$#7w;Yc=*}*g z@9|49W07YK9iGrVP;8M41@L?$m7LA0QWc1oDr`^$zHqtTUFB9X68Y#d7AKo>r7SIp{-{VH$Ky3DCF~A_{;hdzv`Ih*$E8|2FII#UEqM3tTs#t_EpbDvt{u zDWv2b%K_3$lD>-*$w_boa3VzSktIKL86Gn>Vt6@;YLwxE&|-bkNXoO!HY7k-d;1Uo zxV2XC=3b%^a6(4ycau|ARR!wr@84D)PZyjaCL$uOhkHuzDZ|4#;}OrjkgJC|VNf)~ zkWS@ZOQ{q7P?jLqjFMVHPo$Cp&z^|7m@@cQSlxoX^*lZiJt!RA*Bws?_GQ{nn=bu~-PFw=I&B+hSp!5_-uI)1ZU;~munU#-gkWZF427I@A`1Uyc&U#QP} zel^PRG=AuKrsy&{L@u5|kVv*owrS1AMX9N>&{UoGcb-$cbA0E+#?B`T1!KM?DM22A zxRAT}=er&to`$*tj{q$vA3g1Oo0UY!97gsCHq~rAvYW+cUiA0jLNsRiKmsQIy3Ei0 zC1^5y@hr7|QkPHd&#WB9cNGiGeZRd?>}bw0(A+10%pkE_{@?DiUt)bU5^WNFixjg= zX~H*GMS!xlGRH+1UX~Kem}(}5W;7P~eQZ!)|6ueX$>Xw^j)u84+TUa0Eb+dt(ojlS zNru(~jqvD@_|oY$qUb&dGEejJ)-SAm8L~n`J>wWbGvE6IfQ=KNN)z|j-K01RJ|1VS zHHv63Mg5E+wdbZ15P9%Ua#o!3o0X4XK?2fG{}~qk8;F7ddy%~{Q|yqiYHx0jrEbV8 zC}dFYxHdpa3uh_|3qIzQm1Ny<_`1H_ z*Dhkb-uQ%E@S#3UGFl9S2x-p}13!9)s!^KvlYboD?sSVbNYW0)K8FWsonw2N;VupT z^MLG|Y-CAUA+YG4OLknvH3O5AwQ>s*=^bh)!D;A&d`Q`1ryI+i$z0NBbdJF90pkt{ zz%(11)unHBuS*Mo4M;j~yh1O!Ta1a*1kr!1>m}B*xpy}1Ep&0i$G?{x$tU2k7>sb; zC3ZaQ&I=#@L2Bco!&c0H?BaW^IrIM2gsST+TDQIqreRqxedg1jQeeNFN?k$#ZBLEr zuedVnsV^0^MfcpuVA`DY`VW77H=ZXxx@b0(>P81l)4^rkk||8**|TvaP`@*Or>^pJ ztEm_mbOWfE%t;%P;=kI8{SY@xHEYWBhe46G`oMRatHO~Xwy!SvV7!tsgI|a!VGgKD zlcTNMW(Ah){_%L;+==FRDeyY<1S1y>mr}^|>HFu;p=lzXwagzrI0eu#Y@8LHpY!m^ z2hO@1WVh|<_GqXdjQoumbqXncWrp7p1Pi|+{_vxI9}8kNt?6kGy(^ZPCxfMn)38n- zrHD?tt6w5T6>{x&1phTti21(Oqg|h@oxEtdpZX~Uo%^I_2V$rlf>$1HFIGy`%XI(c zV;-+&3s-J6N`?LTsHfnqmRn{xNasnxPffG?YnA~U)yCk5k=D6M#wl3;Fr2yKO|j7& z0ItZ@O~8IiWGVFVZ7o9Qx1c0uq~-{~h`dsld#F1KV)u;N6&EAPAb5S>c|VKZ`O;Tb z2j?x)?wcsN-wylxR&q4Rz7cw3KEv=GImD5JlnbSsrft7P*8cr>HSB}{I@9b+GAc|% zbTi@?ivS+2>Ie*s5oU8CRUstX>QL7H5)3Rn94ZE;1Pv>OAQ6>^3dI_z!ERvp34M@C zJg*}i1)6}m6-kc9`5cKaztz$w#CjTqoj6YV6nhBKYWDu^6;C7mSjn?Xj&efg1SP-V*_H zP?20uhw+hRC5NR1TQ}+j%Zndgg=w`}HTKBR8c7rj14uSw1s}FPKp1avyF#o{e{>_> ze$`7d@tgn;o*%wnM8}G|FR=9w^^FM%OMdsAVNshQ)I3K`k0#Hu^s5I=IOo^9 z&6o?KaiD{HZ_VJ8#T=I{@+6?T!p|+P#FdmffUeyA3n_ugx6A~lVv_*cLup~v3>d^^ zO=>0J>m}hk(anSp;_g$v7sp6y#nt&DxI&&@0FFDVY*Sz$=BB*9(ciGX)O`_Jyz#5?-MC0~kI5PpM**2R1nf@%rluwNa5z9u zOxK?(pg5Z>`rKD5`CO}%mZ!MkWAucVy%I8Q0RQVG}@M)=3~hR;%eJ|{@A zw3sHRxlDe(kBAPedbspN;mzA*kA;LwMMg)~e!L(acHxm9p>d|qA?i8yqix|9Fz(JC z>T^w;BQQW(2n7UO{049Ct`ZjF($NMr0vas`A%6lag7&XEmu;^kRYQD7PzO)-@D4?6 z;g&Nt2V?wwJ4mPaZ^8^}LHClkC0fVc;{L-79VLvSv}LR3Xqq{7WWR%BM=<(4cQWlJxw?2eI5e> zABDsaXAtF$n2sqmlMFWJ8|6k537K{jQe(c07jFOF_v~pt>AeGZqPIomHv2m=@T{v? z755!F^yQXGMjEtq!Szch+`~|6j+9C8WGr-M+=#yWCNM+h^J5u~Il=K@aIlZ61V4E6 z{LjK^YV!P#c7V*-ukQ&N^9T!=Cd^M ztZ&~(=ZB0&##(Hb)UR5Ku-N6^O_gf$&xm1VLeFEz@=P80&Dq9rjQ>NPNt;Pwcxq=) zkCYl!g?_uXp=q0U?98@3uDv^s-N-*T#@bK5P$<5)LKX|z7C}I;BRP=(kpyy%0@Irt z+(A4ULV7gtJ1o=$ai$>0{is9_(*AJzL6TFB{=v8*=Ut$~(SZWaPXHeP8-UbBXpNiR zFZk^k?vaZu*^ivi<#{}TRGBP~RYaCJgDerbk0~G}iWH7i3U~()nZ+?A#uK0|;VO-) z`v$bThw8b53!qTmaHIe@+UqXqS1WNwk1~wm#S;I%hVUS<=@~uMY5m@RVX+|u32e4VddP(uxr5`n-W*IlR)L* zRT%wCXdk*CY6AHBsv;5%%)+0Lp#Mue#CVD^-mO9v!=Wipc;ry<^w)3ic(vCaJq>3^ z7-6nBAF*}tk!1N5$UW~ao%7c9qp^HBRfK@X!y%- ze*T;`A9&ci2HP=n+k7LTKImzQ;(JGd#4~f0IwpK;apGgu0eENe$%N%M7bZ==^~9mL z4rZC0_Bht$`>AcwEX*THYF`_%xwPk-KlFnPp=j|)H#?hx$g}kye_=lZ=v6PRCpA$` z0(jLeE@1?-v~9NW3~XTkAuA)B;}{2#V-qq%vNMu(aAfaUh+}1C zg@`z0S4I&bjuqM2QGCzmw;sR0;r+g^`@UY+>-D_6o3}W}{n!`k@4xqmSxDiO|MU`a zc*{8(Yqji=lqV4+*>jrtSz)Htyz`r~c+;opjh+zSfUs-5EOv%Ut=oUcYTf=Y{<+f7 zd7{}=Kalv|P)Gr!kX*#Go|K7_vBD9}^Asjsx&z1#^nI^P!(kP@;*h9HL&#qj3_qTR z*A2Z(nWcA8_~0bIj-{l(>K=R4)68;C4EEyZNl)l^r}U7h*O1rO7pp&R^HcK{S5pk= zTA;H6vY*&6i9(!Jk<2D<|t9lWh# zaNk7ww}~KjHI%_OODrv_2Y2qb+~KW$Aau%^{qGGetNGfQQZCQ zLtGfNUe@_xTy&+`$2YYQC#=(IOQr~;$%h&#}#?rCRpP#J#-*9DGUUi{v-8l}u;J^D5##X~m5 z7eKwiN(e9mPz6+BK58xA_&~J8eGhy_72730zclB3TKOKM;J}PaNN$2B3`dditUPteQJ_z4 zcSVDZH$;JB(jvitlm&bG4_Bl=0ncHKa-Z6(o$JCe28mIOA~TJ&jyY?dd{_oK_Mi%T z<0Zf1ol1K$bS@}Y%vOBnlmrI6)%9@BjGyt`2k|M zCsRL&g5|rlIW5Y;e@SzYb0Nlp!|KCwWM}IZ-`UWDTt%C@zMKR53I7_idw)27R_dN_ z$|d(fLbxjajsD5X(EII}h21&c`fd}#opH~_P$VS_+a?SCx<8H2ZKw6oJpm*EOvF2@ z;5@o~()Yo5>B!Gw)XbmRa0j!v3^)JM-7^JWEsyvjn=^OjH^W%6n&Nf+Uzjh&!LEbw zOjH@biSM~yvSs9HW_9L40{BGfc=y&vYiv&z|ACf-@m~QvWOeZ|NL))P`5RIL;9ElL z=m|^POzHW}GufXS*C(Q(}IvrDKe_{JOG+bruqi`PqC zqy9=nHV}UUGFq$t;zTJOJj3>_!Qhzlam_QW%gDagU z6{Nn$Y}u_uA1LV(Yg3)Suu}tfzPjQ#K}45{fl3NOf;Vq?N$;Tt#utxu>>0bF=AmX zfdnGEDF<{!w0f%_vDOi>PAPy#pZE~}iZ8EZZqMSR6NgR5YZ_$4zRSn(%uvjz&}mlm z^~Hz$?3L1KdY2xCJbJ0I3`|*9)`l{D)Fu!GV@rSt0LycNE0&9~ag?=IvIbYDztO^Hjj` z(HdXANZ{&9%HtnZr5Th!RIanZ*`%TfsQdhbx8nXT)PeW>gMoUitvWVzS%J>9nP8}H z{h$Ug6{QfwL>~k|sU-wu;29f*G9OiJK`DX;8LHinZw!$W(y75Gq$75yruGU)a#fP0*`dTA*HW$a#xhGsedPA=iZ4~vXXdJ%Q)6*5qfdCky z5WGRBTxLGI0B(4aH_A zT}XsSyj-V72I_Raz0O0{%XWMJouqn09f``(0jd;E`5D_b`Ev%nvIp2OF=(?dU;v*7|47c(?Rm-i_s>0CG&anU z6+q1!f&J(A-uLcB(st}SAdATT$rzKH957%##<#9{NbU~9b^?_q$)=;^MfMdrZ1?Yx zMhvzIFS@b0w|^DUPd*uIe%c;~E}p#7c&bhk07_|J^kP=~VSlXXwfYY9q%=8M0{#n7 zvDSukydBbZh@g~!&XFsuJbrPN@*eZ$Sd(wmE~@PGg+_h--xtc^wjK9mjhXcu@rbv8 z?i*^N-J*<#=P%Ch6Xm`d42n_6ppkMTcKhcn+o?b=bbo6tp6r4^A_YzDBgbp}&bXl! z-E~%w=Go=O$3`~3=~qVcj-(hI_(9Ui`tmsyYuV>>tvbO2 zrPiXFO^~{chn~1(5;w*>9=f3=oBTPF;2M2&J1S0%$+x=E5uZ&e_7Jucc?|eT=Q_)> z3fi;1AKP@?YMzJc&C|gWDx0c^m8=!#J5fAcDk1KDZ3_#YL;HV=yuPPeyThpLoo?jq z`YN2SIUQCU`Ta?CZn_ckY;r0!g)wkp^TPkr=IWtxY@7DX%zW=W^~3cxuX$VR=Pnl@ z)XtD}ra;<{u8=o2@4^xaOiEqq_?b=BF`CnC=_SJedM3&A^-Te{S82JOXA!kTvGnHv zw`a@x4trP0rx5@O;(fn`9Y9%jG?Uju4z>p1rQ*ez93183$j8Gpgkqj?;4`xPi*y=1 zbcow)XsEcHq6#<)yc%`Yl8x-Vl`5SL$_Q}PU%i^iSflzX)pcW7{rK&W@ z=AQdW`uOEw%Dm!UJzv3-c&X4E`qys&tMkNda2r-9*ju+`OsSynhnv{&#Pt!|`akam zvO6Dt$@Amq#d%a&VaVLbo&|NkRWIGSoYa5(Df|ieu1X@VVR7+Q=;2EnS~zq9F!4nD z8HK{{X#T?zK=ja^UqC4yOK8O_LOeTu1cH;QHfC$HCE<= zDHBq}V|M`3RTPO_h5p3>^TTmmAuVSm$XDRE4`LO%QLm%65+U-Q*9+qooxe;fr8q~= z^_r$znMBDP_!jcgyWNS4=4FG*$9>m~VNfUCLtiy(p&}Ioj9!pF-6bKDzFG<3|YgpZ3rvY__cjg+{Aspo%nsyBYeJgl z*ye;&lgK%;iMkoNffFjWRcmV=OgxAd!D-iiKMhWr(RlkXC?h5Tt=%UAMByc`QeNxU zr+#KM)@k>Y-?}2rn|!(MZ9j8)ygPj9%9na06)JYna*wbwkmNm6Z%4crwag#Y_PtoA zkcN&s!LZfhcJHPP#klsLt=(CZLY|E=(wOs$gCnRrP`{x7sWtx5k7+8wY@uAkmO^GJ z6EZ?cBdW@lN$Vwpz4T6BSR-9(5p*5K#(X$|(UIvD`WIafK>5xqj~b(`iH|~KiZxQC zHMSTq#pgo%02&A~12!Kx>b6GFqh-BHs}tLUlw$ZD=(E`HB@JqG4@%!vKq9v3s`E7h3)$bWLxE7_Kx)~BUZefv;nBi||BjIB;>Xv+(pc&^O2Je8&$`_1RR zSKh5e3FHrOPT7^g%4**Kc?Uu7Bb-b#Q!$#;n|e|Xe~&>C z+>^k)Ih-u3|}R70jtF zWFgMFr5~GTv2k@K%|Aun2+dKYTgCe_o6(1=sqw-6#>LI(7_+7DH;{esa59uY_)l$e zvY}F1;>m(5KBY>1rknBR5BIkM&D7|D9tU7EahPgVq#DrczXB1B;}c;g#G?h6G_k`? znM}(rl|l^V2@*5)Eml@6Hxq!oRw>DU!A0C?GmjrUAU!ln2rLsrp$9+Qeh* z^YNo_BlgP6ET4;tw=fJaAlECB&0XaLuz>4=*)=O-wA5M7f6>6e50kJ0EYGFmCd7&2 zv$3VVkiAdj4PduB>&S=aPw+1RiDH7?5z9U^_fla!;~$Phlapb{DeeOZZR+2)pAMT! znj+-oWjz2?T{DFX{{{<$uXYIO1L-AE**OquU}gh=gS=@U29LtGLp!K$deB*UIbb{qcJO8;S4l9KECykLCAKO2)(83*B67$vT3!lPqSSVrgRn#SwK z@EQ}x0J%!c%6qPLs4;zE+;r)4Smdv`04k$3cu_Aj@PSE}KF(t;Z2C@y_(cpo z)DEqcA+&B{p7I(jf1m1A@l}sc{=3A5n&}q=R~pnUY-xNOXmRTihwZPhis^JCE$JOU zM(UOq^W-*=^*6z7%Kp5cr`8np1-Fppy7u}+Lv0gRe_NZy?|qOC){HpH?`3>VlNbno z{E`g$H_1D=B*ClnIxSG;`t4QF!rq*A(L>g@!=QuRgW|fH(}wGd2DU8rU2h*J|3dujg0P({){e)zJ7HbdDzF}QViWmDD&_STJpq6c&c$pIN ztDloO;X)8kD2eWp)RYCr&?l6_(uS^l7|U3Wb%l2|I(=+Qhc?PLGK0SG( zik5hH;Gecd&7-wg9+Ei?I^H6y0-*W@ef|`%{y=^vZ~PJ+nXbjnpV8w+|5f_CqQ8ZX z`^X{gx%Y4hYP(?gajf%z574ZZxYwjcG&E$DjLzN6*49&zVvnw4U81EhFt4JkgD90u&W1i+vL!x&vsHy|27e$5e%67<;k|%NM_XnVac#s0fz;F}%eoI7w zFJtdx&w>LX-Yq3^5rEnv9R#qnq}}rVnr8XpsF=nVI~NO6oh5Nw8dLxZ073$mJ0?Uc zW_*ES45}nvjfz{6nKxITsMn?=`hrTSF)=4)hET zj28nTRs4>cSgs}mC1)Sv#rDtOnk2hav!3W`*S-JQiVE&*-UJhD5W+URv9of_k|KVy z+FD%Y78T6V=za}tcgu)`l3EQH2FimqzXIIBE=_j-XQU^}6A`a7`4Yp~&q9L!pbeK$ zFh*ubNBQhqtx-77OW&$J3d=cNr#x^_$E6`+(M#|*sbLJckc-J=Rg|ly)n_i))}jQG68bAj=bD`dxIA< z4F7jc^jFLOvePD&favs-0a3KuA;ql&jWCfBQdIh{>3iBK z{6z)H%t(Ozc&Fc?g=FlC#Y0qF{?y0X!KL5A}IHVwfc{V*;+H1TKgcB$| zf9}Sl2YCu$NUzqTFS>mr?UI!l%9HvW3|4XU#?+p*{uLT&i2C61jC^??d9Xt;R?nY= zzmzj4xeU02v<$6Y#6$JV_w^{r6`ZOK=ZZgNDu-p?$Ft+87`;^yT-euI?n2z}E6iy#k`^_qg4jG$C>V>VI#G;y-{`fj?$*4cyw;>v7? zp+f+Xc(Aaud3h{6MhReK-wWln${xd6s*}?wY8GadwWeE#L|3^6;bkv09VS(8K2H__jTE2=m%s2KcO)?G0-K6 z61}1}Ub7U^S-1rNWn266h$z-736Tw4Emcu6vWk(%CUp-T1tlU|m1#lJuk3n7r= zHQ+_`@AvBMkEr~!KL|HRbL%w%6ES6-Ccn{<^`^+Nu)8>k%T|6fS_iX;wbEKudr3Tl zJy-+)P+a{FTgyCR9m~M#1BO$^lkTzH{aT}{6yX-jw!5>p->n9)!thUQMl&I2GfC&M z#`TNMRzuT?l~bM0rTqHpH$YDM@`0Bll!rF!BX#KwqB6YC}^>m&n0CbHb2?ES!<*+2bFQ~MDmGy_cWn~ zW4!%Y!RU8k?(M6XJxh|bx2j#MS$E>k0>ea${rh?vLh*graEnvjQ2U?XpV32VAt4&| zycnuKsBm4*>YKWT8hfRWUz`hzZJQesO8-(w{GnWU8O@J3bPmr_mUuAP7TnVeX_Sxr zQ&S!2Dd@GX^uS5YCJFSs7;ew^)afG;_E)3hLYlRL;V+oT>-qL$#$MT1)cEMQ>E1WXZ&vrq=p%Zj2RB$F8%MSpcgO9m%jq+O>!ebosfwT38m*-z z8my>aaBYsyd>sd*ayg5@jLUt)Og`QEroHQ?#{DMr{Nff1&yl(ZKf^m`Y@p5_XZPFZ{(85K*~3qk-`-AN{5mR!O~x7UL2sa+JvZo^o>jB(-`T@M zH-HQoC7c7yL%ea&VoP%$F0M~Z>6kRMI=Mq3H6E(h5oO*_{Z**=xWHM5)l7eidVqnD zpmAdWda!*Nd7Y@*$W{{dbmTu{lFeVFeoTMx5F5qjx}07 z$K@XAgO{X)8Uw#Qs1r%Zrv`HXK5&+VV(`6VSCNqrFSF4KWGSl}(Q{jZP*}WoW z@vhEWNq5>gh%S=oJ_&nB%#kqwHmiUNr#jfKxBnH>6#FMv?1eAV;$sp8%nvpfaHW+J zn^o$H3?w70-s7si{$8nfw)fj-9Ufr22Dcm`Ec^hc9 z47Xf8)BU%n^1cDa9au2Q%?Z(dfuz$U{(v^7tnNB6IfAeJGfGJdFil4d?KH7-TWWgB zmh~Anb1AG!hGOa9DJGmpnX)YV*)z&xs*rzd4YWvVta!ld^t_H*5$LY)PGX&_X}jM3 zQ2DF~M`k?R(f!3K;4ZviTjA`G*eSW1346 zdJO+0ugm1d&)`fAXU4-Zz&(H%7QK9YChW^J(it$`H<7xV?PTCZP!adrnipsMy6^ri`lz)e{0S_u zd|v#a`RrWX;I@pPfk3={`1kpDG75ZVwDwrapW&m^q+LMI43ylvgKmec8;ABp=Wt0f zrRO1g(T;8kl1nQSn>Gw{OnCQZElK6_{fWtwwvM;g|H2<_R9enF45kRH?%+#uFV~E>Ze={wp?*N`1 zR2OiR6XTN}46=OW&u5o4ml|J;Nu4D#sf*dEBNNtjs=_f+Q>IJa^N(tQ0N2W~{4e~z zYs`kTvHf$yN0h3BDE)ly+a$0e#!cQ&5Q6rOG=0sDd%GB0ZFt5G?#+2;`O~YXE_k6+ zwlv~SKoeZlr>7HKrZ6(!HA7~#GO+{Vf9^=oO@&EvVR2!9hJNIB<#zE4v}vzTDw>fB zQjanfKKB1iIQL?}@PhW_iPqhIN*Qo_he|6^BKJspqXbZa?o4mwh=08E zXyiB93n#&-JyFHBXOh8YwHCksNkx$&TU;C9O)9EEnRnIsI$nFwz%s5Wr%fYCQCK-# zB3W|!ojAxS>vcqt;Lo-*Ksc&t`l$Q`zgbGU9Dt28xA@KL zgW*Ty?8hZTHGg;us`k{tO#iGter+FB`Qzj!AgxgXPlrn)UN3!7zI^ZIZOO*RpqfUv0AK*u zY*3#Cl=QZ#x&?})UYpg1fOH10a?S|<10#^tOnBp#ioX3`(8yc->Y_{-?FF@h6Ylxj z>)r78dG>E?apw|Qm4;H&JqBh`N^rs ziytQjs`7v5``9O=oBEZ|SAv*j`xA=ZI!5{S+*y4v|?%91^k@Tk0#PJI&J+% z;hAWvCegWL#Q{|i3cDjWCC9PgsKaB57QWEHnlV?4Ob{dY%AbOKu2#%#ilWRp(_kj8=75aCQ2LTv~fKA2l78Oicc?#%PBta{Rzb^+2R3Zl6i8I-y zy4fzN%mXEzROlYmfyB`ao(AvO zsFPGty%?ZExH;_4stNZYYY1iMdaCh?PoZP3r*Pybk?q1E@Usg$df=qzUEx0AG|E`b z>%PA%X>`xs#0YQvCRfbOI$%!I-S@vdchB9DQs+RiK?)u@Op4NPC(1Afn+wc?@w14h zpP1~$EY-u8nLb*QvXw!C$R-GkR%?%uzi;dU8v(C}m{a`jyfpPzjzXNSKgf65n0X~` z-(cPjh-fvZCD*)guHrbMxbJW?+ZG|fB{5@K)YNJ6sy#1Y(<-gIZ zs%SLL07eM;}8!*>W4ilsTAlWG@O?CmYvCS)z&b zM$8jUBy%1flZbD3>$z>?{)^>mvpJ?$HL~~=Iy<^YaH?7V+if<}OIBp*77=8rQNo)7 zP?Nb-JrvZ(+|&i!c1?cv_Rc1GK=GkG^@PePnniep9ttv_M;@|a0x!iJ@G%AN(Z_KAT3dm~suFK#n z=Lpf4+VGOae@on=W_!&A0vP~^m%Gk0izgBRAB(L$YxN@!zugXQ>e3mVhJF01e^wNLB5a(&xdm!lLY#mA!!(YRjnf+#zovI}ByD3?&>oFKM>CL4>vo}+4 z5?x0DArZy-GI5Iz;k}!BOm0bG_#;)jud`{}>s}0=jx%=FJvQwMXl>r&HTaxK z)8_KcjCPLE>-pyr1!>b*Za*s?V`8Px(i+4-A1efg`%HN_%d~))=sJw%wrj!eAl>X> zOyzAsr~55_Z6fN!p`eo9-u3*dbX{F_@|`z)mzKD<@|4g5ZpmRBO6^ zrNA}bM&yez5AR8RCX$;bMGoA^A@p;iA`A6q@#|_}gYivyv;xSNwVCc)g^ZA4cfNX< z3+%rXvcX|ACZir3`g^TyJnDJ%V4h63G=~e`jV?(S<1l9%56^2w<&N^hizlWqTr$5sl#1gb6Ecv~ASQjzFk*aM75&V&F)NhxZnjF{^v0m5K=Rrw zB8QR6u54+zK)c8PJv4XPuIKKTv(*5vj7Sj)-||Zu9_kix7Ad|@-lIDSCT8oiA>nW# z2Ns8fvdN<6s++!M(vi*8$HN0Hs2Nr-VG5{Tom&7r9upMtWsrDQFf%d~wPM_6|0*7t zaIAk1ywe=mBmVDkN9m%!5YR}%*f3?yO28kpNoj!+5*CF#{CsrNKtpShZ}H5!B6%dhOb`ADZ0HR7^Cq}kI%n)1 ztEH8i#p18$?!Rai_ymWS?S_6-)Nm-P@p|N$&xEa8KK;2q&2pj5=iT?S^p2Y^Da1L) z^>19y-#yb%O9T+>0WMCZ^rpfjQwCZXIS)KMRLF?Q0fVU`z7ByjwG2wS2VKv(D;_7& zBB6msuqqAO1NBvQTVzi17!uXJp~&@7=P)54%Y1F+ zvtNHAX`OA5PA!9(J46tAnxwyV+m3|$_v|NdqZ3R9Y~Ov|O0trUDR{8Y+VIk6*{una zZ(jkddge8z*Q5nf=8~W}K!^Gxe|)KN6N{znSo-~2;?WF!xdNX>hshgY3;hX1wA8Rc zBmk+H{^TJA3}*q-55IB~@2R8UX!?AV`-zGOq>5#{`gW6AfC>i9{BXFwe$OxkBAiL4 ze)eXXJlsiyTIGNT8#i&=f6c&j*dU>=(aMoF5R?ePBq_%F=lgLzZms(pzJA0z{)shm z)~kkti3TrNxWuv>r9kjy@ODTlJK9 zEOTf^5q7Y;N#!FzeU>!`ic3|KWV)Pem`#C*U*uG*kJs88C;N$=-n6!wlJ}j$DIh6jtIfQ= z{lTbXSyqUE;;sIF<`JZ^*)P9>@B_`9iY4a~_kPVVD}W9&5rwt}mt?XXI<5_3P1|V) zGW89cPD%H`7XISSGX4*W6wwcZ?)_$%xzy^sk1?zp9zMfzfUaC63S4IxCm07D|GVmF z|KC-owK(~Hp8osR=*&rdT4M2;2Vz9(wMW<;DR6OAf`2Arb-OD$+I_?zMx6Cyt=F^+ zfT32I@i}HCK0Yb!y8Sb9X1D+wDI56*7TVx8UzVsadvThVYqJ;lI=Tz71Xa^HCLgD5 zSUcgNu#fHkhADrfA8af@MnBR_ECxAs)s_LjXi{grv%_vM8DRLCv=RJU1LZxIOzc$` zr}-usW}TcfHimX5eVm-!LQ8`vAkA`*t!ewcdNXv=8mlAymvBHT;Gu9U$HG7&2O~2< z*^%+etyB$44B}{6-GcEyWC8yt1jrf-yzHM5R&uf%r@~9Q-}3FMe834rVWp&ahCpHg zOfejnd6ZnYNX9ac(fd|{Hh>2!*}v=2EiY#sQ|DQIwN#{Iq(WYtMuzuqbsID2^tLQ2OLM98!u`-r{*9b(>VNg}1UY%BH{Q zqT|+bn4!arWKt`=8iz_42K1v#ily0PGWr*pil*Ymw-qy==o+8NfbOV}=HDv0&ub?B zEr)oFIsZGxA=mUn1g;70Zc}B=j~$yn5mg)RR~4|{!CXi z8A;_X8}!B9=5@I(?p}_6J0(BgK2>6wpGhVFDAsRC#e6DUM+0D_P4%66`|p*1(Fh%; zNYBK`09se_8bN{#M>G8}>6YbTKj{+!B;JcXGuysA5`JWxy47(Sn4(<6>bsc;prpI4 z&(qhaTc7eCfc|U}Rq{kpoPyX<0UhB!044x~#X_knagCZFYJzT4dTh$Tn!H~RGFR@a zG{svO^LWfgSi2n0`X~PhJNXKb7u~qqH%$LL{*10$aF9w4B{JYLYt)xQ1=`F+2Wd3Vpc z06kH1pU5t$=Q2}6KnM`8jTeds&o9hRU;Trpw(mVr^WV*~`rB9ivGTms{#S7~wx*Su z;M-&Da|pui6}<6(r!jN;wLkc;;4kGFn=CWEwYE7TwI+9h<5i_TPn9qs9TLI5k! zxCrbpx|7Nt@kT||t@tQ9TZv1R&N>Blzc&#D@-?x}=;QXN%_0`=Oe>vQ|JbNJ&orsk z;?2i6GX()*A+^uOi7?LxQCFZ;4&&KPyW+Dw{?4?57tn!;7VC_h32!QFVFov#rJA`# z#B45+=<_Wts7WAjCc+(}L*_f}M}*&%xqPjqS!<+qcve2qwO!UHG&A|QLESln)IcYz zhDZ$%ib>GTucdSVFlJB~Fv&RHbdjvYD}c;|h6wNH_*q*^6&v0_RonjIw`H|N zP5VDqLTFFp|8D)9%tatia_wB0fkfn#dlFcIgf>>H(Fzm0&o-61&#GcFY?Wjo$sd#l z6tdvW%|DPwj+_gijESfp61im$Oi_dSqIgY&Y0N7U~2~6MfWW|b&4W(ipaNC z-JFo9H*qoT9@IGbjP#oNt!NIi5=GZlA z9E-pcNl9$Bh+bqoYckCPtv9F6_E(Z$f{8)OpytGB!F90H4saqH3|SW2NHyovZ_S$! z+4=Nk4aN%YZ;JB9ure9L-5TvDiNG?agiJ65gCr587^NeS(kXcXFJ!?EQr&(k07^pq zga|VD(Uc^Gn)<^;Au|mOk3T%ctl29&8{R&=N@Czx#}|-ht2;}!Iq=c@jXx>QwmDs} z^+qf`#CLIyy^VWRn#X(#KUoz&r+-^MFl9@pN}$m*A3(pwcJb!@Zt8R~^Jg>@FcoZF zRwM_)#0C5SrDH0Y@Y=b#trS$a#g2Lv6|rPYO5=u8ln#>-qLM~K1(p==|1-Z=j=^n1 zZ#l*(Y3=7R>p%Va;)E?r>Id7KmOJc5#9mel`h?4&GL&?hwYCsfRYni=SPNcx$6NS0 zPN%fJ)DE-w5>o~vHcO457h7ZUU@rQ$zgD)4O;kZ7R3w@mr%@j8WeLk~-venN>uRLL zsfl;nyT|I%W9gop?ONx>Mm1^v3EK)Fs#dXfj02y3#7`?rY1h=7qc?+`-()`)U!9yb zV)RS>ZvY+8iXftgUhDr1Yi*kZOpF;3!QyU{1zguDB8T3YPSTC~^^Gc=b?y=1w`tkp^mb#87mYP$_A_B-!)GZ)6wNY9i?gPjL zASu)kGQ{&KIbk!dqfk~cMV%Z`@czjlzhZVhT>a({dD!m+BWGS8rK^0uGI7P*MCGT3 zL^%x{oswSM-1{XgInS=ikdJ6XA&TD$I$y*fcwvSCZmwc@O0EzPR$b@ttH7 zQ(oj;S3VOZw1{44g8A@fS`B%}DiP4@<*-i_u_|N;5J!J_DEgq}r^bnt)gLSL4X7IG zljMn$ly!F?=Mst_UUl*GgjtmmRK|w~2ClRDh zWG)QNmd!Ddfml5Ipc?!+fSTDU;iy3T?M^n)Zwhm3py{xf5pxgtSQug zGxP$j!b6=X0D$lsV3mMu@P$`Zf#~A}mSmnd>Y7aAR97*&<$~So0kb629e5Hz3_(o* z*4#j73P_H9j-%`}wqDm|K9c(0WF~?U&%Tcb%=JYGlb)jKtn1lQP+{Yy7G`nK`NjQbPnW*TfPEicm5NjeV>-*FfaOcD)jOuA;-9*U z5v6jB!?0W|Wm-{h0pHHDn%k)m;@c)IkQ6{=!@!w}&22QGS_Ytou$mfJ$YPJyJ|a60 zW3v~Kp9pvRIp9nnF$y(vBxD{cs0iJ$i96phY`Tgj*C;xGi`0TGnnqw%_;6$Z$_gXHe^@3V4xKP2pu-p!o6PC{}8p`cA50=^v8cddtfE_Imt@a zJ|z+K`tAMgZ#M9k-D%`bL5*sE!GtRMLF!JSB~Ud8CHD2caivQ-2VS=>dGx{i@-#IO z>y6w)X-a^|jM@@>TaB!GEkFaDEpxR#x*xZev1(DMfj1 zJ1kkWsWGlwb!)4p;lg1f);ev=50obe7EGUQskVsqspRWJ#;M~QLqnRrZ&L@;jg z`!n-?@9*V{BlrfseXwnX5~BbbhCws4xBOS?WB(* z&woAI8pPbMYE*TKWuN^;ZFKOlb@WHuS^B5N-BYE_gp{Xm4EKCve|sp_ZsJnyfOer zWC#YDRpG$57R$<8=!PJ@tL#An(>3F)k_E^z!MunfiU~Y7+h)kAwN7*1==)MGTv2-2 zktx&uC>YOJLInZPAd7D4A^@!^uMaAp0-~FzEvTf(AP76(Ve7#ga`c!a=I?|09i+!A zPXKJNCkU*i3vLguAw-&{qPLc{temZZ*kI>Yh=}skR35R>%!lYR zP$4)6sByusPR-b45xoQX{a=Vf`D}BnxUtfF(glf`2N~%v3IOZ1&{{%Ui35kwLBIbm zJZ)hJo`Z@Z@h$aoz)(*D{L7P({z?189oQq*+C1nB1-%eI@EOO)D-a12V$}TmaWfBX zxK8|ykve1BfeYmc{&$efK&yWV(ecdd7=@1LTWV<#;v>7FUL9G|$l6Hmi#5dDx1F!T zT8L1#?MsHz-I?yIaX%KGpuqPB5X)WH`ny|w~Ecmp<7twxvFxfV-Y;mUq3l>XXEN8*ZSa7_T3g`Ia@hvwtdCop?=}5pL*mf_yNvBXGwUBr)(BA=q1fsIBa7XJH2q#S zp?ANB21oMv>cr=`kLLdv?bAcPbnmc>&z0Q%8nFnivTV)tDpM(ay=LH%wUv_q{!1CA z@V8I9cEh@bWS`})QG%AIt=!V?=F6PP3ZE}waW7OPlRKi4J7kawbu8jfTQb%k}PT)orFrxmpF zYB4O5b~F$!mGj-d!u^H2;Mb)*MOrU^0psXLqCd%00pd!5@k_-5V^s;W>dNw8SmyNJ zXG9|BJ8xEb0Tf!2{)Ieu)xn&ig9S>-N2gxCWV){)f{-V_7K#$*ft<=$@e3zTD3W`V zcU;cBjLOx>h|23_?hNqG6F%&wgC~2pEHrviN+z|Ow7rjat6nUOp&;#9r9obZbQc43 zr;?27DWB~c*ioZHw>0LP_SMna(2hT(m2}BWvLH&|j#RMD!S?b>!4+K@AB}}f+ z$CQYJ0h%T85EcRi z5~HGofl?(>p7x4V62M0{aAE>$l>jm;*CM3yxw0f?Z5t@d4q%91fn`WF!ER*zMk!J% zxeBZ1lgk3?0Zt10nE2(SlnnF$OUgblv(Pk-aRA?bm?@sd45s+`lc!6N0u-y2|!A4E1RYiCb$o@Xp= zBXyuNnbhg4qS@!^NQWC6@&rB}79d-O-}m|0qb$>etF`YyD}c$w5{B#odojV%eFW%7 z6wiIWI%eN(MoWG#+Acd<8VO;v14GNz71i3-W{>&DC9Yg&irbd0@H$&}ik)l-FkdRR zVMYGhm)c0le~;OewRZf!G8s&5v|-c1zaA3CA&@xBa zY+#>UsWX6~v(snxkbA^Y=q-wz4O8<>lID+n?2C2m1--DXI-DN*;H~T^n3cjYls22w8F~ z=&Yf4igLXXGo2TrPIRWlgSLJS1xJPx)TMeqA3emrv^$TTyvko1i+mbM=q9jUfvy-g z5H~)_P!~t57!($t9)=MLwQPNDg(hCB-e8>Lg8eS+dt0WqlN26L)r(sFK|1^Fhr9gH zgTF*GednJ=^}I0E)qgYu`2CNu|4f{Sg{mxDR;X~TK@5)>;TguD>gfQ+d?W3jkGFYy zL*~d{kPY& z=;OHOgJ;wtBWgSEBjxfQ)?|)Jj;1L`+V@Zpdry!6n$4KrhSm@rdvzk&j$JEKw5o9V z8Au+0ZWjx6>=vnUn(nn1R^U6P9okB;``ffa1YAe@s4EwzbyCK=&pe#^H$A^9^z?G< zWbItFW0BF0KC%mt+9lZM)`-{_PZ#x_ntw5H*}XV_biS(^zq~Zb*n4&968ZEx&W$&M zZ1pOu3gt7;jyLuZXK6F4CL`95>JHNg>3u}L=Kr*J_5VzFecV%-$mS9$^H45PDJ3*9 zrbN1KR$=5Jm1Kmbh>ARv+!~YeP?zF%xjj|P!y=n(B9zElgqeq-SlB#V8`ie#tk?C! zecyk={qp_goY(7f&gb(w@AE#N@9XtBpL5PGqfOg03&cCJZ1W195bJSqrDT1%q@(xciRTkh*|nYiMoZRp&6>z+ zJTbOW#1U|3gT5_BL>;YEl%=2Xg}z2!zFg1sMf15`qR-4lWVjGyC+t!>*jaSyx(>fc9{%B65~ju=)m+Kpv{jlf^at}n*6s!?r4PAH`#!ob zYPcwag~Q2axIHi$oi;1%S!nXnPbg|);`H^v<^G97LbN?o9&uyCp`GsYso)rQa1aH=#W` zGNr0i6Q^a~AE>hB>s=LHwq;Hu-@(P~SOhmS&^8}y@#dZIAy{f0^lLTFrx9sLA^v;j zGDn?uGWMGCO(aW`_x$}(NLYQ9x&9~cK2=yR`J927Z%Iyx-s6YUju)WO23Z0uwymd> z(p<<_ss_fD_6Hz3WTY&UCylFro{=H^a-jqFXu=C%HqmbZw?Im*+*k^bahj%Q6l%oP z(q2;pLr?jXYcLE(+br_fh^iLf^)~=fRt{_H*6i)l+V&%*)4{+cFbFQW7uVsk_9C|o zW~xXfD$h&Aj{pUSzmBDWLunHh^JR)!J3_|ATfFiH_J)mYeY0?l7zN?Qw99i`S<6fF&x|2*2irl@do*0A! zotx^X-w@Z-cHAvS;v$ibOJk9@)FBMDpvw`(tyCL$t6Pr78eOcys%>h!L zt^JocNs2KUyTKeg+h1+)?m@Bc;FRqt^DEtSrxuM;VISzbAh3?jF!-dl^>^=(8(de4%fDzyd2&QImO*Lq);o~Pom~oi}xBfW#5X6uhP_PYM@nVw_y>4 zO6^u6_ZG8}rYe}~3uK-{7H@@lWgjF-3J!5DS6;*i%RjGCkfW#}bPHPX@4lxff1BqS zub#z@p>Pi+X+7yVXF*=paG=rp?3 z*}E{deQus%$GzIC>Nc(b`Bga*>ffoGbJgEU{*b`%((aKQRD3#J(NQ!a7QZhJ@LB9S z<04^IwF}et67rXW(ak6Mq+TObf{d)30tBZ2cg1~|KH^yQH(3Y|>wFxWU)} literal 0 HcmV?d00001 diff --git a/Documentation/resources/nsattributedstring_to_html.png b/Documentation/resources/nsattributedstring_to_html.png new file mode 100644 index 0000000000000000000000000000000000000000..e68a0c04c612fe9c67c829f1dad6295e6043584a GIT binary patch literal 37398 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 Date: Wed, 18 Nov 2020 10:33:41 +0000 Subject: [PATCH 08/28] Update Documentation/Architecture.md Co-authored-by: etoledom --- Documentation/Architecture.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Documentation/Architecture.md b/Documentation/Architecture.md index 8e1eb86ea..03279d640 100644 --- a/Documentation/Architecture.md +++ b/Documentation/Architecture.md @@ -45,7 +45,7 @@ The following "ensure..." methods handle all these scenarios: - [ensureInsertionOfEndOfLine](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/TextView.swift#L697) - [evaluateRemovalOfSingleLineParagraphAttributesAfterSelectionChange](https://github.com/wordpress-mobile/AztecEditor-iOS/blob/develop/Aztec/Classes/TextKit/TextView.swift#L1884) -These methods check if you and adding or removing new paragraphs around lists or quotes and update the attributes accordingly. +These methods check if you are adding or removing new paragraphs around lists or quotes and update the attributes accordingly. # Presentation of the custom attributes @@ -99,4 +99,3 @@ We then use the `HTMLSerializer` to convert the DOM Tree to an HTML string. - From 2748a545ad8a1ce1fbff51f81c3194fcacb7b312 Mon Sep 17 00:00:00 2001 From: Lorenzo Mattei Date: Mon, 23 Nov 2020 11:57:23 +0100 Subject: [PATCH 09/28] Update wording --- Documentation/ReleaseProcess.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/Documentation/ReleaseProcess.md b/Documentation/ReleaseProcess.md index 5b1747157..38219be81 100644 --- a/Documentation/ReleaseProcess.md +++ b/Documentation/ReleaseProcess.md @@ -6,7 +6,7 @@ The branch structure in Aztec iOS is based on the [Git Flow](https://nvie.com/po These are the main branches involved in the release process: ``` -master: Kept up to date with the latest release. +trunk: Kept up to date with the latest release. develop: Bleeding edge branch with all of the latest changes. release/x.y.z: Version branch, which we will use during the release process. ``` @@ -29,7 +29,7 @@ WordPress-Aztec-iOS.podspec WordPress-Editor-iOS.podespec ``` -Open a PR on github where you target the `master` branch with the `release/x.y.z` branch and call it `Release x.y.z` +Open a PR on github where you target the `trunk` branch with the `release/x.y.z` branch and call it `Release x.y.z` ### Step 2: Testing the Integration ### @@ -49,13 +49,13 @@ The things we want to look out for are: ### Step 3: Merge the branch ### -If the release PR is approved and all is working correctly in WP-iOS merge the release branch to master. +If the release PR is approved and all is working correctly in WP-iOS merge the release branch to trunk. ### Step 4: Push the POD. ### *Automated Process* -Create a new release on Github targetting the master branch and name it `Release x.y.z` +Create a new release on Github targetting the trunk branch and name it `Release x.y.z` Set a tag with the value `x.y.z` . @@ -63,7 +63,7 @@ On the description field and the content of the changelog for this version Press the `Publish release` button -At this moment the CI automation should notice your tag and after some minutes you should get the new pod publish on CocoaPods master trunk. +At this moment the CI automation should notice your tag and after some minutes you should get the new pod publish on CocoaPods. If this for some reason fails chech the manual process bellow @@ -103,10 +103,10 @@ Once renamed, you can create a new “Next Stable” milestone and assign all pe At this point you’re ready to close the version milestone in GitHub. -### Step 6: Merge Master to develop ### +### Step 6: Merge Trunk to develop ### -Following the git Flow methodology you now need to merge the master branch back to develop. +Following the git Flow methodology you now need to merge the trunk branch back to develop. -Create a new PR in GitHub that targets `develop` with the master branch. +Create a new PR in GitHub that targets `develop` with the trunk branch. After review, if all is ok, merge that PR and your work is done. From 75871adec008aae63659d35aaff87e8998ff2ef3 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Wed, 30 Dec 2020 12:28:02 +0000 Subject: [PATCH 10/28] Add script to fix carthage build for Xcode 12. --- Example/carthage.sh | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100755 Example/carthage.sh diff --git a/Example/carthage.sh b/Example/carthage.sh new file mode 100755 index 000000000..adffae883 --- /dev/null +++ b/Example/carthage.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +# carthage.sh +# Usage example: ./carthage.sh build --platform iOS + +set -euo pipefail + +xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) +trap 'rm -f "$xcconfig"' INT TERM HUP EXIT + +# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise +# the build will fail on lipo due to duplicate architectures. +echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig +echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig + +export XCODE_XCCONFIG_FILE="$xcconfig" +carthage "$@" From 8f2ba17af9a3d61ba8a110776f9ec7df25275ac5 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Wed, 30 Dec 2020 12:28:27 +0000 Subject: [PATCH 11/28] Fix project settings for Xcode 12 to be able to import Gridicon.framework --- Example/AztecExample.xcodeproj/project.pbxproj | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Example/AztecExample.xcodeproj/project.pbxproj b/Example/AztecExample.xcodeproj/project.pbxproj index a76700b52..8ed52f936 100644 --- a/Example/AztecExample.xcodeproj/project.pbxproj +++ b/Example/AztecExample.xcodeproj/project.pbxproj @@ -614,6 +614,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Onone"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; + VALIDATE_WORKSPACE = YES; }; name = Debug; }; @@ -667,6 +668,7 @@ SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; VALIDATE_PRODUCT = YES; + VALIDATE_WORKSPACE = YES; }; name = Release; }; @@ -829,6 +831,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; + VALIDATE_WORKSPACE = YES; }; name = Profiling; }; @@ -912,6 +915,7 @@ SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; SWIFT_SWIFT3_OBJC_INFERENCE = Off; SWIFT_VERSION = 4.0; + VALIDATE_WORKSPACE = YES; }; name = "Release-Alpha"; }; From 73f13175c20c19d45c2b4841b08be939c1b9e84b Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Wed, 30 Dec 2020 12:30:37 +0000 Subject: [PATCH 12/28] Update readme to refer to carthage script on Xcode 12. --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index e27e6d3e1..a6797e0bb 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,13 @@ cd Example carthage update --platform iOS ``` +*If using XCode 12 use the follow script:* + +```bash +cd Example +./carthage.sh update --platform iOS +``` + Once Carthage finishes, you should open the file `Aztec.xcworkspace` from the root directory of Aztec. Make sure the `AztecExample` target it selected, and press CMD + R to run it. From cfb4bc8f09a5ec96fa97cafeafe89fd15db361d9 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Mon, 4 Jan 2021 16:27:13 +0000 Subject: [PATCH 13/28] Add reference to source of script. --- Example/carthage.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/Example/carthage.sh b/Example/carthage.sh index adffae883..41de89f1a 100755 --- a/Example/carthage.sh +++ b/Example/carthage.sh @@ -2,6 +2,7 @@ # carthage.sh # Usage example: ./carthage.sh build --platform iOS +# This script was copied from here: https://github.com/Carthage/Carthage/issues/3019#issuecomment-665136323 set -euo pipefail From d8cf065acf625a1413f8a531a32aa74a115926e6 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Thu, 7 Jan 2021 14:23:33 +0000 Subject: [PATCH 14/28] Replace Gridicons with SFSymbols. --- .../AztecExample.xcodeproj/project.pbxproj | 14 ++--- Example/Example/EditorDemoController.swift | 54 +++++++++---------- Example/Example/MediaInserter.swift | 3 +- .../TextViewAttachmentDelegateProvider.swift | 9 ++-- 4 files changed, 33 insertions(+), 47 deletions(-) diff --git a/Example/AztecExample.xcodeproj/project.pbxproj b/Example/AztecExample.xcodeproj/project.pbxproj index 8ed52f936..a5a55f32c 100644 --- a/Example/AztecExample.xcodeproj/project.pbxproj +++ b/Example/AztecExample.xcodeproj/project.pbxproj @@ -10,9 +10,7 @@ 59280F2A1D47CAF40083FB59 /* content.html in Resources */ = {isa = PBXBuildFile; fileRef = 59280F281D47CAF40083FB59 /* content.html */; }; 59280F2B1D47CAF40083FB59 /* SampleText.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 59280F291D47CAF40083FB59 /* SampleText.rtf */; }; 592D62C91D8DF5590013EFF7 /* Aztec.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 599F25771D8BD045002871D6 /* Aztec.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 596719401D8BC60D00F18F7F /* Gridicons.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5967193D1D8BC60D00F18F7F /* Gridicons.framework */; }; 599F25701D8BCF57002871D6 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 599F256F1D8BCF57002871D6 /* AppDelegate.swift */; }; - 599F25861D8BD998002871D6 /* Gridicons.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5967193D1D8BC60D00F18F7F /* Gridicons.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; 59D2873B1D8C599B00B99C80 /* AttachmentDetailsViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 59D287391D8C599B00B99C80 /* AttachmentDetailsViewController.swift */; }; 607FACD81AFB9204008FA782 /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 607FACD71AFB9204008FA782 /* ViewController.swift */; }; 607FACDB1AFB9204008FA782 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 607FACD91AFB9204008FA782 /* Main.storyboard */; }; @@ -121,7 +119,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 599F25861D8BD998002871D6 /* Gridicons.framework in CopyFiles */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -130,7 +127,6 @@ /* Begin PBXFileReference section */ 59280F281D47CAF40083FB59 /* content.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = content.html; sourceTree = ""; }; 59280F291D47CAF40083FB59 /* SampleText.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = SampleText.rtf; sourceTree = ""; }; - 5967193D1D8BC60D00F18F7F /* Gridicons.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Gridicons.framework; path = Carthage/Build/iOS/Gridicons.framework; sourceTree = ""; }; 599F256F1D8BCF57002871D6 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 599F25711D8BD044002871D6 /* Aztec.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Aztec.xcodeproj; path = ../Aztec.xcodeproj; sourceTree = ""; }; 59D287391D8C599B00B99C80 /* AttachmentDetailsViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AttachmentDetailsViewController.swift; sourceTree = ""; }; @@ -178,7 +174,6 @@ buildActionMask = 2147483647; files = ( F1D3610A20929EF700B4E7A5 /* Aztec.framework in Frameworks */, - 596719401D8BC60D00F18F7F /* Gridicons.framework in Frameworks */, F1D3610B20929F0200B4E7A5 /* WordPressEditor.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -198,7 +193,6 @@ isa = PBXGroup; children = ( F122C2502072AE190018ED06 /* libxml2.tbd */, - 5967193D1D8BC60D00F18F7F /* Gridicons.framework */, ); name = Frameworks; sourceTree = ""; @@ -606,7 +600,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /usr/include/libxml2; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -660,7 +654,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /usr/include/libxml2; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; STRIP_INSTALLED_PRODUCT = NO; @@ -823,7 +817,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /usr/include/libxml2; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = NO; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -907,7 +901,7 @@ GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; HEADER_SEARCH_PATHS = /usr/include/libxml2; - IPHONEOS_DEPLOYMENT_TARGET = 11.0; + IPHONEOS_DEPLOYMENT_TARGET = 13.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; diff --git a/Example/Example/EditorDemoController.swift b/Example/Example/EditorDemoController.swift index 792e6771e..ab03bfb79 100644 --- a/Example/Example/EditorDemoController.swift +++ b/Example/Example/EditorDemoController.swift @@ -1,6 +1,5 @@ import Aztec import Foundation -import Gridicons import MobileCoreServices import Photos import UIKit @@ -998,7 +997,7 @@ extension EditorDemoController { toolbar.dividerTintColor = .gray } - toolbar.overflowToggleIcon = .gridicon(.ellipsis) + toolbar.overflowToggleIcon = UIImage.init(systemName: "ellipsis")! toolbar.frame = CGRect(x: 0, y: 0, width: view.frame.width, height: 44.0) toolbar.autoresizingMask = [ .flexibleHeight ] toolbar.formatter = self @@ -1108,10 +1107,10 @@ extension EditorDemoController { static var tintedMissingImage: UIImage = { if #available(iOS 13.0, *) { - return UIImage.gridicon(.image).withTintColor(.label) + return UIImage.init(systemName: "photo")!.withTintColor(.label) } else { // Fallback on earlier versions - return .gridicon(.image) + return UIImage.init(systemName: "photo")! } }() @@ -1142,55 +1141,50 @@ extension FormattingIdentifier { switch(self) { case .media: - return gridicon(.addOutline) + return UIImage.init(systemName: "plus.circle")! case .p: - return gridicon(.heading) + return UIImage.init(systemName: "textformat.size")! case .bold: - return gridicon(.bold) + return UIImage.init(systemName: "bold")! case .italic: - return gridicon(.italic) + return UIImage.init(systemName: "italic")! case .underline: - return gridicon(.underline) + return UIImage.init(systemName: "underline")! case .strikethrough: - return gridicon(.strikethrough) + return UIImage.init(systemName: "strikethrough")! case .blockquote: - return gridicon(.quote) + return UIImage.init(systemName: "text.quote")! case .orderedlist: - return gridicon(.listOrdered) + return UIImage.init(systemName: "list.number")! case .unorderedlist: - return gridicon(.listUnordered) + return UIImage.init(systemName: "list.bullet")! case .link: - return gridicon(.link) + return UIImage.init(systemName: "link")! case .horizontalruler: - return gridicon(.minusSmall) + return UIImage.init(systemName: "minus")! case .sourcecode: - return gridicon(.code) + return UIImage.init(systemName: "chevron.left.slash.chevron.right")! case .more: - return gridicon(.readMore) + return UIImage.init(systemName: "ellipsis")! case .header1: - return gridicon(.headingH1) + return UIImage.init(systemName: "textformat.size")! case .header2: - return gridicon(.headingH2) + return UIImage.init(systemName: "textformat.size")! case .header3: - return gridicon(.headingH3) + return UIImage.init(systemName: "textformat.size")! case .header4: - return gridicon(.headingH4) + return UIImage.init(systemName: "textformat.size")! case .header5: - return gridicon(.headingH5) + return UIImage.init(systemName: "textformat.size")! case .header6: - return gridicon(.headingH6) + return UIImage.init(systemName: "textformat.size")! case .code: - return gridicon(.posts) + return UIImage.init(systemName: "textbox")! default: - return gridicon(.help) + return UIImage.init(systemName: "info")! } } - private func gridicon(_ gridiconType: GridiconType) -> UIImage { - let size = EditorDemoController.Constants.formatBarIconSize - return .gridicon(gridiconType, size: size) - } - var accessibilityIdentifier: String { switch(self) { case .media: diff --git a/Example/Example/MediaInserter.swift b/Example/Example/MediaInserter.swift index 69a102a93..e18b8a510 100644 --- a/Example/Example/MediaInserter.swift +++ b/Example/Example/MediaInserter.swift @@ -2,7 +2,6 @@ import Foundation import UIKit import Aztec import AVFoundation -import Gridicons class MediaInserter { @@ -71,7 +70,7 @@ class MediaInserter timer.invalidate() let message = NSAttributedString(string: "Upload failed!", attributes: attachmentTextAttributes) attachment.message = message - attachment.overlayImage = .gridicon(.refresh) + attachment.overlayImage = UIImage.init(systemName: "arrow.clockwise") } if progress.fractionCompleted >= 1 { timer.invalidate() diff --git a/Example/Example/TextViewAttachmentDelegateProvider.swift b/Example/Example/TextViewAttachmentDelegateProvider.swift index d61f382a0..feb504b88 100644 --- a/Example/Example/TextViewAttachmentDelegateProvider.swift +++ b/Example/Example/TextViewAttachmentDelegateProvider.swift @@ -1,7 +1,6 @@ import Foundation import Aztec import UIKit -import Gridicons import AVFoundation import AVKit @@ -48,11 +47,11 @@ class TextViewAttachmentDelegateProvider: NSObject, TextViewAttachmentDelegate { var placeholderImage: UIImage switch attachment { case _ as ImageAttachment: - placeholderImage = .gridicon(.image, size: imageSize) + placeholderImage = UIImage.init(systemName: "photo")! case _ as VideoAttachment: - placeholderImage = .gridicon(.video, size: imageSize) + placeholderImage = UIImage.init(systemName: "video")! default: - placeholderImage = .gridicon(.attachment, size: imageSize) + placeholderImage = UIImage.init(systemName: "paperclip")! } if #available(iOS 13.0, *) { placeholderImage = placeholderImage.withTintColor(.label) @@ -106,7 +105,7 @@ class TextViewAttachmentDelegateProvider: NSObject, TextViewAttachmentDelegate { let message = NSLocalizedString("Options", comment: "Options to show when tapping on a media object on the post/page editor.") attachment.message = NSAttributedString(string: message, attributes: attachmentTextAttributes) } - attachment.overlayImage = UIImage.gridicon(.pencil, size: CGSize(width: 32.0, height: 32.0)).withRenderingMode(.alwaysTemplate) + attachment.overlayImage = UIImage.init(systemName: "square.and.pencil")!.withRenderingMode(.alwaysTemplate) textView.refresh(attachment) currentSelectedAttachment = attachment } From 443cd58b9abb2d4faf4610ae03333ef276be5f43 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Thu, 7 Jan 2021 14:30:03 +0000 Subject: [PATCH 15/28] Remove carthage references. --- .circleci/config.yml | 2 - Aztec.xcodeproj/project.pbxproj | 93 --------------------------------- Example/Cartfile.private | 1 - Example/Cartfile.resolved | 1 - Example/carthage.sh | 18 ------- Scripts/carthage_script.sh | 7 --- 6 files changed, 122 deletions(-) delete mode 100644 Example/Cartfile.private delete mode 100644 Example/Cartfile.resolved delete mode 100755 Example/carthage.sh delete mode 100755 Scripts/carthage_script.sh diff --git a/.circleci/config.yml b/.circleci/config.yml index 0c0a10cfd..69a532a2e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,8 +10,6 @@ workflows: - ios/test: name: Test xcode-version: "11.0" - carthage-update: true - carthage-working-directory: Example bundle-install: false pod-install: false workspace: Aztec.xcworkspace diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj index ea4ec9c1a..1891e141b 100644 --- a/Aztec.xcodeproj/project.pbxproj +++ b/Aztec.xcodeproj/project.pbxproj @@ -264,13 +264,6 @@ remoteGlobalIDString = 5951CB8D1D8BC93600E1866F; remoteInfo = Aztec; }; - E8CE3F041F213AD0003254AB /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 5951CB851D8BC93600E1866F /* Project object */; - proxyType = 1; - remoteGlobalIDString = E8CE3EFE1F213AAA003254AB; - remoteInfo = "Carthage Update"; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -1415,23 +1408,6 @@ }; /* End PBXHeadersBuildPhase section */ -/* Begin PBXLegacyTarget section */ - E8CE3EFE1F213AAA003254AB /* Carthage Update */ = { - isa = PBXLegacyTarget; - buildArgumentsString = "$(ACTION)"; - buildConfigurationList = E8CE3F031F213AAA003254AB /* Build configuration list for PBXLegacyTarget "Carthage Update" */; - buildPhases = ( - ); - buildToolPath = "${PROJECT_DIR}/Scripts/carthage_script.sh"; - buildWorkingDirectory = ""; - dependencies = ( - ); - name = "Carthage Update"; - passBuildSettingsInEnvironment = 1; - productName = "Carthage Update"; - }; -/* End PBXLegacyTarget section */ - /* Begin PBXNativeTarget section */ 5951CB8D1D8BC93600E1866F /* Aztec */ = { isa = PBXNativeTarget; @@ -1445,7 +1421,6 @@ buildRules = ( ); dependencies = ( - E8CE3F051F213AD0003254AB /* PBXTargetDependency */, ); name = Aztec; productName = Aztec; @@ -1492,10 +1467,6 @@ LastSwiftMigration = 1100; ProvisioningStyle = Automatic; }; - E8CE3EFE1F213AAA003254AB = { - CreatedOnToolsVersion = 8.3.3; - ProvisioningStyle = Automatic; - }; }; }; buildConfigurationList = 5951CB881D8BC93600E1866F /* Build configuration list for PBXProject "Aztec" */; @@ -1513,7 +1484,6 @@ targets = ( 5951CB8D1D8BC93600E1866F /* Aztec */, 5951CB961D8BC93600E1866F /* AztecTests */, - E8CE3EFE1F213AAA003254AB /* Carthage Update */, ); }; /* End PBXProject section */ @@ -1803,11 +1773,6 @@ target = 5951CB8D1D8BC93600E1866F /* Aztec */; targetProxy = 5951CB991D8BC93600E1866F /* PBXContainerItemProxy */; }; - E8CE3F051F213AD0003254AB /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = E8CE3EFE1F213AAA003254AB /* Carthage Update */; - targetProxy = E8CE3F041F213AD0003254AB /* PBXContainerItemProxy */; - }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -2035,53 +2000,6 @@ }; name = Release; }; - E8CE3EFF1F213AAA003254AB /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - DEBUGGING_SYMBOLS = YES; - DEBUG_INFORMATION_FORMAT = dwarf; - GCC_GENERATE_DEBUGGING_SYMBOLS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Debug; - }; - E8CE3F001F213AAA003254AB /* Release-Alpha */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = "Release-Alpha"; - }; - E8CE3F011F213AAA003254AB /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Release; - }; - E8CE3F021F213AAA003254AB /* Profiling */ = { - isa = XCBuildConfiguration; - buildSettings = { - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - OTHER_CFLAGS = ""; - OTHER_LDFLAGS = ""; - PRODUCT_NAME = "$(TARGET_NAME)"; - }; - name = Profiling; - }; F111A1101DA7E8B600294FD3 /* Profiling */ = { isa = XCBuildConfiguration; buildSettings = { @@ -2344,17 +2262,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - E8CE3F031F213AAA003254AB /* Build configuration list for PBXLegacyTarget "Carthage Update" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - E8CE3EFF1F213AAA003254AB /* Debug */, - E8CE3F001F213AAA003254AB /* Release-Alpha */, - E8CE3F011F213AAA003254AB /* Release */, - E8CE3F021F213AAA003254AB /* Profiling */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; /* End XCConfigurationList section */ }; rootObject = 5951CB851D8BC93600E1866F /* Project object */; diff --git a/Example/Cartfile.private b/Example/Cartfile.private deleted file mode 100644 index 0c702fa1f..000000000 --- a/Example/Cartfile.private +++ /dev/null @@ -1 +0,0 @@ -github "Automattic/Gridicons-iOS" "1.0" diff --git a/Example/Cartfile.resolved b/Example/Cartfile.resolved deleted file mode 100644 index 0c702fa1f..000000000 --- a/Example/Cartfile.resolved +++ /dev/null @@ -1 +0,0 @@ -github "Automattic/Gridicons-iOS" "1.0" diff --git a/Example/carthage.sh b/Example/carthage.sh deleted file mode 100755 index 41de89f1a..000000000 --- a/Example/carthage.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env bash - -# carthage.sh -# Usage example: ./carthage.sh build --platform iOS -# This script was copied from here: https://github.com/Carthage/Carthage/issues/3019#issuecomment-665136323 - -set -euo pipefail - -xcconfig=$(mktemp /tmp/static.xcconfig.XXXXXX) -trap 'rm -f "$xcconfig"' INT TERM HUP EXIT - -# For Xcode 12 make sure EXCLUDED_ARCHS is set to arm architectures otherwise -# the build will fail on lipo due to duplicate architectures. -echo 'EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_simulator__NATIVE_ARCH_64_BIT_x86_64__XCODE_1200 = arm64 arm64e armv7 armv7s armv6 armv8' >> $xcconfig -echo 'EXCLUDED_ARCHS = $(inherited) $(EXCLUDED_ARCHS__EFFECTIVE_PLATFORM_SUFFIX_$(EFFECTIVE_PLATFORM_SUFFIX)__NATIVE_ARCH_64_BIT_$(NATIVE_ARCH_64_BIT)__XCODE_$(XCODE_VERSION_MAJOR))' >> $xcconfig - -export XCODE_XCCONFIG_FILE="$xcconfig" -carthage "$@" diff --git a/Scripts/carthage_script.sh b/Scripts/carthage_script.sh deleted file mode 100755 index 70080c842..000000000 --- a/Scripts/carthage_script.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -cd "${PROJECT_DIR}/Example" -if [ -d "Carthage/Build/iOS" ]; then - echo "Carthage: found dependencies!" -else - carthage update -fi From a4f5af66d481938cd25741433e313c005363a6d4 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Thu, 7 Jan 2021 15:27:51 +0000 Subject: [PATCH 16/28] Improve creation of symbols. --- Example/Example/EditorDemoController.swift | 54 +++++++++++-------- Example/Example/MediaInserter.swift | 2 +- .../TextViewAttachmentDelegateProvider.swift | 9 ++-- 3 files changed, 38 insertions(+), 27 deletions(-) diff --git a/Example/Example/EditorDemoController.swift b/Example/Example/EditorDemoController.swift index ab03bfb79..6d42999eb 100644 --- a/Example/Example/EditorDemoController.swift +++ b/Example/Example/EditorDemoController.swift @@ -1135,53 +1135,65 @@ extension EditorDemoController { } } +extension UIImage { + + static func systemImage(_ name: String) -> UIImage { + guard let image = UIImage(systemName: name) else { + assertionFailure("Missing system image: \(name)") + return UIImage() + } + + return image + } +} + extension FormattingIdentifier { var iconImage: UIImage { switch(self) { case .media: - return UIImage.init(systemName: "plus.circle")! + return UIImage.systemImage("plus.circle") case .p: - return UIImage.init(systemName: "textformat.size")! + return UIImage.systemImage("textformat.size") case .bold: - return UIImage.init(systemName: "bold")! + return UIImage.systemImage("bold") case .italic: - return UIImage.init(systemName: "italic")! + return UIImage.systemImage("italic") case .underline: - return UIImage.init(systemName: "underline")! + return UIImage.systemImage("underline") case .strikethrough: - return UIImage.init(systemName: "strikethrough")! + return UIImage.systemImage("strikethrough") case .blockquote: - return UIImage.init(systemName: "text.quote")! + return UIImage.systemImage("text.quote") case .orderedlist: - return UIImage.init(systemName: "list.number")! + return UIImage.systemImage("list.number") case .unorderedlist: - return UIImage.init(systemName: "list.bullet")! + return UIImage.systemImage("list.bullet") case .link: - return UIImage.init(systemName: "link")! + return UIImage.systemImage("link") case .horizontalruler: - return UIImage.init(systemName: "minus")! + return UIImage.systemImage("minus") case .sourcecode: - return UIImage.init(systemName: "chevron.left.slash.chevron.right")! + return UIImage.systemImage("chevron.left.slash.chevron.right") case .more: - return UIImage.init(systemName: "ellipsis")! + return UIImage.systemImage("textformat.abc.dottedunderline") case .header1: - return UIImage.init(systemName: "textformat.size")! + return UIImage.systemImage("textformat.size") case .header2: - return UIImage.init(systemName: "textformat.size")! + return UIImage.systemImage("textformat.size") case .header3: - return UIImage.init(systemName: "textformat.size")! + return UIImage.systemImage("textformat.size") case .header4: - return UIImage.init(systemName: "textformat.size")! + return UIImage.systemImage("textformat.size") case .header5: - return UIImage.init(systemName: "textformat.size")! + return UIImage.systemImage("textformat.size") case .header6: - return UIImage.init(systemName: "textformat.size")! + return UIImage.systemImage("textformat.size") case .code: - return UIImage.init(systemName: "textbox")! + return UIImage.systemImage("textbox") default: - return UIImage.init(systemName: "info")! + return UIImage.systemImage("info") } } diff --git a/Example/Example/MediaInserter.swift b/Example/Example/MediaInserter.swift index e18b8a510..cbdde6712 100644 --- a/Example/Example/MediaInserter.swift +++ b/Example/Example/MediaInserter.swift @@ -70,7 +70,7 @@ class MediaInserter timer.invalidate() let message = NSAttributedString(string: "Upload failed!", attributes: attachmentTextAttributes) attachment.message = message - attachment.overlayImage = UIImage.init(systemName: "arrow.clockwise") + attachment.overlayImage = UIImage.systemImage("arrow.clockwise") } if progress.fractionCompleted >= 1 { timer.invalidate() diff --git a/Example/Example/TextViewAttachmentDelegateProvider.swift b/Example/Example/TextViewAttachmentDelegateProvider.swift index feb504b88..83d9dc75e 100644 --- a/Example/Example/TextViewAttachmentDelegateProvider.swift +++ b/Example/Example/TextViewAttachmentDelegateProvider.swift @@ -42,16 +42,15 @@ class TextViewAttachmentDelegateProvider: NSObject, TextViewAttachmentDelegate { return placeholderImage(for: attachment) } - func placeholderImage(for attachment: NSTextAttachment) -> UIImage { - let imageSize = CGSize(width:64, height:64) + func placeholderImage(for attachment: NSTextAttachment) -> UIImage { var placeholderImage: UIImage switch attachment { case _ as ImageAttachment: - placeholderImage = UIImage.init(systemName: "photo")! + placeholderImage = UIImage.systemImage("photo") case _ as VideoAttachment: - placeholderImage = UIImage.init(systemName: "video")! + placeholderImage = UIImage.systemImage("video") default: - placeholderImage = UIImage.init(systemName: "paperclip")! + placeholderImage = UIImage.systemImage("paperclip") } if #available(iOS 13.0, *) { placeholderImage = placeholderImage.withTintColor(.label) From 9fd8116c454d175dbe27d130035ada4ca17d2f88 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Fri, 8 Jan 2021 16:35:29 +0000 Subject: [PATCH 17/28] Remove another Carthage reference. --- .../AztecExample.xcodeproj/project.pbxproj | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/Example/AztecExample.xcodeproj/project.pbxproj b/Example/AztecExample.xcodeproj/project.pbxproj index a5a55f32c..a4089619e 100644 --- a/Example/AztecExample.xcodeproj/project.pbxproj +++ b/Example/AztecExample.xcodeproj/project.pbxproj @@ -672,10 +672,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = PZYM8XX95Q; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = AztecExample; @@ -695,10 +692,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Automattic, Inc. (PZYM8XX95Q)"; DEVELOPMENT_TEAM = PZYM8XX95Q; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = AztecExample; @@ -835,10 +829,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = PZYM8XX95Q; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = AztecExample; @@ -919,10 +910,7 @@ ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Automattic, Inc."; DEVELOPMENT_TEAM = 99KV9Z6BKV; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Example/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; MODULE_NAME = AztecExample; From 50f67b709f98d633f45c9e62d52348d7b771ffbd Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Fri, 8 Jan 2021 16:35:40 +0000 Subject: [PATCH 18/28] Update code for iOS 13. --- Example/Example/EditorDemoController.swift | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/Example/Example/EditorDemoController.swift b/Example/Example/EditorDemoController.swift index 6d42999eb..016a0cb5f 100644 --- a/Example/Example/EditorDemoController.swift +++ b/Example/Example/EditorDemoController.swift @@ -452,19 +452,19 @@ class EditorDemoController: UIViewController { } if richTextView.isFirstResponder { - return [ UIKeyCommand(input:"B", modifierFlags: .command, action:#selector(toggleBold), discoverabilityTitle:NSLocalizedString("Bold", comment: "Discoverability title for bold formatting keyboard shortcut.")), - UIKeyCommand(input:"I", modifierFlags: .command, action:#selector(toggleItalic), discoverabilityTitle:NSLocalizedString("Italic", comment: "Discoverability title for italic formatting keyboard shortcut.")), - UIKeyCommand(input:"S", modifierFlags: [.command], action:#selector(toggleStrikethrough), discoverabilityTitle: NSLocalizedString("Strikethrough", comment:"Discoverability title for strikethrough formatting keyboard shortcut.")), - UIKeyCommand(input:"U", modifierFlags: .command, action:#selector(EditorDemoController.toggleUnderline(_:)), discoverabilityTitle: NSLocalizedString("Underline", comment:"Discoverability title for underline formatting keyboard shortcut.")), - UIKeyCommand(input:"Q", modifierFlags:[.command,.alternate], action: #selector(toggleBlockquote), discoverabilityTitle: NSLocalizedString("Block Quote", comment: "Discoverability title for block quote keyboard shortcut.")), - UIKeyCommand(input:"K", modifierFlags:.command, action:#selector(toggleLink), discoverabilityTitle: NSLocalizedString("Insert Link", comment: "Discoverability title for insert link keyboard shortcut.")), - UIKeyCommand(input:"M", modifierFlags:[.command,.alternate], action:#selector(showImagePicker), discoverabilityTitle: NSLocalizedString("Insert Media", comment: "Discoverability title for insert media keyboard shortcut.")), - UIKeyCommand(input:"U", modifierFlags:[.command, .alternate], action:#selector(toggleUnorderedList), discoverabilityTitle:NSLocalizedString("Bullet List", comment: "Discoverability title for bullet list keyboard shortcut.")), - UIKeyCommand(input:"O", modifierFlags:[.command, .alternate], action:#selector(toggleOrderedList), discoverabilityTitle:NSLocalizedString("Numbered List", comment:"Discoverability title for numbered list keyboard shortcut.")), - UIKeyCommand(input:"H", modifierFlags:[.command, .shift], action:#selector(toggleEditingMode), discoverabilityTitle:NSLocalizedString("Toggle HTML Source ", comment: "Discoverability title for HTML keyboard shortcut.")) + return [ UIKeyCommand(title: NSLocalizedString("Bold", comment: "Discoverability title for bold formatting keyboard shortcut."), action:#selector(toggleBold), input:"B", modifierFlags: .command, propertyList: nil, alternates: []), + UIKeyCommand(title:NSLocalizedString("Italic", comment: "Discoverability title for italic formatting keyboard shortcut."), action:#selector(toggleItalic), input:"I", modifierFlags: .command ), + UIKeyCommand(title: NSLocalizedString("Strikethrough", comment:"Discoverability title for strikethrough formatting keyboard shortcut."), action:#selector(toggleStrikethrough), input:"S", modifierFlags: [.command]), + UIKeyCommand(title: NSLocalizedString("Underline", comment:"Discoverability title for underline formatting keyboard shortcut."), action:#selector(EditorDemoController.toggleUnderline(_:)), input:"U", modifierFlags: .command ), + UIKeyCommand(title: NSLocalizedString("Block Quote", comment: "Discoverability title for block quote keyboard shortcut."), action: #selector(toggleBlockquote), input:"Q", modifierFlags:[.command,.alternate]), + UIKeyCommand(title: NSLocalizedString("Insert Link", comment: "Discoverability title for insert link keyboard shortcut."), action:#selector(toggleLink), input:"K", modifierFlags:.command), + UIKeyCommand(title: NSLocalizedString("Insert Media", comment: "Discoverability title for insert media keyboard shortcut."), action:#selector(showImagePicker), input:"M", modifierFlags:[.command,.alternate]), + UIKeyCommand(title:NSLocalizedString("Bullet List", comment: "Discoverability title for bullet list keyboard shortcut."), action:#selector(toggleUnorderedList), input:"U", modifierFlags:[.command, .alternate]), + UIKeyCommand(title:NSLocalizedString("Numbered List", comment:"Discoverability title for numbered list keyboard shortcut."), action:#selector(toggleOrderedList), input:"O", modifierFlags:[.command, .alternate]), + UIKeyCommand(title:NSLocalizedString("Toggle HTML Source ", comment: "Discoverability title for HTML keyboard shortcut."), action:#selector(toggleEditingMode), input:"H", modifierFlags:[.command, .shift]) ] } else if htmlTextView.isFirstResponder { - return [UIKeyCommand(input:"H", modifierFlags:[.command, .shift], action:#selector(toggleEditingMode), discoverabilityTitle:NSLocalizedString("Toggle HTML Source ", comment: "Discoverability title for HTML keyboard shortcut.")) + return [UIKeyCommand(title:NSLocalizedString("Toggle HTML Source ", comment: "Discoverability title for HTML keyboard shortcut."), action:#selector(toggleEditingMode), input:"H", modifierFlags:[.command, .shift]) ] } return [] From 57ebf7d0b365a13b9a79e75de88eab834c9ccec3 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Fri, 8 Jan 2021 16:42:11 +0000 Subject: [PATCH 19/28] Remove another reference to Carthage. --- Aztec.xcodeproj/project.pbxproj | 20 ++++---------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj index 1891e141b..28c0d6aa7 100644 --- a/Aztec.xcodeproj/project.pbxproj +++ b/Aztec.xcodeproj/project.pbxproj @@ -1914,10 +1914,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Example/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Aztec/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -1945,10 +1942,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Example/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Aztec/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -2073,10 +2067,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Example/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Aztec/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -2188,10 +2179,7 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Example/Carthage/Build/iOS", - ); + FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Aztec/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; From faa4d286e2c4ae4f6cab58dd26f3fbf127cd9e2f Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Sun, 10 Jan 2021 21:01:53 +0000 Subject: [PATCH 20/28] Update Readme file to reflect removal of Carthage for Example app. --- README.md | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index a6797e0bb..88b139b5b 100644 --- a/README.md +++ b/README.md @@ -22,28 +22,11 @@ WordPressEditor is a Swift library that provides a plugin to make Aztec work wit ## Requirements - iOS 10 and above -- Xcode 9.3 and above +- Xcode 11 and above ## Running the Example App -To run the Example app, you first need to make sure its dependencies are installed: - -- Make sure you have [Carthage](https://github.com/Carthage/Carthage) installed. -- Using the command line: - -```bash -cd Example -carthage update --platform iOS -``` - -*If using XCode 12 use the follow script:* - -```bash -cd Example -./carthage.sh update --platform iOS -``` - -Once Carthage finishes, you should open the file `Aztec.xcworkspace` from the root directory of Aztec. +To run the Example app, you first open the file `Aztec.xcworkspace` from the root directory of Aztec. Make sure the `AztecExample` target it selected, and press CMD + R to run it. From abfcae92993626245e9158d46136a7501bcab99c Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Tue, 12 Jan 2021 11:20:57 +0000 Subject: [PATCH 21/28] Update project file for Xcode 12 and Circle.ci configuration to use Xcode 12. --- .circleci/config.yml | 21 +++++++++----- Aztec.xcodeproj/project.pbxproj | 26 ++++------------- .../xcshareddata/xcschemes/Aztec.xcscheme | 28 ++++++++----------- .../xcshareddata/WorkspaceSettings.xcsettings | 2 ++ .../AztecExample.xcodeproj/project.pbxproj | 6 +++- .../xcschemes/AztecExample.xcscheme | 2 +- .../WordPressEditor.xcodeproj/project.pbxproj | 5 +++- 7 files changed, 43 insertions(+), 47 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 69a532a2e..c6569b798 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -3,35 +3,42 @@ version: 2.1 orbs: # Using 1.0 of our Orbs means it will use the latest 1.0.x version from https://github.com/wordpress-mobile/circleci-orbs ios: wordpress-mobile/ios@1.0 + git: wordpress-mobile/git@1.0 + +xcode_version: &xcode_version + xcode-version: "12.1.0" + +iphone_test_device: &iphone_test_device + device: iPhone 11 + ios-version: "14.1" workflows: test_and_validate: jobs: - ios/test: name: Test - xcode-version: "11.0" + <<: *xcode_version bundle-install: false pod-install: false workspace: Aztec.xcworkspace scheme: AztecExample - device: iPhone 11 - ios-version: "13.0" + <<: *iphone_test_device - ios/validate-podspec: name: Validate WordPress-Aztec-iOS.podspec - xcode-version: "11.0" + <<: *xcode_version podspec-path: WordPress-Aztec-iOS.podspec - ios/validate-podspec: name: Validate WordPress-Editor-iOS.podspec - xcode-version: "11.0" + <<: *xcode_version podspec-path: WordPress-Editor-iOS.podspec # Reference WordPress-Aztec-iOS.podspec locally so we don't have to get it from the specs repo additional-parameters: --include-podspecs=WordPress-Aztec-iOS.podspec - ios/publish-podspec: name: Publish WordPress-Aztec-iOS to Trunk - xcode-version: "11.0" + <<: *xcode_version podspec-path: WordPress-Aztec-iOS.podspec post-to-slack: true filters: @@ -43,7 +50,7 @@ workflows: - ios/publish-podspec: name: Publish WordPress-Editor-iOS to Trunk requires: [ "Publish WordPress-Aztec-iOS to Trunk" ] - xcode-version: "11.0" + <<: *xcode_version podspec-path: WordPress-Editor-iOS.podspec post-to-slack: true filters: diff --git a/Aztec.xcodeproj/project.pbxproj b/Aztec.xcodeproj/project.pbxproj index 28c0d6aa7..fe24c3ca5 100644 --- a/Aztec.xcodeproj/project.pbxproj +++ b/Aztec.xcodeproj/project.pbxproj @@ -1453,7 +1453,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0800; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1230; ORGANIZATIONNAME = "Automattic Inc."; TargetAttributes = { 5951CB8D1D8BC93600E1866F = { @@ -1801,6 +1801,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1867,6 +1868,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -1914,7 +1916,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Aztec/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -1942,7 +1943,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Aztec/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -1963,10 +1963,6 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Example/Carthage/Build/iOS", - ); INFOPLIST_FILE = AztecTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests; @@ -1982,10 +1978,6 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Example/Carthage/Build/iOS", - ); INFOPLIST_FILE = AztecTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests; @@ -2019,6 +2011,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -2067,7 +2060,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Aztec/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -2088,10 +2080,6 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Example/Carthage/Build/iOS", - ); INFOPLIST_FILE = AztecTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests; @@ -2125,6 +2113,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -2179,7 +2168,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; DYLIB_INSTALL_NAME_BASE = "@rpath"; - FRAMEWORK_SEARCH_PATHS = "$(inherited)"; INFOPLIST_FILE = Aztec/Info.plist; INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks"; IPHONEOS_DEPLOYMENT_TARGET = 11.0; @@ -2201,10 +2189,6 @@ CLANG_ENABLE_MODULES = YES; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; DEVELOPMENT_TEAM = ""; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Example/Carthage/Build/iOS", - ); INFOPLIST_FILE = AztecTests/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks @loader_path/Frameworks"; PRODUCT_BUNDLE_IDENTIFIER = com.wordpress.AztecTests; diff --git a/Aztec.xcodeproj/xcshareddata/xcschemes/Aztec.xcscheme b/Aztec.xcodeproj/xcshareddata/xcschemes/Aztec.xcscheme index 02bb0c855..1cf5571d4 100644 --- a/Aztec.xcodeproj/xcshareddata/xcschemes/Aztec.xcscheme +++ b/Aztec.xcodeproj/xcshareddata/xcschemes/Aztec.xcscheme @@ -1,6 +1,6 @@ + shouldUseLaunchSchemeArgsEnv = "YES" + onlyGenerateCoverageForSpecifiedTargets = "YES"> + + + + - - - - - - - - IDEWorkspaceSharedSettings_AutocreateContextsIfNeeded + PreviewsEnabled + diff --git a/Example/AztecExample.xcodeproj/project.pbxproj b/Example/AztecExample.xcodeproj/project.pbxproj index a4089619e..2b697006e 100644 --- a/Example/AztecExample.xcodeproj/project.pbxproj +++ b/Example/AztecExample.xcodeproj/project.pbxproj @@ -368,7 +368,7 @@ isa = PBXProject; attributes = { LastSwiftUpdateCheck = 0830; - LastUpgradeCheck = 1020; + LastUpgradeCheck = 1230; ORGANIZATIONNAME = "Automattic Inc."; TargetAttributes = { 607FACCF1AFB9204008FA782 = { @@ -574,6 +574,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -635,6 +636,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -791,6 +793,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; @@ -866,6 +869,7 @@ CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; CLANG_WARN_STRICT_PROTOTYPES = YES; CLANG_WARN_SUSPICIOUS_MOVE = YES; diff --git a/Example/AztecExample.xcodeproj/xcshareddata/xcschemes/AztecExample.xcscheme b/Example/AztecExample.xcodeproj/xcshareddata/xcschemes/AztecExample.xcscheme index 56d832f51..3f6fc94eb 100644 --- a/Example/AztecExample.xcodeproj/xcshareddata/xcschemes/AztecExample.xcscheme +++ b/Example/AztecExample.xcodeproj/xcshareddata/xcschemes/AztecExample.xcscheme @@ -1,6 +1,6 @@ Date: Tue, 12 Jan 2021 11:42:04 +0000 Subject: [PATCH 22/28] Update links to license files. --- WordPress-Aztec-iOS.podspec | 2 +- WordPress-Editor-iOS.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec index 4738fad13..faa33cd71 100644 --- a/WordPress-Aztec-iOS.podspec +++ b/WordPress-Aztec-iOS.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS' # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' - s.license = { :type => 'MPLv2', :file => 'LICENSE' } + s.license = { :type => 'MPLv2', :file => 'LICENSE.md' } s.author = { 'Automattic' => 'mobile@automattic.com', 'Diego Rey Mendez' => 'diego.rey.mendez@automattic.com', 'Sergio Estevao' => 'sergioestevao@gmail.com', 'Jorge Leandro Perez' => 'jorge.perez@automattic.com' } s.social_media_url = "http://twitter.com/WordPressiOS" s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec index dbb027336..32cf85362 100644 --- a/WordPress-Editor-iOS.podspec +++ b/WordPress-Editor-iOS.podspec @@ -23,7 +23,7 @@ Pod::Spec.new do |s| s.homepage = 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS' # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' - s.license = { :type => 'MPLv2', :file => 'LICENSE' } + s.license = { :type => 'MPLv2', :file => 'LICENSE.md' } s.author = { 'Automattic' => 'mobile@automattic.com', 'Diego Rey Mendez' => 'diego.rey.mendez@automattic.com', 'Sergio Estevao' => 'sergioestevao@gmail.com', 'Jorge Leandro Perez' => 'jorge.perez@automattic.com' } s.social_media_url = "http://twitter.com/WordPressiOS" s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } From d4f2873e27cd44ded23b39eb64d6c400d5690cc0 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Tue, 12 Jan 2021 11:50:36 +0000 Subject: [PATCH 23/28] Update social media link to use https --- WordPress-Aztec-iOS.podspec | 2 +- WordPress-Editor-iOS.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec index faa33cd71..1a7888e93 100644 --- a/WordPress-Aztec-iOS.podspec +++ b/WordPress-Aztec-iOS.podspec @@ -25,7 +25,7 @@ Pod::Spec.new do |s| # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MPLv2', :file => 'LICENSE.md' } s.author = { 'Automattic' => 'mobile@automattic.com', 'Diego Rey Mendez' => 'diego.rey.mendez@automattic.com', 'Sergio Estevao' => 'sergioestevao@gmail.com', 'Jorge Leandro Perez' => 'jorge.perez@automattic.com' } - s.social_media_url = "http://twitter.com/WordPressiOS" + s.social_media_url = "https://twitter.com/WordPressiOS" s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_version = '5.0' diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec index 32cf85362..870666fde 100644 --- a/WordPress-Editor-iOS.podspec +++ b/WordPress-Editor-iOS.podspec @@ -25,7 +25,7 @@ Pod::Spec.new do |s| # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MPLv2', :file => 'LICENSE.md' } s.author = { 'Automattic' => 'mobile@automattic.com', 'Diego Rey Mendez' => 'diego.rey.mendez@automattic.com', 'Sergio Estevao' => 'sergioestevao@gmail.com', 'Jorge Leandro Perez' => 'jorge.perez@automattic.com' } - s.social_media_url = "http://twitter.com/WordPressiOS" + s.social_media_url = "https://twitter.com/WordPressiOS" s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_version = '5.0' From 79ea23d8f527bbff818e00b97fb57aa44916d9e5 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Tue, 12 Jan 2021 12:41:24 +0000 Subject: [PATCH 24/28] Go back to http. --- WordPress-Aztec-iOS.podspec | 2 +- WordPress-Editor-iOS.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec index 1a7888e93..faa33cd71 100644 --- a/WordPress-Aztec-iOS.podspec +++ b/WordPress-Aztec-iOS.podspec @@ -25,7 +25,7 @@ Pod::Spec.new do |s| # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MPLv2', :file => 'LICENSE.md' } s.author = { 'Automattic' => 'mobile@automattic.com', 'Diego Rey Mendez' => 'diego.rey.mendez@automattic.com', 'Sergio Estevao' => 'sergioestevao@gmail.com', 'Jorge Leandro Perez' => 'jorge.perez@automattic.com' } - s.social_media_url = "https://twitter.com/WordPressiOS" + s.social_media_url = "http://twitter.com/WordPressiOS" s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_version = '5.0' diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec index 870666fde..32cf85362 100644 --- a/WordPress-Editor-iOS.podspec +++ b/WordPress-Editor-iOS.podspec @@ -25,7 +25,7 @@ Pod::Spec.new do |s| # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MPLv2', :file => 'LICENSE.md' } s.author = { 'Automattic' => 'mobile@automattic.com', 'Diego Rey Mendez' => 'diego.rey.mendez@automattic.com', 'Sergio Estevao' => 'sergioestevao@gmail.com', 'Jorge Leandro Perez' => 'jorge.perez@automattic.com' } - s.social_media_url = "https://twitter.com/WordPressiOS" + s.social_media_url = "http://twitter.com/WordPressiOS" s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_version = '5.0' From df042362bf4675c78f507d7b3253e899858aa0bb Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Tue, 12 Jan 2021 14:12:03 +0000 Subject: [PATCH 25/28] Remove social media URL from podspecs --- WordPress-Aztec-iOS.podspec | 1 - WordPress-Editor-iOS.podspec | 2 -- 2 files changed, 3 deletions(-) diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec index faa33cd71..4c5325a1f 100644 --- a/WordPress-Aztec-iOS.podspec +++ b/WordPress-Aztec-iOS.podspec @@ -25,7 +25,6 @@ Pod::Spec.new do |s| # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MPLv2', :file => 'LICENSE.md' } s.author = { 'Automattic' => 'mobile@automattic.com', 'Diego Rey Mendez' => 'diego.rey.mendez@automattic.com', 'Sergio Estevao' => 'sergioestevao@gmail.com', 'Jorge Leandro Perez' => 'jorge.perez@automattic.com' } - s.social_media_url = "http://twitter.com/WordPressiOS" s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_version = '5.0' diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec index 32cf85362..7e0660948 100644 --- a/WordPress-Editor-iOS.podspec +++ b/WordPress-Editor-iOS.podspec @@ -25,11 +25,9 @@ Pod::Spec.new do |s| # s.screenshots = 'www.example.com/screenshots_1', 'www.example.com/screenshots_2' s.license = { :type => 'MPLv2', :file => 'LICENSE.md' } s.author = { 'Automattic' => 'mobile@automattic.com', 'Diego Rey Mendez' => 'diego.rey.mendez@automattic.com', 'Sergio Estevao' => 'sergioestevao@gmail.com', 'Jorge Leandro Perez' => 'jorge.perez@automattic.com' } - s.social_media_url = "http://twitter.com/WordPressiOS" s.source = { :git => 'https://github.com/wordpress-mobile/WordPress-Aztec-iOS.git', :tag => s.version.to_s } s.ios.deployment_target = '11.0' s.swift_version = '5.0' - s.module_name = "WordPressEditor" s.source_files = 'WordPressEditor/WordPressEditor/Classes/**/*' s.resources = 'WordPressEditor/WordPressEditor/Assets/**/*' From 7aa758eac4d0072b2f2b28a20b59b3fe8cc26fe7 Mon Sep 17 00:00:00 2001 From: Sergio Estevao Date: Tue, 12 Jan 2021 19:17:56 +0000 Subject: [PATCH 26/28] Update Readme file. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 88b139b5b..72906901c 100644 --- a/README.md +++ b/README.md @@ -21,8 +21,8 @@ WordPressEditor is a Swift library that provides a plugin to make Aztec work wit ## Requirements -- iOS 10 and above -- Xcode 11 and above +- iOS 11 and above +- Xcode 12 and above ## Running the Example App From 0b140dba98ee26a243718a3bfee77eb640307d7e Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 22 Feb 2021 15:42:40 -0600 Subject: [PATCH 27/28] Set 1.19.4 podspec version --- WordPress-Aztec-iOS.podspec | 2 +- WordPress-Editor-iOS.podspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/WordPress-Aztec-iOS.podspec b/WordPress-Aztec-iOS.podspec index 4c5325a1f..1dee3bd72 100644 --- a/WordPress-Aztec-iOS.podspec +++ b/WordPress-Aztec-iOS.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'WordPress-Aztec-iOS' - s.version = '1.19.3' + s.version = '1.19.4' s.summary = 'The native HTML Editor.' # This description is used to generate tags and improve search results. diff --git a/WordPress-Editor-iOS.podspec b/WordPress-Editor-iOS.podspec index 7e0660948..fcf4e235f 100644 --- a/WordPress-Editor-iOS.podspec +++ b/WordPress-Editor-iOS.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'WordPress-Editor-iOS' - s.version = '1.19.3' + s.version = '1.19.4' s.summary = 'The WordPress HTML Editor.' # This description is used to generate tags and improve search results. From 681aea698448ca6d7b1150b4e11302800cd04939 Mon Sep 17 00:00:00 2001 From: David Calhoun Date: Mon, 22 Feb 2021 16:55:15 -0600 Subject: [PATCH 28/28] Update changelog for 1.19.4 --- CHANGELOG.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96df28cbe..ec6389e0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +1.19.4 +------- +* Fix Carthage build for Xcode 12 +* Replace gridicons with SFSymbols on the Example app + 1.19.3 ------- * Expose UIColor hexString helpers to be used by subclasses of Aztec components.