Merge branch 'master' into fix/swift-package-structure

# Conflicts: # Down.xcodeproj/project.pbxproj
johnxnguyen · Feb 27, 2021 · 70f6892 · 70f6892
2 parents d3063ae + 4c1c888
commit 70f6892
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/Down.xcodeproj/project.pbxproj b/Down.xcodeproj/project.pbxproj
@@ -1101,6 +1101,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Sources/cmark";
+				"VALID_ARCHS[sdk=iphonesimulator*]" = "i386 x86_64 arm64";
 			};
 			name = Debug;
 		};
@@ -1122,6 +1123,7 @@
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SKIP_INSTALL = YES;
 				SWIFT_INCLUDE_PATHS = "${SRCROOT}/Sources/cmark";
+				"VALID_ARCHS[sdk=iphonesimulator*]" = "i386 x86_64 arm64";
 			};
 			name = Release;
 		};

diff --git a/Sources/Down/AST/Styling/Text Views/DownTextView.swift b/Sources/Down/AST/Styling/Text Views/DownTextView.swift
@@ -54,7 +54,7 @@ open class DownTextView: TextView {
         self.init(frame: frame, styler: styler, layoutManager: DownLayoutManager())
     }
 
-    init(frame: CGRect, styler: Styler, layoutManager: NSLayoutManager) {
+    public init(frame: CGRect, styler: Styler, layoutManager: NSLayoutManager) {
         self.styler = styler
 
         let textStorage = NSTextStorage()