From 883625af18e4a69ca1f9bc6ec5daa37ab64d63bb Mon Sep 17 00:00:00 2001 From: Ilya Puchka Date: Wed, 31 Jan 2018 18:11:00 +0100 Subject: [PATCH] removed SPM support for SourceryJS as it does not work (#244) --- Package.swift | 6 ------ .../Generating/Template/JavaScript/JavaScriptTemplate.swift | 3 +++ Sourcery/Sourcery.swift | 2 +- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/Package.swift b/Package.swift index f3a3f0332..a99c55eec 100644 --- a/Package.swift +++ b/Package.swift @@ -7,7 +7,6 @@ let package = Package( products: [ .executable(name: "sourcery", targets: ["Sourcery"]), .library(name: "SourceryRuntime", targets: ["SourceryRuntime"]), - .library(name: "SourceryJS", targets: ["SourceryJS"]), ], dependencies: [ .package(url: "https://github.com/kylef/Commander.git", from: "0.6.1"), @@ -22,7 +21,6 @@ let package = Package( targets: [ .target(name: "Sourcery", dependencies: [ "SourceryRuntime", - "SourceryJS", "Commander", "PathKit", "SourceKittenFramework", @@ -32,9 +30,5 @@ let package = Package( "SwiftTryCatch", ]), .target(name: "SourceryRuntime"), - .target(name: "SourceryJS", dependencies: [ - "PathKit", - "SourceryRuntime", - ]), ] ) diff --git a/Sourcery/Generating/Template/JavaScript/JavaScriptTemplate.swift b/Sourcery/Generating/Template/JavaScript/JavaScriptTemplate.swift index f2fed4d24..54980c3ec 100644 --- a/Sourcery/Generating/Template/JavaScript/JavaScriptTemplate.swift +++ b/Sourcery/Generating/Template/JavaScript/JavaScriptTemplate.swift @@ -1,3 +1,5 @@ +#if SWIFT_PACKAGE +#else import SourceryJS import SourceryRuntime import JavaScriptCore @@ -51,3 +53,4 @@ private extension JSContext { } } +#endif diff --git a/Sourcery/Sourcery.swift b/Sourcery/Sourcery.swift index af8aa7a13..4b092808f 100644 --- a/Sourcery/Sourcery.swift +++ b/Sourcery/Sourcery.swift @@ -7,10 +7,10 @@ import Foundation import PathKit import SwiftTryCatch import SourceryRuntime -import SourceryJS #if SWIFT_PACKAGE #else +import SourceryJS import SourcerySwift #endif