Update to base repo

.github/workflows/CI.yml

@@ -0,0 +1,29 @@
+name: CI
+
+on:
+  push:
+    branches:
+      - master
+  pull_request:
+    types: [opened, reopened, edited, synchronize]
+    branches:
+      - master
+
+jobs:
+  check:
+    runs-on: macOS-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+      - name: Lint
+        run: pod lib lint
+      - name: Build & test macOS
+        run: |
+         swift build
+         swift test
+      - name: Build & test iOS
+        run: |
+         swift package generate-xcodeproj --output temp && cd temp
+         xcodebuild build -sdk iphoneos -scheme 'MarkdownKit-Package'
+         xcodebuild test -destination 'name=iPhone 12' -scheme 'MarkdownKit-Package'
+         cd .. && rm -r temp

.gitignore

@@ -61,6 +61,8 @@ playground.xcworkspace
 # Add this line if you want to avoid checking in source code from Swift Package Manager dependencies.
 # Packages/
 .build/
+.swiftpm/
+Package.resolved
 
 # CocoaPods
 #

Example/MarkdownKitViewModel.swift → Examples/ViewModel.swift

@@ -10,7 +10,7 @@ import Foundation
 import MarkdownKit
 import Alamofire
 
-class MarkdownKitViewModel {
+class ViewModel {
 
   let markdownParser: MarkdownParser
 
@@ -25,7 +25,7 @@ class MarkdownKitViewModel {
   }
 }
 
-extension MarkdownKitViewModel {
+extension ViewModel {
   func parseString(markdownString: String) {
     markdownAttributedStringChanged?(markdownParser.parse(markdownString), nil)
   }

Example-iOS/MarkdownSubreddit.swift → Examples/iOS/MarkdownSubreddit.swift

@@ -22,7 +22,7 @@ class MarkdownSubreddit: MarkdownLink {
     let subredditName = attributedString.attributedSubstring(from: match.range(at: 3)).string
     let linkURLString = "http://reddit.com/r/\(subredditName)"
     formatText(attributedString, range: match.range, link: linkURLString)
-    addAttributes(attributedString, range: match.range, link: linkURLString)
+    addAttributes(attributedString, range: match.range)
   }
 
 }

Examples/iOS/Resources/Localizable.strings

@@ -0,0 +1,8 @@
+/* 
+  Localizable.strings
+  MarkdownKit
+
+  Created by Ivan Bruel on 19/07/16.
+  Copyright © 2016 CocoaPods. All rights reserved.
+*/
+"Markdown" = "** Not bold ** vs **Bold** \n\n _ not italic _ vs _italic_ \n\n **_Italic and bold_** \n\n ~~ not strike ~~  vs ~~strike~~ \n\n * list \n\n  * list \n\n + list + \n\n  + list 2 + \n\n 1) list \n\n 2) list \n\n  + hey \n\n 3) ahah \n\n  1) q2wwe \n\n  2) hey \n\n ([linkme](schema://domain/whees))$321 and more\n\n[linkme](schema://domain/whee()) and more.\n\n[Here](http://example.com/test(1).html)asd asd\n\n[Simple](http://example.com/test.html) aaaa\n\nCode\n\n`this is code` ```this is code too```\n\n Testing (**Bold**) or ( **Bold**)\n\n# Community Rules\n\n## Rule 1: Reddit's site-wide rules\n\n\n**[Click Here](http://www.reddit.com/rules) for reddit's 6 rules.**  \n\nThey are all pretty straight forward and easy to understand, but if you would like more information about them [**Click Here**](http://www.reddit.com/wiki/faq) for reddit's Frequently Asked Questions page.\n\n**Be sure to also read [the rediquette](https://www.reddit.com/wiki/reddiquette) which is an informal guide to reddit etiquette.**\n\n_____\n\n##Rule 2: Don't be a jerk\n\n\n**We're here to have a laugh; hate speech, bigotry, and personal attacks are not allowed.**\n\n**Death threats and telling others to kill themselves will result in a ban.**\n\nThis is pretty self explanatory.\n\n_____\n\n\n##Rule 3: Follow the correct format\n\n\n**Two line joke over a re-usable character.** \n\nWe understand that some established memes do not follow this format, such as \n\n* [What Year Is It?](http://knowyourmeme.com/memes/what-year-is-it)\n\n* [I Should Buy a Boat Cat](http://knowyourmeme.com/memes/i-should-buy-a-boat-cat)\n\n* Etc\n\nHowever, these memes are already well established and thus have been grandfathered in.\n\n**Not all image macros are memes**\n\n>Meme -\n\n>/m\u0113m/\n\n>noun\n\n>an element of a culture or system of behavior that may be considered to be passed from one individual to another by nongenetic means, esp. imitation.\n\n>[source](http://www.oxforddictionaries.com/us/definition/american_english/meme)\n\nBasically if the image is only relevant to one's own submission and can't be re-used (or has limited re-usability) then it's just an image macro and by definition not a meme.\n\n* [This is an example of a generic image macro.](https://i.imgur.com/LT1Fi3N.jpg)\n\nand\n\n* [This is an example of a meme.](https://i.imgur.com/871gSb7.jpg)\n\nMemes are allowed on the subreddit here, while generic image macros are better suited for /r/funny. \n\n_____\n\n##Rule 4: Don't repost\n\n**Don't post stuff you found from elsewhere on the web, it's probably been here already.**\n\nThis subreddit is for original content only, meaning memes YOU made. \n\nDo not resubmit your post because it did poorly. \n\nReposting is a bannable offense.\n\nIf you see a repost please report it as such, and [send a quick note to the mods](http://www.reddit.com/message/compose?to=%2Fr%2FAdviceAnimals&subject=I+found+a+repost&message=Here+is+a+link+to+the+comment+section+of+the+repost:%0D%0A%0DAnd+here+is+proof+that+it+is+a+repost:) if you can.\n\n____\n\n##Rule 5: No Cake Day Posts\n\n**Cake Day posts are not allowed.**\n\nPosts that mention Cake Day in the title, or in the post itself will be removed.\n\n____\n\n\n##Rule 6: Verticals, Puffins and Batman Slaps\n\n**Please do not post Verticals, Opinion Puffins or Batman Slaps.**\n\nVerticals are multiple panel memes or image macros and both are better suited for either /r/funny or /r/vertical.\n\n* [This is an example of a vertical meme.](http://i.imgflip.com/bhnki.jpg)\n\n* [This is an example of a vertical image macro](https://i.imgur.com/UrHut.jpg)\n\nThis also means posts such as [9/11 Lois](http://i.imgur.com/DxdSLIo.jpg) aren't allowed; and memes such as [Nobody cares Nedry](http://i.imgur.com/P4KwK1i.jpg) and [Confused Gandalf](http://i.imgur.com/TKujvA3.jpg) are limited to their 1 panel standard, instead of their alternate vertical counterparts.\n\n2 AdviceAnimals in a vertical are OK.\n\nMeaning combining 2 established memes together such as [Socially Awkward Penguin](http://knowyourmeme.com/memes/socially-awkward-penguin) and [Socially Awesome Penguin](http://knowyourmeme.com/memes/socially-awesome-penguin) is fine.\n\n[Here is an example of its acceptable use](https://i.imgur.com/SRYGJdo.jpg)\n\n\n\n\n* [This is unpopular opinion puffin](http://i.imgur.com/qs4z4Rm.jpg)\n\n* [This is an example of a Batman Slap](https://i.imgur.com/5rrb52F.jpg)\n\n_____\n\n\n##Rule 7: Link directly to your image\n\n**Make sure you link directly to your image.**\n\nIn other words, not just to the website, or the gallery page.\n\nHere are a few examples.\n\n* OK.\n\nhttp://i.imgur.com/wdLOqmx.png\n\n\n* Not OK.\n\nhttp://imgur.com/gallery/wdLOqmx\n\nhttp://imgur.com/memegen\n\nhttp://makeameme.org/newest\n\n\n_____\n\n\n##Rule 8: People you know\n\n**Don't make memes with pics of people that you saw in real life. Ever.**\n\nDon't try to make yourself or someone you know into a meme.\n\nAlso, we do not allow witch hunts on the subreddit.\n\n_____\n\n##Rule 9: Use an approved host\n\n**Shortened links, Facebook, Tumblr, Blogspot, etc, will be automatically removed.**\n\nPlease use one of the approved websites listed on the sidebar to make your post.\n\n_____\n\n##Rule 10: Mods have the final say\n\n**We reserve the right to remove posts, remove comments, and ban users at our own discretion.**\n\nDue to the nature of the subreddit, interpretations of what is a meme and what is an image macro sometimes have different opinions and thus decisions have to be made.\n\n_____\n\n\n#[Always feel free to message the moderators if you have ANY questions!](https://www.reddit.com/message/compose?to=%2Fr%2FAdviceAnimals)\n\n Moar code `this is code` ```(this is code too)```";

Example-iOS/ViewController.swift → Examples/iOS/ViewController.swift

@@ -21,13 +21,13 @@ class ViewController: UIViewController {
     return NSLocalizedString("Markdown", comment: "").stringByDecodingHTMLEntities
   }()
 
-  fileprivate lazy var viewModel: MarkdownKitViewModel = {
+  fileprivate lazy var viewModel: ViewModel = {
     // Example with custom font
     // fileprivate let markdownParser = MarkdownParser(font: UIFont(name: "Product Sans", size: UIFont.systemFontSize)!)
     let parser = MarkdownParser()
     parser.addCustomElement(MarkdownSubreddit())
 
-    let viewModel = MarkdownKitViewModel(markdownParser: parser)
+    let viewModel = ViewModel(markdownParser: parser)
     viewModel.markdownAttributedStringChanged = { [weak self](attributtedString, error) in
       if let error = error {
         NSLog("Error requesting -> \(error)")

Example-Appkit/Base.lproj/Main.storyboard → Examples/macOS/Base.lproj/Main.storyboard

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" initialViewController="B8D-0N-5wS">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="14460.31"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="17701"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <scenes>
@@ -620,7 +620,7 @@
                                         <menuItem title="Show Sidebar" keyEquivalent="s" id="kIP-vf-haE">
                                             <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
                                             <connections>
-                                                <action selector="toggleSourceList:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
+                                                <action selector="toggleSidebar:" target="Ady-hI-5gd" id="iwa-gc-5KM"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Enter Full Screen" keyEquivalent="f" id="4J7-dP-txa">
@@ -675,7 +675,7 @@
                         <outlet property="delegate" destination="Voe-Tx-rLC" id="PrD-fu-P6m"/>
                     </connections>
                 </application>
-                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Example_AppKit" customModuleProvider="target"/>
+                <customObject id="Voe-Tx-rLC" customClass="AppDelegate" customModule="Example_macOS" customModuleProvider="target"/>
                 <customObject id="YLy-65-1bz" customClass="NSFontManager"/>
                 <customObject id="Ady-hI-5gd" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
@@ -705,7 +705,7 @@
         <!--View Controller-->
         <scene sceneID="hIz-AP-VOD">
             <objects>
-                <viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="Example_AppKit" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="XfG-lQ-9wD" customClass="ViewController" customModule="Example_macOS" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" wantsLayer="YES" id="m2S-Jp-Qdl">
                         <rect key="frame" x="0.0" y="0.0" width="600" height="480"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -716,7 +716,7 @@
                                     <rect key="frame" x="0.0" y="0.0" width="600" height="480"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
-                                        <textView editable="NO" selectable="NO" importsGraphics="NO" verticallyResizable="YES" findStyle="bar" spellingCorrection="YES" smartInsertDelete="YES" id="SGu-Re-lLv">
+                                        <textView editable="NO" importsGraphics="NO" verticallyResizable="YES" findStyle="bar" spellingCorrection="YES" smartInsertDelete="YES" id="SGu-Re-lLv">
                                             <rect key="frame" x="0.0" y="0.0" width="600" height="480"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                             <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -727,6 +727,10 @@
                                         </textView>
                                     </subviews>
                                 </clipView>
+                                <scroller key="horizontalScroller" hidden="YES" wantsLayer="YES" verticalHuggingPriority="750" horizontal="YES" id="jM4-oA-HAt">
+                                    <rect key="frame" x="-100" y="-100" width="600" height="16"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                </scroller>
                                 <scroller key="verticalScroller" wantsLayer="YES" verticalHuggingPriority="750" horizontal="NO" id="GEY-tc-eTy">
                                     <rect key="frame" x="584" y="0.0" width="16" height="480"/>
                                     <autoresizingMask key="autoresizingMask"/>