1
0

Compare commits

...

3 Commits

7 changed files with 16 additions and 7 deletions

View File

@ -20,7 +20,6 @@ display = "Kotlin Version"
[repositories.jcenter] [repositories.jcenter]
url = "https://jcenter.bintray.com" url = "https://jcenter.bintray.com"
default = true # TODO: find where this is needed
[repositories.arrow] [repositories.arrow]
url = "https://dl.bintray.com/arrow-kt/arrow-kt/" url = "https://dl.bintray.com/arrow-kt/arrow-kt/"
@ -156,12 +155,14 @@ groupId = "org.kodein.di"
artifactId = "kodein-di-jvm" artifactId = "kodein-di-jvm"
version = "7.0.0" version = "7.0.0"
category = "injection" category = "injection"
repository = "jcenter"
[dependencies.Koin] [dependencies.Koin]
groupId = "org.koin" groupId = "org.koin"
artifactId = "koin-core" artifactId = "koin-core"
version = "2.1.6" version = "2.1.6"
category = "injection" category = "injection"
repository = "jcenter"
default = true default = true
[dependencies.Jackson] [dependencies.Jackson]

View File

@ -40,7 +40,7 @@ class Config {
val repositories = cfg.configMap("repositories") val repositories = cfg.configMap("repositories")
.map { (name, values) -> .map { (name, values) ->
Repository(name, values["url"], values.getOrElse("default", false)) Repository(name, values["url"])
} }
return StarterConfig(dependencies, inputs, repositories) return StarterConfig(dependencies, inputs, repositories)

View File

@ -20,7 +20,7 @@ data class Dependency(
val repository: String?, val repository: String?,
) )
data class Repository(val name: String, val url: String, val default: Boolean) data class Repository(val name: String, val url: String)
data class Input(val name: String, val display: String, val value: String? = null) data class Input(val name: String, val display: String, val value: String? = null)

View File

@ -9,11 +9,12 @@ class ProjectZip(private val templates: List<Template>) {
fun createZip(project: Project): String { fun createZip(project: Project): String {
val name: String val name: String
ZipOutput(sanitizeFilename(project.name)).use { zip -> val projectName = sanitizeFilename(project.name)
ZipOutput(projectName).use { zip ->
name = zip.name name = zip.name
templates.filter { it.enabled(project) }.forEach { template -> templates.filter { it.enabled(project) }.forEach { template ->
zip.write(template.path(project), template.render(project)) zip.write(projectName + "/" + template.path(project), template.render(project))
} }
} }

View File

@ -41,7 +41,7 @@ class Server(
} }
val repositories = conf.repositories val repositories = conf.repositories
.filter { repo -> repo.default || repo.name in deps.mapNotNull { it.repository } } .filter { repo -> repo.name in deps.mapNotNull { it.repository } }
val project = Project(projectName, basePackage, inputs, deps, repositories) val project = Project(projectName, basePackage, inputs, deps, repositories)

View File

@ -1,4 +1,9 @@
<dependencies> <dependencies>
<dependency>
<groupId>org.jetbrains.kotlin</groupId>
<artifactId>kotlin-stdlib-jdk8</artifactId>
<version>${kotlin.version}</version>
</dependency>
{% for dep in dependencies %} {% for dep in dependencies %}
<dependency> <dependency>
<groupId>{{ dep.groupId }}</groupId> <groupId>{{ dep.groupId }}</groupId>
@ -9,4 +14,4 @@
{% endif %} {% endif %}
</dependency> </dependency>
{% endfor %} {% endfor %}
</dependencies> </dependencies>

View File

@ -1,3 +1,4 @@
{% if repositories is not empty %}
<repositories> <repositories>
{% for repo in repositories %} {% for repo in repositories %}
<repository> <repository>
@ -6,3 +7,4 @@
</repository> </repository>
{% endfor %} {% endfor %}
</repositories> </repositories>
{% endif %}