Skip to content

Commit 9019ea7

Browse files
committed
Revert "Compatibility with xcode 10"
This reverts commit 1d0c77d.
1 parent 4237063 commit 9019ea7

5 files changed

Lines changed: 1 addition & 31 deletions

File tree

Aztec.xcodeproj/project.pbxproj

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
/* Begin PBXBuildFile section */
1010
1A830346228583B200798076 /* NSBundle+AztecBundle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1A830345228583B200798076 /* NSBundle+AztecBundle.swift */; };
11-
1EDDEBA5239A68320000A957 /* XCodeVersion.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 1EDDEBA4239A68320000A957 /* XCodeVersion.xcconfig */; };
1211
40359F261FD88A5F00B1C1D2 /* HRElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40359F251FD88A5F00B1C1D2 /* HRElementConverter.swift */; };
1312
40359F281FD88A7900B1C1D2 /* BRElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */; };
1413
40A2986D1FD61B0C00AEDF3B /* ElementConverter.swift in Sources */ = {isa = PBXBuildFile; fileRef = 40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */; };
@@ -282,7 +281,6 @@
282281

283282
/* Begin PBXFileReference section */
284283
1A830345228583B200798076 /* NSBundle+AztecBundle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSBundle+AztecBundle.swift"; sourceTree = "<group>"; };
285-
1EDDEBA4239A68320000A957 /* XCodeVersion.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = XCodeVersion.xcconfig; sourceTree = "<group>"; };
286284
40359F251FD88A5F00B1C1D2 /* HRElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HRElementConverter.swift; sourceTree = "<group>"; };
287285
40359F271FD88A7900B1C1D2 /* BRElementConverter.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BRElementConverter.swift; sourceTree = "<group>"; };
288286
40A2986C1FD61B0C00AEDF3B /* ElementConverter.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ElementConverter.swift; sourceTree = "<group>"; };
@@ -553,14 +551,6 @@
553551
/* End PBXFrameworksBuildPhase section */
554552

555553
/* Begin PBXGroup section */
556-
1EDDEBA3239A68090000A957 /* config */ = {
557-
isa = PBXGroup;
558-
children = (
559-
1EDDEBA4239A68320000A957 /* XCodeVersion.xcconfig */,
560-
);
561-
path = config;
562-
sourceTree = "<group>";
563-
};
564554
40A2986F1FD61B1C00AEDF3B /* Implementations */ = {
565555
isa = PBXGroup;
566556
children = (
@@ -607,7 +597,6 @@
607597
FF5B98E21DC29D0C00571CA4 /* README.md */,
608598
FF7A1C4A1E51F05700C4C7C8 /* CONTRIBUTING.md */,
609599
FFC2BBF81F2A25CF00E404FB /* CHANGELOG.md */,
610-
1EDDEBA3239A68090000A957 /* config */,
611600
5951CB901D8BC93600E1866F /* Aztec */,
612601
5951CB9B1D8BC93600E1866F /* AztecTests */,
613602
599F255A1D8BCD97002871D6 /* Frameworks */,
@@ -1503,7 +1492,6 @@
15031492
isa = PBXResourcesBuildPhase;
15041493
buildActionMask = 2147483647;
15051494
files = (
1506-
1EDDEBA5239A68320000A957 /* XCodeVersion.xcconfig in Resources */,
15071495
FF1F56A3239562B900E93A30 /* html_colors.json in Resources */,
15081496
FF0714021EFD78AF00E50713 /* Media.xcassets in Resources */,
15091497
);
@@ -1913,7 +1901,6 @@
19131901
};
19141902
5951CBA31D8BC93600E1866F /* Debug */ = {
19151903
isa = XCBuildConfiguration;
1916-
baseConfigurationReference = 1EDDEBA4239A68320000A957 /* XCodeVersion.xcconfig */;
19171904
buildSettings = {
19181905
CLANG_ENABLE_MODULES = YES;
19191906
CODE_SIGN_IDENTITY = "";

Aztec/Classes/TextKit/ColorProvider.swift

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,10 @@ public class ColorProvider {
4646
}
4747

4848
public lazy var codeBackgroungColor: UIColor = {
49-
#if XCODE11
5049
if #available(iOS 13.0, *) {
5150
return .secondarySystemBackground
5251
} else {
5352
return .lightGray
5453
}
55-
#endif
56-
return .lightGray
5754
}()
5855
}

Aztec/Classes/TextKit/TextView.swift

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -249,14 +249,11 @@ open class TextView: UITextView {
249249
}
250250

251251
open lazy var defaultTextColor: UIColor? = {
252-
#if XCODE11
253252
if #available(iOS 13.0, *) {
254253
return UIColor.label
255254
} else {
256255
return UIColor.darkText
257-
}
258-
#endif
259-
return UIColor.darkText
256+
}
260257
}()
261258

262259
open override var textColor: UIColor? {

Aztec/Classes/TextKit/TextViewPasteboardDelegate.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -81,11 +81,9 @@ open class AztecTextViewPasteboardDelegate: TextViewPasteboardDelegate {
8181
}
8282

8383
private func fixColors(in string: NSAttributedString, using baseColor: UIColor?) -> NSAttributedString {
84-
#if XCODE11
8584
guard #available(iOS 13.0, *) else {
8685
return string
8786
}
88-
8987
let colorToUse = baseColor ?? UIColor.label
9088

9189
let newString = NSMutableAttributedString(attributedString: string)
@@ -95,9 +93,6 @@ open class AztecTextViewPasteboardDelegate: TextViewPasteboardDelegate {
9593
}
9694
}
9795
return newString
98-
#else
99-
return string
100-
#endif
10196
}
10297

10398
/// Tries to paste raw text from the clipboard, replacing the selected range.

config/XCodeVersion.xcconfig

Lines changed: 0 additions & 6 deletions
This file was deleted.

0 commit comments

Comments
 (0)