refactor: remove LineEditor dependency

work on issue #22
bsorrentino · Aug 25, 2023 · db99143 · db99143
1 parent 71b151d
commit db99143
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 61 deletions.
diff --git a/PlantUML4iPad.xcworkspace/xcshareddata/swiftpm/Package.resolved b/PlantUML4iPad.xcworkspace/xcshareddata/swiftpm/Package.resolved
@@ -1,23 +1,16 @@
 {
-  "pins" : [
-    {
-      "identity" : "openaikit",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/marcodotio/OpenAIKit.git",
-      "state" : {
-        "revision" : "9e718bc33f10bc0c0524ae140be6a89651c4ea3d",
-        "version" : "1.2.0"
+  "object": {
+    "pins": [
+      {
+        "package": "OpenAIKit",
+        "repositoryURL": "https://github.com/marcodotio/OpenAIKit.git",
+        "state": {
+          "branch": null,
+          "revision": "9e718bc33f10bc0c0524ae140be6a89651c4ea3d",
+          "version": "1.2.0"
+        }
       }
-    },
-    {
-      "identity" : "swiftui-lineeditor",
-      "kind" : "remoteSourceControl",
-      "location" : "https://github.com/bsorrentino/SwiftUI-LineEditor.git",
-      "state" : {
-        "branch" : "develop",
-        "revision" : "085c8f0122a1061cd2751ef3ec4703a614256ee0"
-      }
-    }
-  ],
-  "version" : 2
+    ]
+  },
+  "version": 1
 }
diff --git a/PlantUMLApp.xcodeproj/project.pbxproj b/PlantUMLApp.xcodeproj/project.pbxproj
@@ -9,7 +9,6 @@
 /* Begin PBXBuildFile section */
 		A0277C0B293D11D7005435AE /* AsyncImage+Cache.swift in Sources */ = {isa = PBXBuildFile; fileRef = A09A6DDA293D0E5E000856ED /* AsyncImage+Cache.swift */; };
 		A036CC3D2A0FC67C003FDB5E /* PlantUMLKeyboard in Frameworks */ = {isa = PBXBuildFile; productRef = A084B53329EB15C50043B853 /* PlantUMLKeyboard */; };
-		A036CC3E2A0FC67C003FDB5E /* LineEditor in Frameworks */ = {isa = PBXBuildFile; productRef = A084B53529EB15C90043B853 /* LineEditor */; };
 		A036CC3F2A0FC67C003FDB5E /* PlantUMLFramework in Frameworks */ = {isa = PBXBuildFile; productRef = A0BD13F629EB16280048D9C6 /* PlantUMLFramework */; };
 		A036CF992A92C07A007FDEB6 /* CodeViewer in Frameworks */ = {isa = PBXBuildFile; productRef = A036CF982A92C07A007FDEB6 /* CodeViewer */; };
 		A038DB5C29D452880032E312 /* OpenAI.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = A038DB5B29D452880032E312 /* OpenAI.xcconfig */; };
@@ -22,7 +21,6 @@
 		A0943A6F2944A44900342426 /* ScaleToFit+ToggleStyle.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0943A6E2944A44900342426 /* ScaleToFit+ToggleStyle.swift */; };
 		A09F62DD29DDD08600650C9A /* PlantUMLFramework in Frameworks */ = {isa = PBXBuildFile; productRef = A09F62DC29DDD08600650C9A /* PlantUMLFramework */; };
 		A09F62DF29DDD08D00650C9A /* PlantUMLKeyboard in Frameworks */ = {isa = PBXBuildFile; productRef = A09F62DE29DDD08D00650C9A /* PlantUMLKeyboard */; };
-		A09F62E129DDD09400650C9A /* LineEditor in Frameworks */ = {isa = PBXBuildFile; productRef = A09F62E029DDD09400650C9A /* LineEditor */; };
 		A0A139332A12AD8700B69FBC /* AppSecureStorage in Frameworks */ = {isa = PBXBuildFile; productRef = A0A139322A12AD8700B69FBC /* AppSecureStorage */; };
 		A0A139352A13C49A00B69FBC /* View+Secure.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A139342A13C49A00B69FBC /* View+Secure.swift */; };
 		A0A139362A13C49A00B69FBC /* View+Secure.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0A139342A13C49A00B69FBC /* View+Secure.swift */; };
