Merge pull request #86 from lukepistrol/static-libs

[chore]: Refactor to use binary framework for `tree-sitter` language grammars

Author: lukepistrol

.github/workflows/build-documentation.yml

@@ -11,12 +11,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v1
-      - uses: actions/cache@v3
-        with:
-          path: '.build'
-          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-          restore-keys: |
-            ${{ runner.os }}-spm-
       - uses: fwcd/[email protected]
         with:
           target: CodeEditTextView

.github/workflows/tests.yml

@@ -16,12 +16,6 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v1
-      - uses: actions/cache@v3
-        with:
-          path: '.build'
-          key: ${{ runner.os }}-spm-${{ hashFiles('**/Package.resolved') }}
-          restore-keys: |
-            ${{ runner.os }}-spm-
       - name: Make executeable
         run: chmod +x ./.github/scripts/tests.sh
       - name: Testing Package

Package.resolved

@@ -14,59 +14,20 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/apple/swift-docc-plugin.git", from: "1.0.0"),
         .package(url: "https://github.com/krzyzanowskim/STTextView.git", exact: "0.1.0"),
-        .package(url: "https://github.com/ChimeHQ/SwiftTreeSitter.git", exact: "0.7.0"),
-        .package(url: "https://github.com/lukepistrol/tree-sitter-bash.git", branch: "feature/spm"), // non-official
-        .package(url: "https://github.com/tree-sitter/tree-sitter-c.git", branch: "master"),
-        .package(url: "https://github.com/tree-sitter/tree-sitter-cpp.git", branch: "master"),
-        .package(url: "https://github.com/tree-sitter/tree-sitter-c-sharp.git", branch: "master"),
-        .package(url: "https://github.com/lukepistrol/tree-sitter-css.git", branch: "feature/spm"), // non-official
-        .package(url: "https://github.com/elixir-lang/tree-sitter-elixir.git", branch: "main"),
-        .package(url: "https://github.com/tree-sitter/tree-sitter-go.git", branch: "master"),
-        .package(url: "https://github.com/camdencheek/tree-sitter-go-mod.git", branch: "main"),
-        .package(url: "https://github.com/tree-sitter/tree-sitter-haskell.git", branch: "master"),
-        .package(url: "https://github.com/mattmassicotte/tree-sitter-html.git", branch: "feature/spm"), // non-official
-        .package(url: "https://github.com/tree-sitter/tree-sitter-java.git", branch: "master"),
-        .package(url: "https://github.com/tree-sitter/tree-sitter-javascript.git", branch: "master"),
-        .package(url: "https://github.com/tree-sitter/tree-sitter-json.git", branch: "master"),
-        .package(url: "https://github.com/tree-sitter/tree-sitter-php.git", branch: "master"),
-        .package(url: "https://github.com/lukepistrol/tree-sitter-python.git", branch: "feature/spm"), // non-official
-        .package(url: "https://github.com/tree-sitter/tree-sitter-ruby.git", branch: "master"),
-        .package(url: "https://github.com/tree-sitter/tree-sitter-rust.git", branch: "master"),
-        .package(url: "https://github.com/alex-pinkus/tree-sitter-swift.git", branch: "with-generated-files"),
-        .package(url: "https://github.com/mattmassicotte/tree-sitter-yaml.git", branch: "feature/spm"), // non-official
-        .package(url: "https://github.com/maxxnino/tree-sitter-zig.git", branch: "main"),
+        .package(url: "https://github.com/CodeEditApp/CodeEditLanguages.git", branch: "main"),
     ],
     targets: [
         .target(
             name: "CodeEditTextView",
             dependencies: [
                 "STTextView",
-                "SwiftTreeSitter",
-                .product(name: "TreeSitterBash", package: "tree-sitter-bash"),
-                .product(name: "TreeSitterC", package: "tree-sitter-c"),
-                .product(name: "TreeSitterCPP", package: "tree-sitter-cpp"),
-                .product(name: "TreeSitterCSharp", package: "tree-sitter-c-sharp"),
-                .product(name: "TreeSitterCSS", package: "tree-sitter-css"),
-                .product(name: "TreeSitterElixir", package: "tree-sitter-elixir"),
-                .product(name: "TreeSitterGo", package: "tree-sitter-go"),
-                .product(name: "TreeSitterGoMod", package: "tree-sitter-go-mod"),
-                .product(name: "TreeSitterHaskell", package: "tree-sitter-haskell"),
-                .product(name: "TreeSitterHTML", package: "tree-sitter-html"),
-                .product(name: "TreeSitterJava", package: "tree-sitter-java"),
-                .product(name: "TreeSitterJS", package: "tree-sitter-javascript"),
-                .product(name: "TreeSitterJSON", package: "tree-sitter-json"),
-                .product(name: "TreeSitterPHP", package: "tree-sitter-php"),
-                .product(name: "TreeSitterPython", package: "tree-sitter-python"),
-                .product(name: "TreeSitterRuby", package: "tree-sitter-ruby"),
-                .product(name: "TreeSitterRust", package: "tree-sitter-rust"),
-                .product(name: "TreeSitterSwift", package: "tree-sitter-swift"),
-                .product(name: "TreeSitterYAML", package: "tree-sitter-yaml"),
-                .product(name: "TreeSitterZig", package: "tree-sitter-zig"),
+                "CodeEditLanguages",
             ]),
         .testTarget(
             name: "CodeEditTextViewTests",
             dependencies: [
                 "CodeEditTextView",
+                "CodeEditLanguages",
             ]),
     ]
 )

Package.swift

@@ -7,6 +7,7 @@
 
 import SwiftUI
 import STTextView
+import CodeEditLanguages
 
 /// A `SwiftUI` wrapper for a ``STTextViewController``.
 public struct CodeEditTextView: NSViewControllerRepresentable {