Merge pull request #1176 from wordpress-mobile/release/1.6.0

Release version 1.6.0

Author: jtreanor

.bundle/config

@@ -0,0 +1,2 @@
+---
+BUNDLE_PATH: "vendor/bundle"

.circleci/config.yml

@@ -2,30 +2,31 @@ version: 2.1
 
 orbs:
   # This uses the iOS Orb located at https://github.com/wordpress-mobile/circleci-orbs
-  ios: wordpress-mobile/ios@0.0.22
+  ios: wordpress-mobile/ios@0.0.25
 
 workflows:
   test_and_validate:
     jobs:
       - ios/test:
           name: Test
+          xcode-version: "10.2.0"
           carthage-update: true
           carthage-working-directory: Example
           bundle-install: false
           pod-install: false
           workspace: Aztec.xcworkspace
           scheme: AztecExample
           device: iPhone XS
-          ios-version: "12.1"
+          ios-version: "12.2"
 
       - ios/validate-podspec:
           name: Validate WordPress-Aztec-iOS.podspec
+          xcode-version: "10.2.0"
           podspec-path: WordPress-Aztec-iOS.podspec
-          bundle-install: false
 
       - ios/validate-podspec:
           name: Validate WordPress-Editor-iOS.podspec
+          xcode-version: "10.2.0"
           podspec-path: WordPress-Editor-iOS.podspec
-          bundle-install: false
           # Updating specs is needed since WordPress-Editor-iOS depends on WordPress-Aztec-iOS
           update-specs-repo: true

.gitignore

@@ -65,3 +65,6 @@ fastlane/report.xml
 fastlane/Preview.html
 fastlane/screenshots
 fastlane/test_output
+
+# Bundler
+vendor/

Aztec.xcodeproj/project.pbxproj

@@ -1423,7 +1423,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 0800;
-				LastUpgradeCheck = 0930;
+				LastUpgradeCheck = 1020;
 				ORGANIZATIONNAME = "Automattic Inc.";
 				TargetAttributes = {
 					5951CB8D1D8BC93600E1866F = {
@@ -1445,10 +1445,11 @@
 			};
 			buildConfigurationList = 5951CB881D8BC93600E1866F /* Build configuration list for PBXProject "Aztec" */;
 			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
+			developmentRegion = en;
 			hasScannedForEncodings = 0;
 			knownRegions = (
 				en,
+				Base,
 			);
 			mainGroup = 5951CB841D8BC93600E1866F;
 			productRefGroup = 5951CB8F1D8BC93600E1866F /* Products */;
@@ -1744,6 +1745,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -1809,6 +1811,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -2009,6 +2012,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";
@@ -2115,6 +2119,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ALWAYS_SEARCH_USER_PATHS = NO;
+				CLANG_ANALYZER_LOCALIZABILITY_NONLOCALIZED = YES;
 				CLANG_ANALYZER_NONNULL = YES;
 				CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
 				CLANG_CXX_LIBRARY = "libc++";

Aztec.xcodeproj/xcshareddata/xcschemes/Aztec.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Aztec.xcodeproj/xcshareddata/xcschemes/Carthage Update.xcscheme

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "0930"
+   LastUpgradeVersion = "1020"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

Aztec/Classes/Extensions/Array+Attribute.swift

@@ -17,11 +17,11 @@ public extension Array where Element == Attribute {
         }
     }
 
-    public mutating func set(_ value: String, for name: String) {
+    mutating func set(_ value: String, for name: String) {
         set(.string(value), for: name)
     }
 
-    public mutating func set(_ value: Attribute.Value, for name: String) {
+    mutating func set(_ value: Attribute.Value, for name: String) {
         guard let attributeIndex = index(where: { $0.name == name }) else {
             let newAttribute = Attribute(name: name, value: value)
 
@@ -32,7 +32,7 @@ public extension Array where Element == Attribute {
         self[attributeIndex].value = value
     }
 
-    public mutating func remove(named name: String) {
+    mutating func remove(named name: String) {
         guard let attributeIndex = index(where: { $0.name == name }) else {
             return
         }

Aztec/Classes/Extensions/Array+ShortcodeAttribute.swift

@@ -8,11 +8,11 @@ public extension Array where Element == ShortcodeAttribute {
         }
     }
 
-    public mutating func set(_ value: String, forKey key: String) {
+    mutating func set(_ value: String, forKey key: String) {
         set(.string(value), forKey: key)
     }
 
-    public mutating func set(_ value: ShortcodeAttribute.Value, forKey key: String) {
+    mutating func set(_ value: ShortcodeAttribute.Value, forKey key: String) {
         let newAttribute = ShortcodeAttribute(key: key, value: value)
 
         guard let attributeIndex = index(where: { $0.key == key }) else {
@@ -23,7 +23,7 @@ public extension Array where Element == ShortcodeAttribute {
         self[attributeIndex] = newAttribute
     }
 
-    public mutating func remove(key: String) {
+    mutating func remove(key: String) {
         guard let attributeIndex = index(where: { $0.key == key }) else {
             return
         }

Aztec/Classes/Extensions/Character+Name.swift

@@ -3,7 +3,7 @@ import UIKit
 
 public extension Character {
 
-    public enum Name: Character {
+    enum Name: Character {
         case lineFeed = "\u{000A}"
         case carriageReturn = "\u{000D}"
         case nonBreakingSpace = "\u{00A0}"
@@ -18,7 +18,7 @@ public extension Character {
         static let textAttachment = objectReplacement
     }
 
-    public static let paragraphBreakingCharacters: [Name] = [.lineFeed, .carriageReturn, .paragraphSeparator]
+    static let paragraphBreakingCharacters: [Name] = [.lineFeed, .carriageReturn, .paragraphSeparator]
 
     init(_ characterName: Name) {
         self.init(unicodeScalarLiteral: characterName.rawValue)

Aztec/Classes/Extensions/NSAttributedString+FontTraits.swift

@@ -14,7 +14,7 @@ public extension NSAttributedString {
     ///
     /// - Returns: True if found.
     ///
-    public func fontTrait(_ traits: UIFontDescriptor.SymbolicTraits, existsAtIndex index: Int) -> Bool {
+    func fontTrait(_ traits: UIFontDescriptor.SymbolicTraits, existsAtIndex index: Int) -> Bool {
         guard let attr = attribute(.font, at: index, effectiveRange: nil) else {
             return false
         }
@@ -33,7 +33,7 @@ public extension NSAttributedString {
     ///
     /// - Returns: True if the trait spans the entire range.
     ///
-    public func fontTrait(_ traits: UIFontDescriptor.SymbolicTraits, spansRange range: NSRange) -> Bool {
+    func fontTrait(_ traits: UIFontDescriptor.SymbolicTraits, spansRange range: NSRange) -> Bool {
         var spansRange = true
 
         // Assume we're removing the trait. If the trait is missing anywhere in the range assign it.
@@ -62,7 +62,7 @@ public extension NSMutableAttributedString {
     ///     - traits: Font traits.
     ///     - range: The NSRange to inspect
     ///
-    public func toggle(_ fontTraits: UIFontDescriptor.SymbolicTraits, inRange range: NSRange) {
+    func toggle(_ fontTraits: UIFontDescriptor.SymbolicTraits, inRange range: NSRange) {
         // Bail if nothing is selected
         if range.length == 0 {
             return