Refactor REPL framework and move it into a separate framework LispKitTools.

Author: objecthub

LispKit.xcodeproj/project.pbxproj

@@ -42,18 +42,24 @@ let package = Package(
   ],
   products: [
     .library(name: "LispKit", targets: ["LispKit"]),
+    .library(name: "LispKitTools", targets: ["LispKitTools"]),
     .executable(name: "LispKitRepl", targets: ["LispKitRepl"])
   ],
   dependencies: [
-    .package(url: "https://github.com/objecthub/swift-numberkit.git", from: "2.3.2"),
-    .package(url: "https://github.com/objecthub/swift-markdownkit.git", from: "0.2.0"),
-    .package(url: "https://github.com/objecthub/swift-commandlinekit.git", from: "0.3.1")
+    .package(url: "https://github.com/objecthub/swift-numberkit.git",
+             .upToNextMajor(from: "2.3.2")),
+    .package(url: "https://github.com/objecthub/swift-markdownkit.git",
+             .upToNextMajor(from: "0.2.0")),
+    .package(url: "https://github.com/objecthub/swift-commandlinekit.git",
+             .upToNextMajor(from: "0.3.1"))
   ],
   targets: [
     .target(name: "LispKit",
-            dependencies: ["NumberKit", "MarkdownKit", "CommandLineKit"]),
+            dependencies: ["NumberKit", "MarkdownKit"]),
+    .target(name: "LispKitTools",
+            dependencies: ["LispKit", "CommandLineKit"]),
     .target(name: "LispKitRepl",
-            dependencies: ["LispKit"],
+            dependencies: ["LispKit", "LispKitTools"],
             exclude: ["BuildMetadata.m", "BuildMetadata.h"]),
     .testTarget(name: "LispKitTests",
                 dependencies: ["LispKit"])

Package.swift

@@ -1,5 +1,5 @@
 //
-//  LispKitRepl-Bridging-Header.h
+//  LispKitReplBridgingHeader.h
 //  LispKit
 //
 //  Created by Matthias Zenger on 14/04/2016.

Sources/LispKitRepl/LispKitReplBridgingHeader.h

@@ -18,13 +18,16 @@
 //  limitations under the License.
 //
 
+import Foundation
 import LispKit
+import LispKitTools
 
 let repl = LispKitRepl(name: AppInfo.name,
                        version: AppInfo.version,
                        build: AppInfo.buildAnnotation,
                        copyright: AppInfo.copyright,
                        prompt: AppInfo.prompt)
+let features = ["repl"]
 
 guard repl.flagsValid() else {
   exit(1)
@@ -35,11 +38,11 @@ if repl.shouldRunRepl() {
     guard repl.configurationSuccessfull(implementationName: "LispKit",
                                         implementationVersion: "1.8.1",
                                         includeInternalResources: false,
-                                        features: ["repl"]) else {
+                                        features: features) else {
       exit(1)
     }
   #else
-    guard repl.configurationSuccessfull(features: ["repl"]) else {
+    guard repl.configurationSuccessfull(features: features) else {
       exit(1)
     }
   #endif

Sources/LispKitRepl/main.swift

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>$(DEVELOPMENT_LANGUAGE)</string>
+	<key>CFBundleExecutable</key>
+	<string>$(EXECUTABLE_NAME)</string>
+	<key>CFBundleIdentifier</key>
+	<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>$(PRODUCT_NAME)</string>
+	<key>CFBundlePackageType</key>
+	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
+	<key>CFBundleShortVersionString</key>
+	<string>$(MARKETING_VERSION)</string>
+	<key>CFBundleVersion</key>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
+	<key>NSHumanReadableCopyright</key>
+	<string>Copyright © 2019 Matthias Zenger. All rights reserved.</string>
+</dict>
+</plist>

Sources/LispKitTools/Info.plist

@@ -19,6 +19,7 @@
 //
 
 import Foundation
+import LispKit
 import CommandLineKit
 
 ///

Sources/LispKit/REPL/LispKitRepl.swift renamed to Sources/LispKitTools/LispKitRepl.swift

@@ -0,0 +1,30 @@
+//
+//  LispKitTools.h
+//  LispKitTools
+//
+//  Created by Matthias Zenger on 21/11/2019.
+//  Copyright © 2019 ObjectHub. All rights reserved.
+//
+//  Licensed under the Apache License, Version 2.0 (the "License");
+//  you may not use this file except in compliance with the License.
+//  You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+//  Unless required by applicable law or agreed to in writing, software
+//  distributed under the License is distributed on an "AS IS" BASIS,
+//  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+//  See the License for the specific language governing permissions and
+//  limitations under the License.
+//
+
+#import <Foundation/Foundation.h>
+
+//! Project version number for LispKitTools.
+FOUNDATION_EXPORT double LispKitToolsVersionNumber;
+
+//! Project version string for LispKitTools.
+FOUNDATION_EXPORT const unsigned char LispKitToolsVersionString[];
+
+// In this header, you should import all the public headers of your framework using
+// statements like #import <LispKitTools/PublicHeader.h>