@@ -31,7 +29,6 @@
 		A0BADC7129D4C2740056A098 /* SwiftUI+Conditional.swift in Sources */ = {isa = PBXBuildFile; fileRef = A0BADC7029D4C2740056A098 /* SwiftUI+Conditional.swift */; };
 		A0BD13F129EB161E0048D9C6 /* PlantUMLFramework in Frameworks */ = {isa = PBXBuildFile; productRef = A0BD13F029EB161E0048D9C6 /* PlantUMLFramework */; };
 		A0BD13F329EB161E0048D9C6 /* PlantUMLKeyboard in Frameworks */ = {isa = PBXBuildFile; productRef = A0BD13F229EB161E0048D9C6 /* PlantUMLKeyboard */; };
-		A0BD13F529EB161E0048D9C6 /* LineEditor in Frameworks */ = {isa = PBXBuildFile; productRef = A0BD13F429EB161E0048D9C6 /* LineEditor */; };
 		A0BFBA9A290D551F008340E3 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = A0BFBA9C290D551F008340E3 /* Localizable.strings */; };
 		A0C5C2E02A0FD05A0038C889 /* PlantUMLAppUITests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A00729BA29DB2A9D00D73D1A /* PlantUMLAppUITests.swift */; };
 		A0C5C2E12A0FD05A0038C889 /* PlantUMLAppUITestsLaunchTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = A00729BC29DB2A9D00D73D1A /* PlantUMLAppUITestsLaunchTests.swift */; };
@@ -109,7 +106,6 @@
 			buildActionMask = 2147483647;
 			files = (
 				A036CC3F2A0FC67C003FDB5E /* PlantUMLFramework in Frameworks */,
-				A036CC3E2A0FC67C003FDB5E /* LineEditor in Frameworks */,
 				A036CC3D2A0FC67C003FDB5E /* PlantUMLKeyboard in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -118,7 +114,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A0BD13F529EB161E0048D9C6 /* LineEditor in Frameworks */,
 				A0A139332A12AD8700B69FBC /* AppSecureStorage in Frameworks */,
 				A0BD13F329EB161E0048D9C6 /* PlantUMLKeyboard in Frameworks */,
 				A0BD13F129EB161E0048D9C6 /* PlantUMLFramework in Frameworks */,
@@ -130,7 +125,6 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				A09F62E129DDD09400650C9A /* LineEditor in Frameworks */,
 				A09F62DF29DDD08D00650C9A /* PlantUMLKeyboard in Frameworks */,
 				A09F62DD29DDD08600650C9A /* PlantUMLFramework in Frameworks */,
 			);
@@ -248,7 +242,6 @@
 			name = PlantUMLAppUITests;
 			packageProductDependencies = (
 				A084B53329EB15C50043B853 /* PlantUMLKeyboard */,
-				A084B53529EB15C90043B853 /* LineEditor */,
 				A0BD13F629EB16280048D9C6 /* PlantUMLFramework */,
 			);
 			productName = PlantUMLAppUITests;
@@ -271,7 +264,6 @@
 			packageProductDependencies = (
 				A0BD13F029EB161E0048D9C6 /* PlantUMLFramework */,
 				A0BD13F229EB161E0048D9C6 /* PlantUMLKeyboard */,
-				A0BD13F429EB161E0048D9C6 /* LineEditor */,
 				A0A139322A12AD8700B69FBC /* AppSecureStorage */,
 				A036CF982A92C07A007FDEB6 /* CodeViewer */,
 			);
@@ -296,7 +288,6 @@
 			packageProductDependencies = (
 				A09F62DC29DDD08600650C9A /* PlantUMLFramework */,
 				A09F62DE29DDD08D00650C9A /* PlantUMLKeyboard */,
-				A09F62E029DDD09400650C9A /* LineEditor */,
 			);
 			productName = PlantUMLTests;
 			productReference = A0D3C65928984A10000838D7 /* PlantUMLTests.xctest */;
@@ -335,7 +326,6 @@
 			);
 			mainGroup = A0D3C63D28984A0E000838D7;
 			packageReferences = (
-				A0F4ADE229DDC455003FC055 /* XCRemoteSwiftPackageReference "SwiftUI-LineEditor" */,
 			);
 			productRefGroup = A0D3C64728984A0E000838D7 /* Products */;
 			projectDirPath = "";
@@ -772,17 +762,6 @@
 		};
 /* End XCConfigurationList section */
 
