Compare commits
No commits in common. "0d47b51f3feff8608b8672c6b85860d331d16458" and "2c0a1e44ec1d7cb6a4212e5e8fbefaba3741da82" have entirely different histories.
0d47b51f3f
...
2c0a1e44ec
@ -20,6 +20,7 @@ display = "Kotlin Version"
|
||||
|
||||
[repositories.jcenter]
|
||||
url = "https://jcenter.bintray.com"
|
||||
default = true # TODO: find where this is needed
|
||||
|
||||
[repositories.arrow]
|
||||
url = "https://dl.bintray.com/arrow-kt/arrow-kt/"
|
||||
@ -155,14 +156,12 @@ groupId = "org.kodein.di"
|
||||
artifactId = "kodein-di-jvm"
|
||||
version = "7.0.0"
|
||||
category = "injection"
|
||||
repository = "jcenter"
|
||||
|
||||
[dependencies.Koin]
|
||||
groupId = "org.koin"
|
||||
artifactId = "koin-core"
|
||||
version = "2.1.6"
|
||||
category = "injection"
|
||||
repository = "jcenter"
|
||||
default = true
|
||||
|
||||
[dependencies.Jackson]
|
||||
|
||||
@ -40,7 +40,7 @@ class Config {
|
||||
|
||||
val repositories = cfg.configMap("repositories")
|
||||
.map { (name, values) ->
|
||||
Repository(name, values["url"])
|
||||
Repository(name, values["url"], values.getOrElse("default", false))
|
||||
}
|
||||
|
||||
return StarterConfig(dependencies, inputs, repositories)
|
||||
|
||||
@ -20,7 +20,7 @@ data class Dependency(
|
||||
val repository: String?,
|
||||
)
|
||||
|
||||
data class Repository(val name: String, val url: String)
|
||||
data class Repository(val name: String, val url: String, val default: Boolean)
|
||||
|
||||
data class Input(val name: String, val display: String, val value: String? = null)
|
||||
|
||||
|
||||
@ -9,12 +9,11 @@ class ProjectZip(private val templates: List<Template>) {
|
||||
fun createZip(project: Project): String {
|
||||
val name: String
|
||||
|
||||
val projectName = sanitizeFilename(project.name)
|
||||
ZipOutput(projectName).use { zip ->
|
||||
ZipOutput(sanitizeFilename(project.name)).use { zip ->
|
||||
name = zip.name
|
||||
|
||||
templates.filter { it.enabled(project) }.forEach { template ->
|
||||
zip.write(projectName + "/" + template.path(project), template.render(project))
|
||||
zip.write(template.path(project), template.render(project))
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -41,7 +41,7 @@ class Server(
|
||||
}
|
||||
|
||||
val repositories = conf.repositories
|
||||
.filter { repo -> repo.name in deps.mapNotNull { it.repository } }
|
||||
.filter { repo -> repo.default || repo.name in deps.mapNotNull { it.repository } }
|
||||
|
||||
val project = Project(projectName, basePackage, inputs, deps, repositories)
|
||||
|
||||
|
||||
@ -1,9 +1,4 @@
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>org.jetbrains.kotlin</groupId>
|
||||
<artifactId>kotlin-stdlib-jdk8</artifactId>
|
||||
<version>${kotlin.version}</version>
|
||||
</dependency>
|
||||
{% for dep in dependencies %}
|
||||
<dependency>
|
||||
<groupId>{{ dep.groupId }}</groupId>
|
||||
@ -14,4 +9,4 @@
|
||||
{% endif %}
|
||||
</dependency>
|
||||
{% endfor %}
|
||||
</dependencies>
|
||||
</dependencies>
|
||||
@ -1,4 +1,3 @@
|
||||
{% if repositories is not empty %}
|
||||
<repositories>
|
||||
{% for repo in repositories %}
|
||||
<repository>
|
||||
@ -7,4 +6,3 @@
|
||||
</repository>
|
||||
{% endfor %}
|
||||
</repositories>
|
||||
{% endif %}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user