Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix attributed string key #144

Closed
wants to merge 2 commits into from
Closed

Fix attributed string key #144

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ed600a
Compatibility with Swift >=4.2
larryonoff Apr 25, 2019
8b221fb
Remove Swift version from podspect
larryonoff Apr 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Down.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ Pod::Spec.new do |spec|
spec.compiler_flags = '-Wno-shorten-64-to-32'
spec.ios.resource = 'Resources/DownView.bundle'
spec.osx.resource = 'Resources/DownView.bundle'
spec.swift_version = "4.0"
end
12 changes: 12 additions & 0 deletions Down.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
8AFAEB091E6E331700E09B68 /* StringTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = D438696B1D00D27700E95A1F /* StringTests.swift */; };
907C64651EC133780095FEE1 /* TestDownView.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 907C64621EC120530095FEE1 /* TestDownView.bundle */; };
90A40A9C1EC03292004F2E91 /* Down.framework in Copy Bundled Frameworks */ = {isa = PBXBuildFile; fileRef = 8A569F401E6B3E50008BE2AC /* Down.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
CC3E572B22717FA00091983C /* Compatibility.swift in Sources */ = {isa = PBXBuildFile; fileRef = CC3E572A22717FA00091983C /* Compatibility.swift */; };
EE469B11226CF3B500C0655D /* BaseNode.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE469B10226CF3B500C0655D /* BaseNode.swift */; };
EE5F2BA42262564A00B7C0F3 /* Styler.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE5F2BA32262564A00B7C0F3 /* Styler.swift */; };
EE64FEF0225BEB3900A35B34 /* VisitorTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = EE64FEEF225BEB3900A35B34 /* VisitorTests.swift */; };
Expand Down Expand Up @@ -160,6 +161,7 @@
90A40A981EC0309A004F2E91 /* Deployment-Targets.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Deployment-Targets.xcconfig"; sourceTree = "<group>"; };
90A40A991EC0309A004F2E91 /* Universal-Framework-Target.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Universal-Framework-Target.xcconfig"; sourceTree = "<group>"; };
90A40A9A1EC0309A004F2E91 /* Universal-Target-Base.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Universal-Target-Base.xcconfig"; sourceTree = "<group>"; };
CC3E572A22717FA00091983C /* Compatibility.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Compatibility.swift; sourceTree = "<group>"; };
D41689B21CFFE28200E5802B /* DownViewTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = DownViewTests.swift; sourceTree = "<group>"; };
D41689B51CFFE6BB00E5802B /* DownView.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = DownView.bundle; sourceTree = "<group>"; };
D4201EC51CFA59A5008EEC6E /* BindingTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BindingTests.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -275,6 +277,14 @@
path = Configurations;
sourceTree = "<group>";
};
CC3E572922717F910091983C /* Support */ = {
isa = PBXGroup;
children = (
CC3E572A22717FA00091983C /* Compatibility.swift */,
);
path = Support;
sourceTree = "<group>";
};
D41689B41CFFE6BB00E5802B /* Resources */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -317,6 +327,7 @@
D44875E71CFA6CF30037A624 /* Enums & Options */,
D43AE5C81CFFAE39006E1522 /* Extensions */,
D44875E21CFA6B120037A624 /* Renderers */,
CC3E572922717F910091983C /* Support */,
D43AE5CB1CFFD068006E1522 /* Views */,
D4201EF61CFA5D63008EEC6E /* cmark */,
);
Expand Down Expand Up @@ -677,6 +688,7 @@
EEF1376F2259E53400D7DDE0 /* Node.swift in Sources */,
8A569F6D1E6B3ED9008BE2AC /* xml.c in Sources */,
8A569F6E1E6B3EDE008BE2AC /* DownASTRenderable.swift in Sources */,
CC3E572B22717FA00091983C /* Compatibility.swift in Sources */,
EEEBEE5B225D2A7E00AE438D /* Text.swift in Sources */,
EEEBEE4F225D2A1400AE438D /* CodeBlock.swift in Sources */,
EEEBEE5F225D2AA700AE438D /* LineBreak.swift in Sources */,
Expand Down
2 changes: 1 addition & 1 deletion Source/AST/Stylers/Styler.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ public protocol Styler {
func style(link str: NSMutableAttributedString, title: String?, url: String?)
func style(image str: NSMutableAttributedString, title: String?, url: String?)

var listPrefixAttributes: [NSAttributedStringKey: Any] { get }
var listPrefixAttributes: [NSAttributedString.Key: Any] { get }
}
16 changes: 16 additions & 0 deletions Source/Support/Compatibility.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
//
// Compatibility.swift
// Down
//
// Created by Ilya Laryionau on 25/04/2019.
// Copyright © 2019 Glazed Donut, LLC. All rights reserved.
//

import Foundation

#if swift(>=4.2)
#else
extension NSAttributedString {
public typealias Key = NSAttributedStringKey
}
#endif
2 changes: 1 addition & 1 deletion Tests/VisitorTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class VisitorTests: XCTestCase {
}

private class EmptyStyler: Styler {
var listPrefixAttributes: [NSAttributedStringKey : Any] = [:]
var listPrefixAttributes: [NSAttributedString.Key : Any] = [:]
func style(document str: NSMutableAttributedString) {}
func style(blockQuote str: NSMutableAttributedString) {}
func style(list str: NSMutableAttributedString) {}
Expand Down