Skip to content
This repository was archived by the owner on Aug 18, 2020. It is now read-only.

Escape plugin names in plugins.sbt and generated source files #95

Merged
merged 2 commits into from
Jul 22, 2019
Merged

Escape plugin names in plugins.sbt and generated source files #95

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e719b3f
Escape plugin names in fetched plugins.sbt
hlxid Jul 21, 2019
0c9c7bf
Replace illegal identifiers in generated getting started source files
hlxid Jul 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Escape plugin names in fetched plugins.sbt
  • Loading branch information
@hlxid
hlxid committed Jul 21, 2019
commit e719b3f1993f364594d5188bd74c9a56cd6e2adc
6 changes: 3 additions & 3 deletions project/SbtFile.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class SbtFile(var name: String, var version: String, var plugins: List[Plugin],

if (plugins.nonEmpty) {
for (plugin <- plugins) {
var pluginLine = "\nlazy val %s = (project in file(\"%s\"))".format(plugin.normalizedName, plugin.pluginDirectoryPath)
var pluginLine = "\nlazy val `%s` = (project in file(\"%s\"))".format(plugin.normalizedName, plugin.pluginDirectoryPath)

if (apiProjectPath != "") {
pluginLine += ".dependsOn(apiProject)"
Expand All @@ -79,8 +79,8 @@ class SbtFile(var name: String, var version: String, var plugins: List[Plugin],
}

if (defineRoot) {
var rootLine = "\n\nlazy val root = (project in file(\".\")).aggregate(apiProject,%s)"
.format(plugins.map(_.normalizedName).mkString(", "))
var rootLine = "\n\nlazy val root = (project in file(\".\")).aggregate(apiProject, %s)"
.format(plugins.map(p => s"`${p.normalizedName}`").mkString(", "))

if (apiProjectPath != "") {
rootLine += ".dependsOn(apiProject)"
Expand Down