From c6009a6a1e4d526da15a88bf12fdd4cc5c770e05 Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Sat, 12 Dec 2015 23:06:29 -0800 Subject: [PATCH] Remove the local Maven repo from defaults. --- .../kotlin/com/beust/kobalt/BuildScript.kt | 3 +++ src/main/kotlin/com/beust/kobalt/Constants.kt | 8 ++++++++ src/main/kotlin/com/beust/kobalt/api/Kobalt.kt | 18 +++++------------- 3 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main/kotlin/com/beust/kobalt/BuildScript.kt b/src/main/kotlin/com/beust/kobalt/BuildScript.kt index 11a783fd..c3c8981c 100644 --- a/src/main/kotlin/com/beust/kobalt/BuildScript.kt +++ b/src/main/kotlin/com/beust/kobalt/BuildScript.kt @@ -11,6 +11,9 @@ import java.io.File fun homeDir(vararg dirs: String) : String = SystemProperties.homeDir + File.separator + dirs.toArrayList().joinToString(File.separator) +@Directive +fun localMavenRepo() = homeDir(".m2" + File.separator + "repository/") + @Directive fun file(file: String) : String = FileDependency.PREFIX_FILE + file diff --git a/src/main/kotlin/com/beust/kobalt/Constants.kt b/src/main/kotlin/com/beust/kobalt/Constants.kt index 56fe4f09..773c1097 100644 --- a/src/main/kotlin/com/beust/kobalt/Constants.kt +++ b/src/main/kotlin/com/beust/kobalt/Constants.kt @@ -3,4 +3,12 @@ package com.beust.kobalt object Constants { val BUILD_FILE_NAME = "Build.kt" val BUILD_FILE_DIRECTORY = "kobalt/src" + + internal val DEFAULT_REPOS = listOf( + "http://repo1.maven.org/maven2/", + "https://maven-central.storage.googleapis.com/", + "https://repository.jboss.org/nexus/content/repositories/root_repository/", + "https://jcenter.bintray.com/" + ) + } diff --git a/src/main/kotlin/com/beust/kobalt/api/Kobalt.kt b/src/main/kotlin/com/beust/kobalt/api/Kobalt.kt index 32f324a7..a84fe52d 100644 --- a/src/main/kotlin/com/beust/kobalt/api/Kobalt.kt +++ b/src/main/kotlin/com/beust/kobalt/api/Kobalt.kt @@ -1,10 +1,12 @@ package com.beust.kobalt.api -import com.beust.kobalt.* +import com.beust.kobalt.Args +import com.beust.kobalt.Constants +import com.beust.kobalt.HostConfig +import com.beust.kobalt.Plugins import com.beust.kobalt.misc.MainModule import com.google.inject.Guice import com.google.inject.Injector -import java.io.File import java.io.InputStream import java.util.* @@ -17,17 +19,7 @@ public class Kobalt { var context: KobaltContext? = null - val MAVEN_REPO = homeDir(".m2" + File.separator + "repository/") - - private val DEFAULT_REPOS = listOf( - "http://repo1.maven.org/maven2/", - "https://maven-central.storage.googleapis.com/", - "https://repository.jboss.org/nexus/content/repositories/root_repository/", - "https://jcenter.bintray.com/", - if (File(MAVEN_REPO).exists()) file(MAVEN_REPO) else "" - ).filter { it != "" } - - val repos = HashSet(DEFAULT_REPOS.map { HostConfig(it) }) + val repos = HashSet(Constants.DEFAULT_REPOS.map { HostConfig(it) }) fun addRepo(repo: HostConfig) = repos.add( if (repo.url.endsWith("/")) repo