From c8679b787da64779043b66cbc0ad3be941998407 Mon Sep 17 00:00:00 2001 From: tobias <thinkdifferent055@gmail.com> Date: Sat, 19 Mar 2022 10:12:28 +0100 Subject: [PATCH] Add SwiftSyntaxParser package --- Package.resolved | 4 +- Package.swift | 5 +- .../project.pbxproj | 72 +++++++++++-------- SwiftMetaModelGenerator/main.swift | 1 + 4 files changed, 49 insertions(+), 33 deletions(-) diff --git a/Package.resolved b/Package.resolved index f14dbcd..14d782a 100644 --- a/Package.resolved +++ b/Package.resolved @@ -42,8 +42,8 @@ "repositoryURL": "https://github.com/apple/swift-syntax.git", "state": { "branch": null, - "revision": "75e60475d9d8fd5bbc16a12e0eaa2cb01b0c322e", - "version": "0.50500.0" + "revision": "0b6c22b97f8e9320bca62e82cdbee601cf37ad3f", + "version": "0.50600.1" } } ] diff --git a/Package.swift b/Package.swift index 5c194df..aa7a6b8 100644 --- a/Package.swift +++ b/Package.swift @@ -10,7 +10,7 @@ let package = Package( dependencies: [ .package(name: "swift-argument-parser", url: "https://github.com/apple/swift-argument-parser.git", .upToNextMinor(from: "1.0.1")), .package(url: "https://github.com/kylef/PathKit.git", .upToNextMinor(from: "1.0.1")), - .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .upToNextMinor(from: "0.50500.0")), + .package(name: "SwiftSyntax", url: "https://github.com/apple/swift-syntax.git", .upToNextMinor(from: "0.50600.1")), .package(url: "https://github.com/kylef/Stencil.git", .upToNextMinor(from: "0.14.1")), ], targets: [ @@ -20,9 +20,10 @@ let package = Package( .product(name: "ArgumentParser", package: "swift-argument-parser"), "PathKit", .product(name: "SwiftSyntax", package: "SwiftSyntax"), + .product(name: "SwiftSyntaxParser", package: "SwiftSyntax"), "Stencil" ], path: "SwiftMetaModelGenerator" ) ] -) \ No newline at end of file +) diff --git a/SwiftMetaModelGenerator.xcodeproj/project.pbxproj b/SwiftMetaModelGenerator.xcodeproj/project.pbxproj index b61039a..43bca9f 100644 --- a/SwiftMetaModelGenerator.xcodeproj/project.pbxproj +++ b/SwiftMetaModelGenerator.xcodeproj/project.pbxproj @@ -7,36 +7,36 @@ objects = { /* Begin PBXBuildFile section */ + F66031ED27E5D14E00E79E22 /* SwiftSyntax in Frameworks */ = {isa = PBXBuildFile; productRef = F66031EC27E5D14E00E79E22 /* SwiftSyntax */; }; + F66031EF27E5D14E00E79E22 /* SwiftSyntaxBuilder in Frameworks */ = {isa = PBXBuildFile; productRef = F66031EE27E5D14E00E79E22 /* SwiftSyntaxBuilder */; }; + F66031F127E5D14E00E79E22 /* SwiftSyntaxParser in Frameworks */ = {isa = PBXBuildFile; productRef = F66031F027E5D14E00E79E22 /* SwiftSyntaxParser */; }; F6752A4E2683522200CC9A19 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6752A4D2683522200CC9A19 /* main.swift */; }; F6752A592683534800CC9A19 /* ArgumentParser in Frameworks */ = {isa = PBXBuildFile; productRef = F6752A582683534800CC9A19 /* ArgumentParser */; }; F6752A5C268354B900CC9A19 /* PathKit in Frameworks */ = {isa = PBXBuildFile; productRef = F6752A5B268354B900CC9A19 /* PathKit */; }; - F6752A662683599500CC9A19 /* SwiftSyntax in Frameworks */ = {isa = PBXBuildFile; productRef = F6752A652683599500CC9A19 /* SwiftSyntax */; }; F6752A6826835A2F00CC9A19 /* DeclarationCollector.swift in Sources */ = {isa = PBXBuildFile; fileRef = F6752A6726835A2F00CC9A19 /* DeclarationCollector.swift */; }; F6752A6B2683600A00CC9A19 /* Stencil in Frameworks */ = {isa = PBXBuildFile; productRef = F6752A6A2683600A00CC9A19 /* Stencil */; }; F6BC6BA72683649000E4F37D /* lib_InternalSwiftSyntaxParser.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6BC6BA62683648800E4F37D /* lib_InternalSwiftSyntaxParser.dylib */; }; - F6BC6BA82683649000E4F37D /* lib_InternalSwiftSyntaxParser.dylib in Embed Libraries */ = {isa = PBXBuildFile; fileRef = F6BC6BA62683648800E4F37D /* lib_InternalSwiftSyntaxParser.dylib */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; }; /* End PBXBuildFile section */ /* Begin PBXCopyFilesBuildPhase section */ - F6752A482683522200CC9A19 /* CopyFiles */ = { + F66031F327E5D20C00E79E22 /* Embed Libraries */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = /usr/share/man/man1/; - dstSubfolderSpec = 0; + dstPath = ""; + dstSubfolderSpec = 10; files = ( ); - runOnlyForDeploymentPostprocessing = 1; + name = "Embed Libraries"; + runOnlyForDeploymentPostprocessing = 0; }; - F6752A63268357D900CC9A19 /* Embed Libraries */ = { + F6752A482683522200CC9A19 /* CopyFiles */ = { isa = PBXCopyFilesBuildPhase; buildActionMask = 2147483647; - dstPath = ""; - dstSubfolderSpec = 10; + dstPath = /usr/share/man/man1/; + dstSubfolderSpec = 0; files = ( - F6BC6BA82683649000E4F37D /* lib_InternalSwiftSyntaxParser.dylib in Embed Libraries */, ); - name = "Embed Libraries"; - runOnlyForDeploymentPostprocessing = 0; + runOnlyForDeploymentPostprocessing = 1; }; /* End PBXCopyFilesBuildPhase section */ @@ -54,10 +54,12 @@ buildActionMask = 2147483647; files = ( F6752A5C268354B900CC9A19 /* PathKit in Frameworks */, + F66031EF27E5D14E00E79E22 /* SwiftSyntaxBuilder in Frameworks */, F6752A6B2683600A00CC9A19 /* Stencil in Frameworks */, + F66031ED27E5D14E00E79E22 /* SwiftSyntax in Frameworks */, F6BC6BA72683649000E4F37D /* lib_InternalSwiftSyntaxParser.dylib in Frameworks */, + F66031F127E5D14E00E79E22 /* SwiftSyntaxParser in Frameworks */, F6752A592683534800CC9A19 /* ArgumentParser in Frameworks */, - F6752A662683599500CC9A19 /* SwiftSyntax in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -117,7 +119,7 @@ F6752A462683522200CC9A19 /* Sources */, F6752A472683522200CC9A19 /* Frameworks */, F6752A482683522200CC9A19 /* CopyFiles */, - F6752A63268357D900CC9A19 /* Embed Libraries */, + F66031F327E5D20C00E79E22 /* Embed Libraries */, ); buildRules = ( ); @@ -127,8 +129,10 @@ packageProductDependencies = ( F6752A582683534800CC9A19 /* ArgumentParser */, F6752A5B268354B900CC9A19 /* PathKit */, - F6752A652683599500CC9A19 /* SwiftSyntax */, F6752A6A2683600A00CC9A19 /* Stencil */, + F66031EC27E5D14E00E79E22 /* SwiftSyntax */, + F66031EE27E5D14E00E79E22 /* SwiftSyntaxBuilder */, + F66031F027E5D14E00E79E22 /* SwiftSyntaxParser */, ); productName = SwiftMetaModelGenerator; productReference = F6752A4A2683522200CC9A19 /* SwiftMetaModelGenerator */; @@ -160,8 +164,8 @@ packageReferences = ( F6752A572683534800CC9A19 /* XCRemoteSwiftPackageReference "swift-argument-parser" */, F6752A5A268354B900CC9A19 /* XCRemoteSwiftPackageReference "PathKit" */, - F6752A642683598C00CC9A19 /* XCRemoteSwiftPackageReference "swift-syntax" */, F6752A692683600A00CC9A19 /* XCRemoteSwiftPackageReference "Stencil" */, + F66031EB27E5D14E00E79E22 /* XCRemoteSwiftPackageReference "swift-syntax" */, ); productRefGroup = F6752A4B2683522200CC9A19 /* Products */; projectDirPath = ""; @@ -346,28 +350,28 @@ /* End XCConfigurationList section */ /* Begin XCRemoteSwiftPackageReference section */ - F6752A572683534800CC9A19 /* XCRemoteSwiftPackageReference "swift-argument-parser" */ = { + F66031EB27E5D14E00E79E22 /* XCRemoteSwiftPackageReference "swift-syntax" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/apple/swift-argument-parser"; + repositoryURL = "https://github.com/apple/swift-syntax.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 1.0.1; + minimumVersion = 0.50600.1; }; }; - F6752A5A268354B900CC9A19 /* XCRemoteSwiftPackageReference "PathKit" */ = { + F6752A572683534800CC9A19 /* XCRemoteSwiftPackageReference "swift-argument-parser" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/kylef/PathKit.git"; + repositoryURL = "https://github.com/apple/swift-argument-parser"; requirement = { kind = upToNextMajorVersion; minimumVersion = 1.0.1; }; }; - F6752A642683598C00CC9A19 /* XCRemoteSwiftPackageReference "swift-syntax" */ = { + F6752A5A268354B900CC9A19 /* XCRemoteSwiftPackageReference "PathKit" */ = { isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/apple/swift-syntax.git"; + repositoryURL = "https://github.com/kylef/PathKit.git"; requirement = { kind = upToNextMajorVersion; - minimumVersion = 0.50500.0; + minimumVersion = 1.0.1; }; }; F6752A692683600A00CC9A19 /* XCRemoteSwiftPackageReference "Stencil" */ = { @@ -381,6 +385,21 @@ /* End XCRemoteSwiftPackageReference section */ /* Begin XCSwiftPackageProductDependency section */ + F66031EC27E5D14E00E79E22 /* SwiftSyntax */ = { + isa = XCSwiftPackageProductDependency; + package = F66031EB27E5D14E00E79E22 /* XCRemoteSwiftPackageReference "swift-syntax" */; + productName = SwiftSyntax; + }; + F66031EE27E5D14E00E79E22 /* SwiftSyntaxBuilder */ = { + isa = XCSwiftPackageProductDependency; + package = F66031EB27E5D14E00E79E22 /* XCRemoteSwiftPackageReference "swift-syntax" */; + productName = SwiftSyntaxBuilder; + }; + F66031F027E5D14E00E79E22 /* SwiftSyntaxParser */ = { + isa = XCSwiftPackageProductDependency; + package = F66031EB27E5D14E00E79E22 /* XCRemoteSwiftPackageReference "swift-syntax" */; + productName = SwiftSyntaxParser; + }; F6752A582683534800CC9A19 /* ArgumentParser */ = { isa = XCSwiftPackageProductDependency; package = F6752A572683534800CC9A19 /* XCRemoteSwiftPackageReference "swift-argument-parser" */; @@ -391,11 +410,6 @@ package = F6752A5A268354B900CC9A19 /* XCRemoteSwiftPackageReference "PathKit" */; productName = PathKit; }; - F6752A652683599500CC9A19 /* SwiftSyntax */ = { - isa = XCSwiftPackageProductDependency; - package = F6752A642683598C00CC9A19 /* XCRemoteSwiftPackageReference "swift-syntax" */; - productName = SwiftSyntax; - }; F6752A6A2683600A00CC9A19 /* Stencil */ = { isa = XCSwiftPackageProductDependency; package = F6752A692683600A00CC9A19 /* XCRemoteSwiftPackageReference "Stencil" */; diff --git a/SwiftMetaModelGenerator/main.swift b/SwiftMetaModelGenerator/main.swift index 70007e7..e4714ba 100644 --- a/SwiftMetaModelGenerator/main.swift +++ b/SwiftMetaModelGenerator/main.swift @@ -8,6 +8,7 @@ import Foundation import ArgumentParser import SwiftSyntax +import SwiftSyntaxParser import Stencil import PathKit -- GitLab