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

Update to 2423.

Browse source
This commit is contained in:
Cedric Beust 2015-11-17 06:04:59 -08:00
parent 7fee4b0969
commit 2f3773f13b
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
kobalt/src/Build.kt
View file

@ -1,11 +1,9 @@
import com.beust.kobalt.TaskResult
import com.beust.kobalt.*
import com.beust.kobalt.api.License
import com.beust.kobalt.api.Project
import com.beust.kobalt.api.Scm
import com.beust.kobalt.api.annotation.Task
import com.beust.kobalt.file
import com.beust.kobalt.homeDir
import com.beust.kobalt.plugin.application.application
import com.beust.kobalt.plugin.java.javaCompiler
import com.beust.kobalt.plugin.java.javaProject
@ -20,6 +18,8 @@ import java.nio.file.Files
import java.nio.file.Paths
import java.nio.file.StandardCopyOption
val r = repos("http://dl.bintray.com/kotlin/kotlinx.dom")
val wrapper = javaProject {
name = "kobalt-wrapper"
version = readVersion()
@ -60,9 +60,10 @@ val kobalt = kotlinProject(wrapper) {
}
dependencies {
compile("org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-1038",
"org.jetbrains.kotlin:kotlin-compiler-embeddable:1.0.0-beta-1038",
"org.jetbrains.dokka:dokka-fatjar:0.9.1",
compile("org.jetbrains.kotlin:kotlin-stdlib:1.0.0-beta-2423",
"org.jetbrains.kotlin:kotlin-compiler-embeddable:1.0.0-beta-2423",
"org.jetbrains.dokka:dokka-fatjar:0.9.2",
"org.jetbrains.kotlinx:kotlinx.dom:0.0.2",
// file(homeDir("java/jcommander/target/jcommander-1.47.jar")),
"com.beust:jcommander:1.48",

7
src/main/kotlin/com/beust/kobalt/maven/Pom.kt
View file

@ -1,15 +1,14 @@
package com.beust.kobalt.maven
import com.beust.kobalt.misc.toString
import com.beust.kobalt.misc.log
import com.beust.kobalt.misc.toString
import com.google.inject.assistedinject.Assisted
import org.jetbrains.kotlin.codegen.intrinsics.ToString
import kotlinx.dom.childElements
import org.w3c.dom.Element
import org.w3c.dom.NodeList
import org.xml.sax.InputSource
import java.io.FileReader
import javax.xml.xpath.XPathConstants
import kotlin.dom.childElements
public class Pom @javax.inject.Inject constructor(@Assisted val id: String,
@Assisted documentFile: java.io.File) {
@ -60,7 +59,7 @@ public class Pom @javax.inject.Inject constructor(@Assisted val id: String,
init {
val DEPENDENCIES = XPATH.compile("/project/dependencies/dependency")
val document = kotlin.dom.parseXml(InputSource(FileReader(documentFile)))
val document = kotlinx.dom.parseXml(InputSource(FileReader(documentFile)))
groupId = XPATH.compile("/project/groupId").evaluate(document)
artifactId = XPATH.compile("/project/artifactId").evaluate(document)
version = XPATH.compile("/project/version").evaluate(document)

2
src/main/kotlin/com/beust/kobalt/maven/RepoFinder.kt
View file

@ -15,7 +15,7 @@ import java.util.concurrent.TimeUnit
import javax.inject.Inject
import javax.xml.xpath.XPathConstants
import javax.xml.xpath.XPathFactory
import kotlin.dom.parseXml
import kotlinx.dom.parseXml
/**
* Find the repo that contains the given dependency among a list of repos. Searches are performed in parallel and