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

Remove TEST_DIR.

Browse source
This commit is contained in:
Cedric Beust 2016-03-25 11:25:26 +04:00
parent a47e66c20b
commit fff031c4cc
1 changed files with 21 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

38
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/maven/aether/Aether.kt
View file

@ -3,12 +3,12 @@ package com.beust.kobalt.maven.aether
import com.beust.kobalt.KobaltException import com.beust.kobalt.KobaltException
import com.beust.kobalt.api.IClasspathDependency import com.beust.kobalt.api.IClasspathDependency
import com.beust.kobalt.api.Kobalt import com.beust.kobalt.api.Kobalt
import com.beust.kobalt.homeDir import com.beust.kobalt.internal.KobaltSettings
import com.beust.kobalt.maven.CompletedFuture import com.beust.kobalt.maven.CompletedFuture
import com.beust.kobalt.misc.KobaltLogger
import com.beust.kobalt.misc.Versions import com.beust.kobalt.misc.Versions
import com.beust.kobalt.misc.log import com.beust.kobalt.misc.log
import com.beust.kobalt.misc.warn import com.beust.kobalt.misc.warn
import com.google.inject.Inject
import org.eclipse.aether.artifact.Artifact import org.eclipse.aether.artifact.Artifact
import org.eclipse.aether.artifact.DefaultArtifact import org.eclipse.aether.artifact.DefaultArtifact
import org.eclipse.aether.collection.CollectRequest import org.eclipse.aether.collection.CollectRequest
@ -25,11 +25,11 @@ import org.eclipse.aether.util.filter.DependencyFilterUtils
import java.io.File import java.io.File
import java.util.concurrent.Future import java.util.concurrent.Future
val TEST_DIR = ".aether/repository"
class DependencyResult(val dependency: IClasspathDependency, val repoUrl: String) class DependencyResult(val dependency: IClasspathDependency, val repoUrl: String)
class KobaltAether(val localRepo: File = File(homeDir(TEST_DIR))) { class KobaltAether @Inject constructor (val settings: KobaltSettings) {
val localRepo: File get() = File(settings.localRepo)
companion object { companion object {
val aether : KobaltAether get() = Kobalt.INJECTOR.getInstance(KobaltAether::class.java) val aether : KobaltAether get() = Kobalt.INJECTOR.getInstance(KobaltAether::class.java)
@ -71,7 +71,7 @@ class ExcludeOptionalDependencyFilter: DependencyFilter {
} }
} }
class Aether(val localRepo: File = File(homeDir(TEST_DIR))) { class Aether(val localRepo: File) {
private val system = Booter.newRepositorySystem() private val system = Booter.newRepositorySystem()
private val session = Booter.newRepositorySystemSession(system, localRepo) private val session = Booter.newRepositorySystemSession(system, localRepo)
private val classpathFilter = AndDependencyFilter( private val classpathFilter = AndDependencyFilter(
@ -152,6 +152,10 @@ class Aether(val localRepo: File = File(homeDir(TEST_DIR))) {
} }
class AetherDependency(val artifact: Artifact): IClasspathDependency, Comparable<AetherDependency> { class AetherDependency(val artifact: Artifact): IClasspathDependency, Comparable<AetherDependency> {
val settings : KobaltSettings get() = Kobalt.INJECTOR.getInstance(KobaltSettings::class.java)
val localRepo : File get() = File(settings.localRepo)
val aether: Aether get() = Aether(localRepo)
constructor(node: DependencyNode) : this(node.artifact) {} constructor(node: DependencyNode) : this(node.artifact) {}
override val id: String = toId(artifact) override val id: String = toId(artifact)
@ -166,11 +170,11 @@ class AetherDependency(val artifact: Artifact): IClasspathDependency, Comparable
get() = if (artifact.file != null) { get() = if (artifact.file != null) {
CompletedFuture(artifact.file) CompletedFuture(artifact.file)
} else { } else {
val td = Aether().transitiveDependencies(artifact) val td = aether.transitiveDependencies(artifact)
if (td?.root?.artifact?.file != null) { if (td?.root?.artifact?.file != null) {
CompletedFuture(td!!.root.artifact.file) CompletedFuture(td!!.root.artifact.file)
} else { } else {
val resolved = Aether().resolve(artifact) val resolved = Aether(localRepo).resolve(artifact)
if (resolved != null && resolved.size > 0) { if (resolved != null && resolved.size > 0) {
CompletedFuture(resolved[0].artifact.file) CompletedFuture(resolved[0].artifact.file)
} else { } else {
@ -191,8 +195,8 @@ class AetherDependency(val artifact: Artifact): IClasspathDependency, Comparable
override fun directDependencies() : List<IClasspathDependency> { override fun directDependencies() : List<IClasspathDependency> {
val result = arrayListOf<IClasspathDependency>() val result = arrayListOf<IClasspathDependency>()
val deps = Aether().directDependencies(artifact) val deps = aether.directDependencies(artifact)
val td = Aether().transitiveDependencies(artifact) val td = aether.transitiveDependencies(artifact)
if (deps != null) { if (deps != null) {
if (! deps.root.dependency.optional) { if (! deps.root.dependency.optional) {
deps.root.children.forEach { deps.root.children.forEach {
@ -221,10 +225,10 @@ class AetherDependency(val artifact: Artifact): IClasspathDependency, Comparable
override fun toString() = id override fun toString() = id
} }
fun main(argv: Array<String>) { //fun main(argv: Array<String>) {
KobaltLogger.LOG_LEVEL = 2 // KobaltLogger.LOG_LEVEL = 2
val aether = Aether() // val aether = Aether()
val latestResult = aether.latestArtifact("org.testng", "testng") // val latestResult = aether.latestArtifact("org.testng", "testng")
val latest = latestResult.artifact // val latest = latestResult.artifact
println("Latest: " + latest.version + " " + latest.file) // println("Latest: " + latest.version + " " + latest.file)
} //}