Reorganize package. Instead of subpackage move everything to the main…

… package. swiftlang/swift-package-manager#7889
krzyzanowskim · Aug 18, 2024 · 4bd89aa · 4bd89aa
1 parent bd3a338
commit 4bd89aa
Show file tree

Hide file tree

Showing 272 changed files with 119 additions and 273 deletions.
diff --git a/Package.swift b/Package.swift
@@ -1,4 +1,4 @@
-// swift-tools-version: 5.8
+// swift-tools-version: 5.10
 // The swift-tools-version declares the minimum version of Swift required to build this package.
 
 import PackageDescription
@@ -14,8 +14,7 @@ let package = Package(
     dependencies: [
         .package(url: "https://github.com/krzyzanowskim/STTextView", from: "1.0.0"),
         .package(url: "https://github.com/ChimeHQ/Neon.git", from: "0.6.0"),
-        .package(url: "https://github.com/ChimeHQ/SwiftTreeSitter", from: "0.8.0"),
-        .package(path: "TreeSitterLanguages")
+        .package(url: "https://github.com/ChimeHQ/SwiftTreeSitter", from: "0.8.0")
     ],
     targets: [
         .target(
@@ -31,47 +30,123 @@ let package = Package(
             name: "TreeSitterResource",
             dependencies: [
                 .product(name: "SwiftTreeSitter", package: "SwiftTreeSitter"),
-                .product(name: "TreeSitterBash", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterBashQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterC", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterCQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterCPP", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterCPPQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterCSharp", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterCSharpQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterCSS", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterCSSQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterGo", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterGoQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterHTML", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterHTMLQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterJava", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterJavaQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterJavaScript", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterJavaScriptQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterJSON", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterJSONQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterMarkdown", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterMarkdownQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterPHP", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterPHPQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterPython", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterPythonQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterRuby", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterRubyQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterRust", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterRustQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterSwift", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterSwiftQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterSQL", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterSQLQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterTOML", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterTOMLQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterTypeScript", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterTypeScriptQueries", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterYAML", package: "TreeSitterLanguages"),
-                .product(name: "TreeSitterYAMLQueries", package: "TreeSitterLanguages")
+                .target(name: "TreeSitterBash"),
+                .target(name: "TreeSitterBashQueries"),
+                .target(name: "TreeSitterC"),
+                .target(name: "TreeSitterCQueries"),
+                .target(name: "TreeSitterCPP"),
+                .target(name: "TreeSitterCPPQueries"),
+                .target(name: "TreeSitterCSharp"),
+                .target(name: "TreeSitterCSharpQueries"),
+                .target(name: "TreeSitterCSS"),
+                .target(name: "TreeSitterCSSQueries"),
+                .target(name: "TreeSitterGo"),
+                .target(name: "TreeSitterGoQueries"),
+                .target(name: "TreeSitterHTML"),
+                .target(name: "TreeSitterHTMLQueries"),
+                .target(name: "TreeSitterJava"),
+                .target(name: "TreeSitterJavaQueries"),
+                .target(name: "TreeSitterJavaScript"),
+                .target(name: "TreeSitterJavaScriptQueries"),
+                .target(name: "TreeSitterJSON"),
+                .target(name: "TreeSitterJSONQueries"),
+                .target(name: "TreeSitterMarkdown"),
+                .target(name: "TreeSitterMarkdownQueries"),
+                .target(name: "TreeSitterPHP"),
+                .target(name: "TreeSitterPHPQueries"),
+                .target(name: "TreeSitterPython"),
+                .target(name: "TreeSitterPythonQueries"),
+                .target(name: "TreeSitterRuby"),
+                .target(name: "TreeSitterRubyQueries"),
+                .target(name: "TreeSitterRust"),
+                .target(name: "TreeSitterRustQueries"),
+                .target(name: "TreeSitterSwift"),
+                .target(name: "TreeSitterSwiftQueries"),
+                .target(name: "TreeSitterSQL"),
+                .target(name: "TreeSitterSQLQueries"),
+                .target(name: "TreeSitterTOML"),
+                .target(name: "TreeSitterTOMLQueries"),
+                .target(name: "TreeSitterTypeScript"),
+                .target(name: "TreeSitterTypeScriptQueries"),
+                .target(name: "TreeSitterYAML"),
+                .target(name: "TreeSitterYAMLQueries")            
             ]
-        )
+        ),
+        .target(name: "TreeSitterAstro", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterAstroQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
+        .target(name: "TreeSitterBash", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterBashQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterC", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterCQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterComment", exclude: ["src/tree_sitter_comment/chars.c", "src/tree_sitter_comment/parser.c"], cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterCommentQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterCSharp", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterCSharpQueries", resources: [.copy("highlights.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterCPP", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterCPPQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterCSS", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterCSSQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterElixir", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterElixirQueries", resources: [.copy("highlights.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterElm", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterElmQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterGo", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterGoQueries", resources: [.copy("highlights.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterHaskell", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterHaskellQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterHTML", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterHTMLQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
+        .target(name: "TreeSitterJava", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterJavaQueries", resources: [.copy("highlights.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterJavaScript", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterJavaScriptQueries", resources: [.copy("highlights-jsx.scm"), .copy("highlights-params.scm"), .copy("highlights.scm"), .copy("injections.scm"), .copy("locals.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterJSDoc", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterJSDocQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterJSON", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterJSONQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterJSON5", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterJSON5Queries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
+        .target(name: "TreeSitterJulia", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterJuliaQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
+        .target(name: "TreeSitterLaTeX", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterLaTeXQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
+        .target(name: "TreeSitterLua", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterLuaQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
+        .target(name: "TreeSitterMarkdown", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterMarkdownQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
+        .target(name: "TreeSitterMarkdownInline", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterMarkdownInlineQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
+        .target(name: "TreeSitterOCaml", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterOCamlQueries", resources: [.copy("highlights.scm"), .copy("locals.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterPerl", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterPerlQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterPHP", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterPHPQueries", resources: [.copy("highlights.scm"), .copy("injections.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterPython", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterPythonQueries", resources: [.copy("highlights.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterR", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterRQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterRegex", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterRegexQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterRuby", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterRubyQueries", resources: [.copy("highlights.scm"), .copy("locals.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterRust", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterRustQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
+        .target(name: "TreeSitterSCSS", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterSCSSQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterSQL", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterSQLQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterSvelte", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterSvelteQueries", resources: [.copy("highlights.scm"), .copy("injections.scm")]),
+        .target(name: "TreeSitterSwift", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterSwiftQueries", resources: [.copy("highlights.scm"), .copy("locals.scm")]),
+        .target(name: "TreeSitterTOML", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterTOMLQueries", resources: [.copy("highlights.scm")]),
+        .target(name: "TreeSitterTSX", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterTSXQueries", resources: [.copy("highlights.scm"), .copy("locals.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterTypeScript", cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterTypeScriptQueries", resources: [.copy("highlights.scm"), .copy("locals.scm"), .copy("tags.scm")]),
+        .target(name: "TreeSitterYAML", exclude: ["src/schema.generated.cc"], cSettings: [.headerSearchPath("src")]),
+        .target(name: "TreeSitterYAMLQueries", resources: [.copy("highlights.scm")]),
     ]
 )