diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidFiles.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidFiles.kt index 5ba54f7f..dd93282f 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidFiles.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidFiles.kt @@ -21,10 +21,10 @@ class AndroidFiles { return KFiles.joinDir(dir, "AndroidManifest.xml") } - fun mergedResourcesNoVariant(project: Project, variant: Variant) = + fun mergedResourcesNoVariant(project: Project) = KFiles.joinAndMakeDir(AndroidFiles.intermediates(project), "res", "merged") fun mergedResources(project: Project, variant: Variant) = - KFiles.joinAndMakeDir(mergedResourcesNoVariant(project, variant), variant.toIntermediateDir()) + KFiles.joinAndMakeDir(mergedResourcesNoVariant(project), variant.toIntermediateDir()) } } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt index ab066f1f..6e8ed8b2 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/android/AndroidPlugin.kt @@ -15,7 +15,6 @@ import com.google.inject.Inject import com.google.inject.Singleton import java.io.File import java.io.FileInputStream -import java.net.URI import java.nio.file.Path import java.nio.file.Paths @@ -352,10 +351,11 @@ public class AndroidPlugin @Inject constructor(val javaCompiler: JavaCompiler, v } // IRepoContributor - override fun reposFor(project: Project?): List { + override fun reposFor(project: Project?): List { val home = androidHomeNoThrows(project) return if (home != null) { - listOf(Paths.get(KFiles.joinDir(home, "extras", "android", "m2repository")).toUri()) + val path = Paths.get(KFiles.joinDir(home, "extras", "android", "m2repository")) + listOf(HostInfo(path.toUri().toString())) } else { emptyList() }