diff --git a/bin/nef b/bin/nef index a1b42b2d..cda13e1c 100755 --- a/bin/nef +++ b/bin/nef @@ -5,6 +5,7 @@ MARKDOWN="markdown" JEKYLL="jekyll" CARBON="carbon" PLAYGROUND="playground" +PLAYGROUND_BOOK="ipad" COMPILE="compile" CLEAN="clean" @@ -33,10 +34,11 @@ printHelp() { echo "${bold}Commands${reset}" echo " ${green}${bold}$COMPILE${normal}${reset} Compile Xcode Playgrounds given a " echo " ${green}${bold}$CLEAN${normal}${reset} Clean a generated nef project from a " - echo " ${green}${bold}$PLAYGROUND${normal}${reset} Build a playground compatible with external frameworks" - echo " ${green}${bold}$MARKDOWN${normal}${reset} Render Markdown files for given Xcode Playgrounds" - echo " ${green}${bold}$JEKYLL${normal}${reset} Render Markdown files that can be consumed from Jekyll to generate a microsite" - echo " ${green}${bold}$CARBON${normal}${reset} Export Carbon code snippets for given Xcode Playgrounds" + echo " ${green}${bold}$PLAYGROUND${normal}${reset} Build a ${bold}playground${reset} compatible with external frameworks" + echo " ${green}${bold}$PLAYGROUND_BOOK${normal}${reset} Build a playground compatible with ${bold}iPad${reset} and 3rd-party libraries" + echo " ${green}${bold}$MARKDOWN${normal}${reset} Render ${bold}Markdown${reset} files for given Xcode Playgrounds" + echo " ${green}${bold}$JEKYLL${normal}${reset} Render Markdown files that can be consumed from ${bold}Jekyll${reset} to generate a microsite" + echo " ${green}${bold}$CARBON${normal}${reset} Export ${bold}Carbon${reset} code snippets for given Xcode Playgrounds" echo "" } @@ -112,6 +114,21 @@ printHelpPlayground() { echo "" } +## +# printHelpPlaygroundBook() +## +printHelpPlaygroundBook() { + echo "" + echo "${normal}nef ${green}${bold}$PLAYGROUND_BOOK${normal} ${required}${bold}--name${normal}${reset} ${required}${bold}--package${normal}${reset} ${required}${bold}--output${normal}${reset} " + echo "" + echo " Build a Playground Book with 3r-party libraries defined in a Swift Package" + echo "" + echo " ${required}${bold}--name${reset}${normal} specify the name for the Playground Book that you are creating${reset}" + echo " ${required}${bold}--package${reset}${normal} path to the Swift Package with the dependencies${reset}" + echo " ${required}${bold}--output${reset}${normal} folder path where Playground Book will be created${reset}" + echo "" +} + ## # printHelpCompileClean() ## @@ -168,6 +185,8 @@ markdown() { --podfile ) printHelpPlayground; exit 1 ;; --cartfile ) printHelpPlayground; exit 1 ;; + --package ) printHelpPlaygroundBook; exit 1;; + --use-cache) printHelpCompile; exit 1 ;; --background) printHelpCarbon; exit 1 ;; @@ -181,6 +200,7 @@ markdown() { $JEKYLL ) printHelpJekyll; exit 1 ;; $CARBON ) printHelpCarbon; exit 1 ;; $PLAYGROUND ) printHelpPlayground; exit 1 ;; + $PLAYGROUND_BOOK) printHelpPlaygroundBook; exit 1 ;; $COMPILE ) printHelpCompile; exit 1 ;; $CLEAN ) printHelpClean; exit 1 ;; * ) printHelpMarkdown; echo "${bold}[!] ${normal}${red}error:${reset} invalid argument: ${red}$1${reset}"; exit 1 ;; @@ -221,6 +241,8 @@ jekyll() { --podfile ) printHelpPlayground; exit 1 ;; --cartfile ) printHelpPlayground; exit 1 ;; + --package ) printHelpPlaygroundBook; exit 1;; + --use-cache) printHelpCompile; exit 1 ;; --background) printHelpCarbon; exit 1 ;; @@ -234,6 +256,7 @@ jekyll() { $JEKYLL ) ;; $CARBON ) printHelpCarbon; exit 1 ;; $PLAYGROUND ) printHelpPlayground; exit 1 ;; + $PLAYGROUND_BOOK) printHelpPlaygroundBook; exit 1 ;; $COMPILE ) printHelpCompile; exit 1 ;; $CLEAN ) printHelpClean; exit 1 ;; * ) printHelpJekyll; echo "${bold}[!] ${normal}${red}error:${reset} invalid argument: ${red}$1${reset}"; exit 1 ;; @@ -280,6 +303,8 @@ carbon() { --podfile ) printHelpPlayground; exit 1 ;; --cartfile ) printHelpPlayground; exit 1 ;; + --package ) printHelpPlaygroundBook; exit 1;; + --use-cache) printHelpCompile; exit 1 ;; --background) shift; background=$1 ;; @@ -293,6 +318,7 @@ carbon() { $JEKYLL ) printHelpJekyll; exit 1;; $CARBON ) ;; $PLAYGROUND ) printHelpPlayground; exit 1 ;; + $PLAYGROUND_BOOK) printHelpPlaygroundBook; exit 1 ;; $COMPILE ) printHelpCompile; exit 1 ;; $CLEAN ) printHelpClean; exit 1 ;; * ) printHelpCarbon; echo "${bold}[!] ${normal}${red}error:${reset} invalid argument: ${red}$1${reset}"; exit 1 ;; @@ -336,6 +362,8 @@ playground() { --podfile ) shift; podfile=$1 ;; --cartfile ) shift; cartfile=$1 ;; + --package ) printHelpPlaygroundBook; exit 1;; + --use-cache) printHelpCompile; exit 1 ;; --background) printHelpCarbon; exit 1 ;; @@ -349,6 +377,7 @@ playground() { $JEKYLL ) printHelpJekyll; exit 1 ;; $CARBON ) printHelpCarbon; exit 1 ;; $PLAYGROUND ) ;; + $PLAYGROUND_BOOK) printHelpPlaygroundBook; exit 1 ;; $COMPILE ) printHelpCompile; exit 1 ;; $CLEAN ) printHelpClean; exit 1 ;; * ) printHelpPlayground $@; echo "${bold}[!] ${normal}${red}error:${reset} invalid argument: ${red}$1${reset}"; exit 1 ;; @@ -365,6 +394,62 @@ playground() { nefc install "$projectName.app" } +## +# playgroundBook(List args) +# - Parameter `args`: list of command line arguments +## +playgroundBook() { + projectName="" + packagePath="" + outputPath="" + + while [ "$1" != "" ]; do + case $2 in + -h | --help | help ) printHelpJekyll; exit 0 ;; + esac + + case $1 in + --project ) printHelpJekyll; exit 1 ;; + --output ) shift; outputPath=$1 ;; + --main-page ) printHelpJekyll; exit 1 ;; + + --name ) shift; projectName=$1 ;; + --platform ) printHelpPlayground; exit 1 ;; + --bow-version ) printHelpPlayground; exit 1 ;; + --bow-branch ) printHelpPlayground; exit 1 ;; + --podfile ) printHelpPlayground; exit 1 ;; + --cartfile ) printHelpPlayground; exit 1 ;; + + --package ) shift; packagePath=$1 ;; + + --use-cache) printHelpCompile; exit 1 ;; + + --background) printHelpCarbon; exit 1 ;; + --theme) printHelpCarbon; exit 1 ;; + --size) printHelpCarbon; exit 1 ;; + --font) printHelpCarbon; exit 1 ;; + --lines) printHelpCarbon; exit 1 ;; + --watermark) printHelpCarbon; exit 1 ;; + + $MARKDOWN ) printHelpMarkdown; exit 1 ;; + $JEKYLL ) printHelpJekyll; exit 1 ;; + $CARBON ) printHelpCarbon; exit 1 ;; + $PLAYGROUND ) printHelpPlayground; exit 1 ;; + $PLAYGROUND_BOOK) ;; + $COMPILE ) printHelpCompile; exit 1 ;; + $CLEAN ) printHelpClean; exit 1 ;; + * ) printHelpPlaygroundBook; echo "${bold}[!] ${normal}${red}error:${reset} invalid argument: ${red}$1${reset}"; exit 1 ;; + esac + shift + done + + if [ "$projectName" == "" ] || [ "$packagePath" == "" ] || [ "$outputPath" == "" ]; then + printHelpPlaygroundBook; exit 1 + else + nef-playground-book --name "$projectName" --package "$packagePath" --output "$outputPath" + fi +} + #: - Compile ## @@ -392,6 +477,8 @@ compile() { --podfile ) printHelpPlayground; exit 1 ;; --cartfile ) printHelpPlayground; exit 1 ;; + --package ) printHelpPlaygroundBook; exit 1;; + --use-cache) flag="--use-cache" ;; --background) printHelpCarbon; exit 1 ;; @@ -405,6 +492,7 @@ compile() { $JEKYLL ) printHelpJekyll; exit 1 ;; $CARBON ) printHelpCarbon; exit 1 ;; $PLAYGROUND ) printHelpPlayground; exit 1 ;; + $PLAYGROUND_BOOK) printHelpPlaygroundBook; exit 1 ;; $COMPILE ) shift; projectFolder=$1 ;; $CLEAN ) printHelpClean; exit 1 ;; * ) printHelpCompile; echo "${bold}[!] ${normal}${red}error:${reset} invalid argument: ${red}$1${reset}"; exit 1 ;; @@ -445,6 +533,8 @@ clean() { --podfile ) printHelpPlayground; exit 1 ;; --cartfile ) printHelpPlayground; exit 1 ;; + --package ) printHelpPlaygroundBook; exit 1;; + --use-cache) ;; --background) printHelpCarbon; exit 1 ;; @@ -458,6 +548,7 @@ clean() { $JEKYLL ) printHelpJekyll; exit 1 ;; $CARBON ) printHelpCarbon; exit 1 ;; $PLAYGROUND ) printHelpPlayground; exit 1 ;; + $PLAYGROUND_BOOK) printHelpPlaygroundBook; exit 1 ;; $COMPILE ) printHelpCompile; exit 1 ;; $CLEAN ) shift; projectFolder=$1 ;; * ) printHelpClean; echo "${bold}[!] ${normal}${red}error:${reset} invalid argument: ${red}$1${reset}"; exit 1 ;; @@ -477,12 +568,13 @@ set -e while [ "$1" != "" ]; do case $1 in - $MARKDOWN ) markdown $@; exit 0 ;; - $JEKYLL ) jekyll $@; exit 0 ;; - $CARBON ) carbon $@; exit 0 ;; - $PLAYGROUND ) playground $@; exit 0 ;; - $COMPILE ) compile $@; exit 0 ;; - $CLEAN ) clean $@; exit 0 ;; + $MARKDOWN ) markdown $@; exit 0 ;; + $JEKYLL ) jekyll $@; exit 0 ;; + $CARBON ) carbon $@; exit 0 ;; + $PLAYGROUND ) playground $@; exit 0 ;; + $PLAYGROUND_BOOK ) playgroundBook $@; exit 0;; + $COMPILE ) compile $@; exit 0 ;; + $CLEAN ) clean $@; exit 0 ;; -h | --help | help ) printHelp; exit 0 ;; -v | --version | version ) printVersion; exit 0 ;; * ) printHelp; echo "${bold}[!] ${normal}${red}error:${reset} invalid argument: ${red}$1${reset}"; exit 1 diff --git a/project/Component/NefSwiftPlayground/Errors/PlaygroundShellError.swift b/project/Component/NefSwiftPlayground/Errors/PlaygroundShellError.swift index 0350bfc6..aad9b416 100644 --- a/project/Component/NefSwiftPlayground/Errors/PlaygroundShellError.swift +++ b/project/Component/NefSwiftPlayground/Errors/PlaygroundShellError.swift @@ -8,3 +8,18 @@ public enum PlaygroundShellError: Error { case describe(repository: String) case linkPath(item: String) } + +extension PlaygroundShellError: CustomStringConvertible { + public var description: String { + switch self { + case .empty(let directory): + return "directory '\(directory)' is empty" + case .dependencies(let package): + return "could not resolve dependencies in package '\(package)'" + case .describe(let repository): + return "could not get information from repository '\(repository)'" + case .linkPath(let item): + return "could not follow symbolic links to item '\(item)'" + } + } +} diff --git a/project/Component/NefSwiftPlayground/Errors/SwiftPlaygroundError.swift b/project/Component/NefSwiftPlayground/Errors/SwiftPlaygroundError.swift index ab63e37e..c6db5a4d 100644 --- a/project/Component/NefSwiftPlayground/Errors/SwiftPlaygroundError.swift +++ b/project/Component/NefSwiftPlayground/Errors/SwiftPlaygroundError.swift @@ -6,7 +6,7 @@ public enum SwiftPlaygroundError: Error { case clean(item: String) case structure case package(packagePath: String) - case checkout + case checkout(info: String) case modules(_ paths: [String]) case playgroundBook(info: String) case ioError(info: String = "") @@ -19,15 +19,15 @@ public enum SwiftPlaygroundError: Error { return "could not create project structure" case .package(let path): return "could not build project 'Package.swift' :: \(path)" - case .checkout: - return "command 'swift package describe' failed" + case .checkout(let info): + return "command checkout failed: \(info)" case .modules(let paths): let packages = paths.map { $0.filename }.joined(separator: ", ") return "could not extract any module from packages: \(packages)" case .playgroundBook(let info): - return "could not create Playground Book (\(info))" + return "could not create Playground Book: \(info)" case .ioError(let info): - return "failure running IO \(info.isEmpty ? "" : "(\(info))")" + return "failure running IO \(info.isEmpty ? "" : ": \(info)")" } } } diff --git a/project/Component/NefSwiftPlayground/SwiftPlayground.swift b/project/Component/NefSwiftPlayground/SwiftPlayground.swift index 23178b04..aedef24a 100644 --- a/project/Component/NefSwiftPlayground/SwiftPlayground.swift +++ b/project/Component/NefSwiftPlayground/SwiftPlayground.swift @@ -105,8 +105,8 @@ public struct SwiftPlayground { private func buildPackage(content: String, packageFilePath: String, packagePath: String, buildPath: String) -> EnvIO<(FileSystem, PlaygroundShell), SwiftPlaygroundError, Void> { EnvIO { (system, shell) in - let writePackageIO = system.write(content: content, toFile: packageFilePath).mapLeft { _ in SwiftPlaygroundError.checkout } - let resolvePackageIO = shell.resolve(packagePath: packagePath, buildPath: buildPath).mapLeft { _ in SwiftPlaygroundError.checkout } + let writePackageIO = system.write(content: content, toFile: packageFilePath).mapLeft { e in SwiftPlaygroundError.checkout(info: e.description) } + let resolvePackageIO = shell.resolve(packagePath: packagePath, buildPath: buildPath).mapLeft { e in SwiftPlaygroundError.checkout(info: e.description) } return writePackageIO.followedBy(resolvePackageIO) } @@ -115,7 +115,7 @@ public struct SwiftPlayground { private func repositories(checkoutPath: String) -> EnvIO { EnvIO { fileSystem in fileSystem.items(atPath: checkoutPath) - .mapLeft { _ in .checkout } + .mapLeft { e in .checkout(info: e.description) } .map { repos in repos.filter { repo in !repo.filename.contains("swift-") } } } } diff --git a/project/Core/Render/CoreCarbon.swift b/project/Core/Render/CoreCarbon.swift index ead1ae5e..fe163e5b 100644 --- a/project/Core/Render/CoreCarbon.swift +++ b/project/Core/Render/CoreCarbon.swift @@ -22,7 +22,7 @@ public struct CarbonGenerator: InternalRender { return !trace.contains("☓") } - func render(node: Node) -> String { + internal func render(node: Node) -> String { return node.carbon(downloader: self) } } diff --git a/project/Core/Render/CoreJekyll.swift b/project/Core/Render/CoreJekyll.swift index 55fc4366..4e77363e 100644 --- a/project/Core/Render/CoreJekyll.swift +++ b/project/Core/Render/CoreJekyll.swift @@ -9,7 +9,7 @@ public struct JekyllGenerator: InternalRender { self.permalink = permalink } - func render(node: Node) -> String { + internal func render(node: Node) -> String { return node.jekyll(permalink: permalink) } } diff --git a/project/Core/Render/CoreMarkdown.swift b/project/Core/Render/CoreMarkdown.swift index 3ce7ff26..c0380d4f 100644 --- a/project/Core/Render/CoreMarkdown.swift +++ b/project/Core/Render/CoreMarkdown.swift @@ -5,7 +5,7 @@ import Foundation public struct MarkdownGenerator: InternalRender { public init() { } - func render(node: Node) -> String { + internal func render(node: Node) -> String { return node.markdown() } } diff --git a/project/Core/Render/CoreRender.swift b/project/Core/Render/CoreRender.swift index d3352f7d..6bb0c2fc 100644 --- a/project/Core/Render/CoreRender.swift +++ b/project/Core/Render/CoreRender.swift @@ -14,9 +14,14 @@ protocol CoreMarkdown { func markdown() -> String } +protocol CoreCarbon { + func carbon(downloader: CarbonCodeDownloader) -> String +} + // Dependencies extension Node: CoreJekyll {} extension Node: CoreMarkdown {} +extension Node: CoreCarbon {} // MARK: - default Render :: render(content:) protocol InternalRender: CoreRender { diff --git a/project/Package.swift b/project/Package.swift index 2c1a72a6..97a87ec9 100644 --- a/project/Package.swift +++ b/project/Package.swift @@ -10,7 +10,7 @@ let package = Package( .executable(name: "nef-markdown-page", targets: ["MarkdownPage"]), .executable(name: "nef-jekyll-page", targets: ["JekyllPage"]), .executable(name: "nef-carbon-page", targets: ["CarbonPage"]), - .executable(name: "nef-swift-playground", targets: ["SwiftPlayground"]), + .executable(name: "nef-playground-book", targets: ["PlaygroundBook"]), ], dependencies: [ .package(url: "https://github.com/bow-swift/bow", .branch("master")), @@ -39,6 +39,6 @@ let package = Package( .target(name: "MarkdownPage", dependencies: ["CLIKit", "NefMarkdown"], path: "UI/MarkdownPage"), .target(name: "JekyllPage", dependencies: ["CLIKit", "NefJekyll"], path: "UI/JekyllPage"), .target(name: "CarbonPage", dependencies: ["CLIKit", "NefCommon", "NefModels", "NefCore", "NefCarbon"], path: "UI/CarbonPage"), - .target(name: "SwiftPlayground", dependencies: ["BowEffects", "CLIKit", "nef"], path: "UI/SwiftPlayground"), + .target(name: "PlaygroundBook", dependencies: ["BowEffects", "CLIKit", "nef"], path: "UI/PlaygroundBook"), ] ) diff --git a/project/UI/SwiftPlayground/main.swift b/project/UI/PlaygroundBook/main.swift similarity index 72% rename from project/UI/SwiftPlayground/main.swift rename to project/UI/PlaygroundBook/main.swift index d9c0fa22..2f0b3a95 100644 --- a/project/UI/SwiftPlayground/main.swift +++ b/project/UI/PlaygroundBook/main.swift @@ -5,15 +5,15 @@ import CLIKit import nef import BowEffects -let SCRIPT_NAME = "nef-swift-playground" +let SCRIPT_NAME = "nef-playground-book" func main() { func arguments(console: CLIKit.Console) -> IO { - console.arguments(keys: ["package", "to", "name"]) + console.arguments(keys: ["name", "package", "output"]) .flatMap { args in - guard let packagePath = args["package"]?.expandingTildeInPath, - let outputPath = args["to"]?.expandingTildeInPath, - let projectName = args["name"], + guard let projectName = args["name"], + let packagePath = args["package"]?.expandingTildeInPath, + let outputPath = args["output"]?.expandingTildeInPath, let content = try? String(contentsOfFile: packagePath), !content.isEmpty else { return console.exit(failure: "received an invalid Swift Package") } @@ -26,11 +26,11 @@ func main() { let console = Console(script: SCRIPT_NAME, help: """ - \(SCRIPT_NAME) --package --to --name ") + \(SCRIPT_NAME) --name --package --output - package: path to Package.swift file. ex. `/home/Package.swift` - to: path where Playground is saved to. ex. `/home` name: name for the Swift Playground. ex. `nef` + package: path to Package.swift file. ex. `/home/Package.swift` + output: path where Playground is saved to. ex. `/home` """) @@ -39,8 +39,8 @@ func main() { nef.SwiftPlayground.render(packageContent: packageContent, name: projectName, output: output) .provide(console)^ .mapLeft { _ in .render } - .foldM({ _ in console.exit(failure: "render Playground Book") }, - { url in console.exit(success: "render Playground Book in '\(url.path)'") }) }^ + .foldM({ _ in console.exit(failure: "rendering Playground Book") }, + { url in console.exit(success: "rendered Playground Book in '\(url.path)'") }) }^ .unsafeRunSyncEither() } diff --git a/project/nef.xcodeproj/project.pbxproj b/project/nef.xcodeproj/project.pbxproj index c907c8e6..e661ce3c 100644 --- a/project/nef.xcodeproj/project.pbxproj +++ b/project/nef.xcodeproj/project.pbxproj @@ -322,7 +322,7 @@ 8BC8E94022D3A65D009740E4 /* CoreTestPlan.xctestplan */ = {isa = PBXFileReference; lastKnownFileType = text; path = CoreTestPlan.xctestplan; sourceTree = ""; }; 8BCDC71F22F0455D00174A19 /* CarbonViewer.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CarbonViewer.swift; sourceTree = ""; }; 8BD4E2F52388141E002DECDB /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = ""; }; - 8BD4E30A238814B1002DECDB /* nef-swift-playground */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "nef-swift-playground"; sourceTree = BUILT_PRODUCTS_DIR; }; + 8BD4E30A238814B1002DECDB /* nef-playground-book */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = "nef-playground-book"; sourceTree = BUILT_PRODUCTS_DIR; }; 8BD4E31D238817BB002DECDB /* NefSwiftPlayground.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = NefSwiftPlayground.framework; sourceTree = BUILT_PRODUCTS_DIR; }; 8BD4E31F238817BB002DECDB /* NefSwiftPlayground.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = NefSwiftPlayground.h; sourceTree = ""; }; 8BD4E320238817BB002DECDB /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; @@ -557,7 +557,7 @@ 8B3CB85A22D392C000919F36 /* MarkdownPage */, 8B3CB85422D392C000919F36 /* JekyllPage */, 8B3CB85822D392C000919F36 /* CarbonPage */, - 8BD4E2F4238802C2002DECDB /* SwiftPlayground */, + 8BD4E2F4238802C2002DECDB /* PlaygroundBook */, 8B0FB585237C0A5600221548 /* CLIKit */, ); path = UI; @@ -712,7 +712,7 @@ 8B22248322D5EAD500C85856 /* NefMarkdown.framework */, 8B12D79B22D6235200D05A70 /* NefJekyll.framework */, 8B0FB584237C0A5600221548 /* CLIKit.framework */, - 8BD4E30A238814B1002DECDB /* nef-swift-playground */, + 8BD4E30A238814B1002DECDB /* nef-playground-book */, 8BD4E31D238817BB002DECDB /* NefSwiftPlayground.framework */, 8BBD14AF2390179B0002970C /* NefCommon.framework */, ); @@ -771,12 +771,12 @@ path = Utils; sourceTree = ""; }; - 8BD4E2F4238802C2002DECDB /* SwiftPlayground */ = { + 8BD4E2F4238802C2002DECDB /* PlaygroundBook */ = { isa = PBXGroup; children = ( 8BD4E2F52388141E002DECDB /* main.swift */, ); - path = SwiftPlayground; + path = PlaygroundBook; sourceTree = ""; }; 8BD4E31E238817BB002DECDB /* NefSwiftPlayground */ = { @@ -1091,9 +1091,9 @@ productReference = 8BBD14AF2390179B0002970C /* NefCommon.framework */; productType = "com.apple.product-type.framework"; }; - 8BD4E309238814B1002DECDB /* SwiftPlayground */ = { + 8BD4E309238814B1002DECDB /* PlaygroundBook */ = { isa = PBXNativeTarget; - buildConfigurationList = 8BD4E30E238814B1002DECDB /* Build configuration list for PBXNativeTarget "SwiftPlayground" */; + buildConfigurationList = 8BD4E30E238814B1002DECDB /* Build configuration list for PBXNativeTarget "PlaygroundBook" */; buildPhases = ( 8BD4E306238814B1002DECDB /* Sources */, ); @@ -1102,12 +1102,12 @@ dependencies = ( 8BD4E31423881506002DECDB /* PBXTargetDependency */, ); - name = SwiftPlayground; + name = PlaygroundBook; packageProductDependencies = ( 8BD4E3572388369C002DECDB /* BowEffects */, ); productName = SwiftPlayground; - productReference = 8BD4E30A238814B1002DECDB /* nef-swift-playground */; + productReference = 8BD4E30A238814B1002DECDB /* nef-playground-book */; productType = "com.apple.product-type.tool"; }; 8BD4E31C238817BB002DECDB /* NefSwiftPlayground */ = { @@ -1258,7 +1258,7 @@ 8B424B1E224E28FC00AF9010 /* MarkdownPage */, 8B6FC584221ECE6A008F7694 /* JekyllPage */, 8B0CA51522AE669600181BC0 /* CarbonPage */, - 8BD4E309238814B1002DECDB /* SwiftPlayground */, + 8BD4E309238814B1002DECDB /* PlaygroundBook */, 8B0FB583237C0A5600221548 /* CLIKit */, 8BF75F8422CA71E700EC53A1 /* nef */, 8B22248222D5EAD500C85856 /* NefMarkdown */, @@ -2119,7 +2119,7 @@ CODE_SIGN_STYLE = Automatic; ENABLE_HARDENED_RUNTIME = NO; PRODUCT_BUNDLE_IDENTIFIER = com.fortysevendegrees.SwiftPlayground; - PRODUCT_NAME = "nef-swift-playground"; + PRODUCT_NAME = "nef-playground-book"; SWIFT_VERSION = 5.0; }; name = Debug; @@ -2131,7 +2131,7 @@ CODE_SIGN_STYLE = Automatic; ENABLE_HARDENED_RUNTIME = NO; PRODUCT_BUNDLE_IDENTIFIER = com.fortysevendegrees.SwiftPlayground; - PRODUCT_NAME = "nef-swift-playground"; + PRODUCT_NAME = "nef-playground-book"; SWIFT_VERSION = 5.0; }; name = Release; @@ -2406,7 +2406,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 8BD4E30E238814B1002DECDB /* Build configuration list for PBXNativeTarget "SwiftPlayground" */ = { + 8BD4E30E238814B1002DECDB /* Build configuration list for PBXNativeTarget "PlaygroundBook" */ = { isa = XCConfigurationList; buildConfigurations = ( 8BD4E30F238814B1002DECDB /* Debug */, diff --git a/project/nef.xcodeproj/xcshareddata/xcschemes/CLIKit.xcscheme b/project/nef.xcodeproj/xcshareddata/xcschemes/CLIKit.xcscheme new file mode 100644 index 00000000..aff5df3b --- /dev/null +++ b/project/nef.xcodeproj/xcshareddata/xcschemes/CLIKit.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/nef.xcodeproj/xcshareddata/xcschemes/NefCommon.xcscheme b/project/nef.xcodeproj/xcshareddata/xcschemes/NefCommon.xcscheme new file mode 100644 index 00000000..1af5bad3 --- /dev/null +++ b/project/nef.xcodeproj/xcshareddata/xcschemes/NefCommon.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/nef.xcodeproj/xcshareddata/xcschemes/NefModels.xcscheme b/project/nef.xcodeproj/xcshareddata/xcschemes/NefModels.xcscheme new file mode 100644 index 00000000..47d5b2ae --- /dev/null +++ b/project/nef.xcodeproj/xcshareddata/xcschemes/NefModels.xcscheme @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/project/nef.xcodeproj/xcshareddata/xcschemes/SwiftPlayground.xcscheme b/project/nef.xcodeproj/xcshareddata/xcschemes/PlaygroundBook.xcscheme similarity index 80% rename from project/nef.xcodeproj/xcshareddata/xcschemes/SwiftPlayground.xcscheme rename to project/nef.xcodeproj/xcshareddata/xcschemes/PlaygroundBook.xcscheme index f518bd08..049f0b4d 100644 --- a/project/nef.xcodeproj/xcshareddata/xcschemes/SwiftPlayground.xcscheme +++ b/project/nef.xcodeproj/xcshareddata/xcschemes/PlaygroundBook.xcscheme @@ -16,7 +16,7 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "8BD4E309238814B1002DECDB" BuildableName = "nef-swift-playground" - BlueprintName = "SwiftPlayground" + BlueprintName = "PlaygroundBook" ReferencedContainer = "container:nef.xcodeproj"> @@ -46,24 +46,10 @@ BuildableIdentifier = "primary" BlueprintIdentifier = "8BD4E309238814B1002DECDB" BuildableName = "nef-swift-playground" - BlueprintName = "SwiftPlayground" + BlueprintName = "PlaygroundBook" ReferencedContainer = "container:nef.xcodeproj"> - - - - - - - -