erik/kobalt
erik/kobalt
1
0
Fork 0
mirror of https://github.com/ethauvin/kobalt.git synced 2025-04-26 08:27:12 -07:00
Code Releases Activity

update to kotlin beta 4

Browse source
This commit is contained in:
Kirill Rakhman 2015-12-27 20:02:18 +01:00
parent e8f271fddf
commit 7c0dd710ea
8 changed files with 10 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/RepoFinder.kt
View file

@ -144,7 +144,7 @@ public class RepoFinder @Inject constructor(val executors: KobaltExecutors) {
val XPATH = XPATH_FACTORY.newXPath();
fun findCorrectVersionRelease(metadataPath: String, repoUrl: String): String? {
val XPATHS = arrayListOf(
val XPATHS = listOf(
XPATH.compile("/metadata/version"),
XPATH.compile("/metadata/versioning/latest"),
XPATH.compile("/metadata/versioning/release"))

5
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/KFiles.kt
View file

@ -283,9 +283,8 @@ class KFiles {
if (excludes.isEmpty()) {
return false
} else {
val ex = arrayListOf<PathMatcher>()
excludes.forEach {
ex.add(FileSystems.getDefault().getPathMatcher("glob:${it.spec}"))
val ex = excludes.map {
FileSystems.getDefault().getPathMatcher("glob:${it.spec}")
}
ex.forEach {
if (it.matches(Paths.get(file))) {

2
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/misc/RunCommand.kt
View file

@ -43,7 +43,7 @@ open class RunCommand(val command: String) {
"\n " + allArgs.joinToString(" "))
val process = pb.start()
pb.environment().let { pbEnv ->
env.forEach {
env.forEach {it ->
pbEnv.put(it.key, it.value)
}
}