diff --git a/config.toml b/config.toml index ab43bce..334b565 100644 --- a/config.toml +++ b/config.toml @@ -20,7 +20,6 @@ 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/" @@ -156,12 +155,14 @@ 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] diff --git a/src/main/kotlin/starter/Config.kt b/src/main/kotlin/starter/Config.kt index c116981..c625fc7 100644 --- a/src/main/kotlin/starter/Config.kt +++ b/src/main/kotlin/starter/Config.kt @@ -40,7 +40,7 @@ class Config { val repositories = cfg.configMap("repositories") .map { (name, values) -> - Repository(name, values["url"], values.getOrElse("default", false)) + Repository(name, values["url"]) } return StarterConfig(dependencies, inputs, repositories) diff --git a/src/main/kotlin/starter/Models.kt b/src/main/kotlin/starter/Models.kt index 57fee7d..f0a0886 100644 --- a/src/main/kotlin/starter/Models.kt +++ b/src/main/kotlin/starter/Models.kt @@ -20,7 +20,7 @@ data class Dependency( 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) diff --git a/src/main/kotlin/starter/Server.kt b/src/main/kotlin/starter/Server.kt index 748dc58..f7c6fe3 100644 --- a/src/main/kotlin/starter/Server.kt +++ b/src/main/kotlin/starter/Server.kt @@ -41,7 +41,7 @@ class Server( } 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) diff --git a/src/main/resources/starter/pom/@repositories.twig b/src/main/resources/starter/pom/@repositories.twig index d954ee0..cd82749 100644 --- a/src/main/resources/starter/pom/@repositories.twig +++ b/src/main/resources/starter/pom/@repositories.twig @@ -1,3 +1,4 @@ +{% if repositories is not empty %} {% for repo in repositories %} @@ -6,3 +7,4 @@ {% endfor %} +{% endif %}