Remove the previous version of the AttributedStringBuilder

ElementX/Sources/Application/AppCoordinator.swift

@@ -160,12 +160,6 @@ class AppCoordinator: AppCoordinatorProtocol, AuthenticationFlowCoordinatorDeleg
             }
             .store(in: &cancellables)
 
-        appSettings.$nextGenHTMLParserEnabled
-            .sink { value in
-                AttributedStringBuilder.useNextGenHTMLParser = value
-            }
-            .store(in: &cancellables)
-
         elementCallService.actions
             .receive(on: DispatchQueue.main)
             .sink { [weak self] action in

ElementX/Sources/Application/Settings/AppSettings.swift

@@ -63,7 +63,6 @@ final class AppSettings {
         case knockingEnabled
         case threadsEnabled
         case developerOptionsEnabled
-        case nextGenHTMLParserEnabled
         case linkPreviewsEnabled
         case latestEventSorterEnabled
 
@@ -389,10 +388,7 @@ final class AppSettings {
 
     @UserPreference(key: UserDefaultsKeys.threadsEnabled, defaultValue: false, storageType: .userDefaults(store))
     var threadsEnabled
-
-    @UserPreference(key: UserDefaultsKeys.nextGenHTMLParserEnabled, defaultValue: true, storageType: .userDefaults(store))
-    var nextGenHTMLParserEnabled
-
+
     @UserPreference(key: UserDefaultsKeys.linkPreviewsEnabled, defaultValue: false, storageType: .userDefaults(store))
     var linkPreviewsEnabled
 

ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/DeveloperOptionsScreenModels.swift

@@ -53,7 +53,6 @@ protocol DeveloperOptionsProtocol: AnyObject {
     var knockingEnabled: Bool { get set }
     var latestEventSorterEnabled: Bool { get set }
 
-    var nextGenHTMLParserEnabled: Bool { get set }
     var linkPreviewsEnabled: Bool { get set }
 }
 

ElementX/Sources/Screens/Settings/DeveloperOptionsScreen/View/DeveloperOptionsScreen.swift

@@ -33,12 +33,6 @@ struct DeveloperOptionsScreen: View {
                 }
             }
 
-            Section("General") {
-                Toggle(isOn: $context.nextGenHTMLParserEnabled) {
-                    Text("Next gen HTML parsing")
-                }
-            }
-
             Section("Room List") {
                 Toggle(isOn: $context.publicSearchEnabled) {
                     Text("Public search")

ElementX/Sources/Screens/Timeline/View/TimelineItemViews/FormattedBodyText.swift

@@ -135,13 +135,8 @@ struct FormattedBodyText: View {
 
 struct FormattedBodyText_Previews: PreviewProvider, TestablePreview {
     static var previews: some View {
-        body(AttributedStringBuilderV1(cacheKey: "v1", mentionBuilder: MentionBuilder()))
+        body(AttributedStringBuilder(cacheKey: "FormattedBodyText", mentionBuilder: MentionBuilder()))
             .previewLayout(.sizeThatFits)
-            .previewDisplayName("v1")
-
-        body(AttributedStringBuilderV2(cacheKey: "v2", mentionBuilder: MentionBuilder()))
-            .previewLayout(.sizeThatFits)
-            .previewDisplayName("v2")
     }
 
     @ViewBuilder

ElementX/SupportingFiles/target.yml

@@ -228,7 +228,6 @@ targets:
     - package: AnalyticsEvents
     - package: Collections
     - package: DeviceKit
-    - package: DTCoreText
     - package: EmbeddedElementCall
     - package: KeychainAccess
     - package: Kingfisher

IntegrationTests/SupportingFiles/target.yml

@@ -33,7 +33,6 @@ targets:
     - target: ElementX
     - package: MatrixRustSDK
     - package: DeviceKit
-    - package: DTCoreText
     - package: KeychainAccess
     - package: Kingfisher
     - package: SwiftState

NSE/SupportingFiles/target.yml

@@ -38,7 +38,6 @@ targets:
       - package: Collections
       - package: Compound
       - package: DeviceKit
-      - package: DTCoreText
       - package: LRUCache
       - package: Version
       - package: SwiftSoup

UITests/SupportingFiles/target.yml

@@ -30,7 +30,6 @@ targets:
     - package: MatrixRustSDK
     - package: AnalyticsEvents
     - package: DeviceKit
-    - package: DTCoreText
     - package: KeychainAccess
     - package: Kingfisher
     - package: KZFileWatchers