Revert "Add Configuration Builder (and tests) (#146)"

This reverts commit 601a9a8.

Author: dcalhoun

Makefile

@@ -47,9 +47,6 @@ lint-js: npm-dependencies
 test-js: npm-dependencies
 	npm run test -- run
 
-lint-swift:
-	swift package plugin swiftlint
-
 local-android-library: build
 	echo "--- :android: Building Library"
 	./android/gradlew -p ./android :gutenberg:publishToMavenLocal -exclude-task prepareToPublishToS3

ios/Demo-iOS/Sources/ContentView.swift

@@ -66,20 +66,20 @@ struct ContentView: View {
 private extension EditorConfiguration {
 
     static var template: Self {
-        #warning("1. Update the siteURL and authHeader values below")
+        var configuration = EditorConfiguration.default
+
+        #warning("1. Update the property values below")
         #warning("2. Install the Jetpack plugin to the site")
-        let siteUrl: String = "https://modify-me.com"
-        let authHeader: String = "Insert the Authorization header value here"
-        let siteApiRoot: String = "\(siteUrl)/wp-json/"
+        configuration.siteURL = "https://modify-me.com"
+        configuration.authHeader = "Insert the Authorization header value here"
 
-        let configuration = EditorConfigurationBuilder()
-            .setSiteUrl(siteUrl)
-            .setAuthHeader(authHeader)
-            .setSiteApiRoot(siteApiRoot)
-            .setEditorAssetsEndpoint(URL(string: siteApiRoot)!.appendingPathComponent("wpcom/v2/editor-assets"))
-            .setShouldUsePlugins(true)
+        // DO NOT CHANGE the properties below
+        configuration.siteApiRoot = "\(configuration.siteURL)/wp-json/"
+        configuration.editorAssetsEndpoint = URL(string: configuration.siteApiRoot)!.appendingPathComponent("wpcom/v2/editor-assets")
+        // The `plugins: true` is necessary for the editor to use 'remote.html'
+        configuration.plugins = true
 
-        return configuration.build()
+        return configuration
     }
 
 }

ios/Sources/GutenbergKit/Sources/Cache/EditorAssetsLibrary.swift

@@ -245,11 +245,7 @@ struct EditorAssetsMainifest: Codable {
         for script in try document.select("script[src]") {
             if let src = try? script.attr("src") {
                 let link = Self.resolveAssetLink(src, defaultScheme: defaultScheme)
-                #if canImport(UIKit)
                 let newLink = CachedAssetSchemeHandler.cachedURL(forWebLink: link) ?? link
-                #else
-                let newLink = link
-                #endif
                 try script.attr("src", newLink)
             }
         }
@@ -272,11 +268,7 @@ struct EditorAssetsMainifest: Codable {
         for stylesheet in try document.select(#"link[rel="stylesheet"][href]"#) {
             if let href = try? stylesheet.attr("href") {
                 let link = Self.resolveAssetLink(href, defaultScheme: defaultScheme)
-                #if canImport(UIKit)
                 let newLink = CachedAssetSchemeHandler.cachedURL(forWebLink: link) ?? link
-                #else
-                let newLink = link
-                #endif
                 try stylesheet.attr("href", newLink)
             }
         }

ios/Sources/GutenbergKit/Sources/EditorBlockPicker.swift

@@ -1,6 +1,5 @@
 import SwiftUI
 
-#if canImport(UIKit)
 // TODO: Add search
 // TODO: Group these properly
 struct EditorBlockPicker: View {
@@ -218,4 +217,3 @@ struct EditorBlockPickerSection: Identifiable {
     let name: String
     let blockTypes: [EditorBlockType]
 }
-#endif