-/* Begin XCRemoteSwiftPackageReference section */
-		A0F4ADE229DDC455003FC055 /* XCRemoteSwiftPackageReference "SwiftUI-LineEditor" */ = {
-			isa = XCRemoteSwiftPackageReference;
-			repositoryURL = "https://github.com/bsorrentino/SwiftUI-LineEditor.git";
-			requirement = {
-				kind = exactVersion;
-				version = 1.1.0;
-			};
-		};
-/* End XCRemoteSwiftPackageReference section */
-
 /* Begin XCSwiftPackageProductDependency section */
 		A036CF982A92C07A007FDEB6 /* CodeViewer */ = {
 			isa = XCSwiftPackageProductDependency;
@@ -792,11 +771,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = PlantUMLKeyboard;
 		};
-		A084B53529EB15C90043B853 /* LineEditor */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A0F4ADE229DDC455003FC055 /* XCRemoteSwiftPackageReference "SwiftUI-LineEditor" */;
-			productName = LineEditor;
-		};
 		A09F62DC29DDD08600650C9A /* PlantUMLFramework */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = PlantUMLFramework;
@@ -805,11 +779,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = PlantUMLKeyboard;
 		};
-		A09F62E029DDD09400650C9A /* LineEditor */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A0F4ADE229DDC455003FC055 /* XCRemoteSwiftPackageReference "SwiftUI-LineEditor" */;
-			productName = LineEditor;
-		};
 		A0A139322A12AD8700B69FBC /* AppSecureStorage */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = AppSecureStorage;
@@ -822,11 +791,6 @@
 			isa = XCSwiftPackageProductDependency;
 			productName = PlantUMLKeyboard;
 		};
-		A0BD13F429EB161E0048D9C6 /* LineEditor */ = {
-			isa = XCSwiftPackageProductDependency;
-			package = A0F4ADE229DDC455003FC055 /* XCRemoteSwiftPackageReference "SwiftUI-LineEditor" */;
-			productName = LineEditor;
-		};
 		A0BD13F629EB16280048D9C6 /* PlantUMLFramework */ = {
 			isa = XCSwiftPackageProductDependency;
 			productName = PlantUMLFramework;

diff --git a/PlantUMLKeyboard/Package.swift b/PlantUMLKeyboard/Package.swift
@@ -19,15 +19,15 @@ let package = Package(
         // .package(url: "https://github.com/siteline/SwiftUI-Introspect.git", branch: "master" ),
         .package(path: "../PlantUMLFramework" ),
         .package(url: "https://github.com/marcodotio/OpenAIKit.git", from: "1.2.0"),
-        .package(url: "https://github.com/bsorrentino/SwiftUI-LineEditor.git", branch: "develop"),
+//        .package(url: "https://github.com/bsorrentino/SwiftUI-LineEditor.git", branch: "develop"),
     ],
     targets: [
         // Targets are the basic building blocks of a package. A target can define a module or a test suite.
         // Targets can depend on other targets in this package, and on products in packages this package depends on.
         .target(
             name: "PlantUMLKeyboard",
             dependencies: [
-                .product(name: "LineEditor", package: "SwiftUI-LineEditor"),
+//                .product(name: "LineEditor", package: "SwiftUI-LineEditor"),
                 .product(name: "OpenAIKit", package: "OpenAIKit"),
                 "PlantUMLFramework",
             ],

diff --git a/PlantUMLKeyboard/Sources/PlantUMLKeyboard/PlantUMLKeyboard.swift b/PlantUMLKeyboard/Sources/PlantUMLKeyboard/PlantUMLKeyboard.swift
@@ -5,7 +5,6 @@
 
 import SwiftUI
 import UIKit
-import LineEditor
 
 public struct PlantUMLKeyboardView: View {
     @Environment(\.colorScheme) var colorScheme

diff --git a/PlantUMLKeyboard/Sources/PlantUMLKeyboard/PlantUMLSymbol.swift b/PlantUMLKeyboard/Sources/PlantUMLKeyboard/PlantUMLSymbol.swift
@@ -6,10 +6,9 @@
 //
 
 import UIKit
-import LineEditor
 import PlantUMLFramework
 
-public struct Symbol : Decodable, Identifiable, Equatable, Hashable, CustomStringConvertible, LineEditorKeyboardSymbol {
+public struct Symbol : Decodable, Identifiable, Equatable, Hashable, CustomStringConvertible /*, LineEditorKeyboardSymbol */ {
 
     enum CodingKeys: String, CodingKey {
         case id