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

Renaming.

Browse source
This commit is contained in:
Cedric Beust 2017-02-07 10:20:29 -08:00
parent 36d2953c8c
commit f037474f36
7 changed files with 35 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/KobaltContext.kt
View file

@ -12,7 +12,7 @@ import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.MavenId
import com.beust.kobalt.maven.PomGenerator
import com.beust.kobalt.maven.SimpleDep
import com.beust.kobalt.maven.aether.KobaltAether
import com.beust.kobalt.maven.aether.KobaltMavenResolver
import com.beust.kobalt.misc.KobaltExecutors
import java.io.File
@ -53,9 +53,9 @@ class KobaltContext(val args: Args) {
FileType.JAVADOC -> toQualifier(dep, "", "javadoc")
FileType.OTHER -> id
}
val resolved = aether.resolveToArtifact(fullId)
val resolved = resolver.resolve(fullId).artifact
if (resolved != null) {
return resolved.artifact.file
return resolved.file
} else {
throw KobaltException("Couldn't resolve $id")
}
@ -81,7 +81,7 @@ class KobaltContext(val args: Args) {
lateinit var executors: KobaltExecutors
lateinit var settings: KobaltSettings
lateinit var incrementalManager: IncrementalManager
lateinit var aether: KobaltAether
lateinit var resolver: KobaltMavenResolver
lateinit var pomGeneratorFactory: PomGenerator.IFactory
lateinit var logger: ILogger
}

8
modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/api/Project.kt
View file

@ -3,7 +3,7 @@ package com.beust.kobalt.api
import com.beust.kobalt.TestConfig
import com.beust.kobalt.api.annotation.Directive
import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.aether.KobaltAether
import com.beust.kobalt.maven.aether.KobaltMavenResolver
import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.kobaltLog
import org.apache.maven.model.Model
@ -148,8 +148,10 @@ class Dependencies(val project: Project,
dep: Array<out String>, optional: Boolean = false): List<Future<File>>
= with(dep.map {
val resolved =
if (KobaltAether.isRangeVersion(it)) {
val result = Kobalt.INJECTOR.getInstance(KobaltAether::class.java).resolve(it).dependency.id
if (KobaltMavenResolver.isRangeVersion(it)) {
// Range id
val node = Kobalt.INJECTOR.getInstance(KobaltMavenResolver::class.java).resolve(it)
val result = KobaltMavenResolver.artifactToId(node.artifact)
kobaltLog(2, "Resolved range id $it to $result")
result
} else {

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

@ -3,7 +3,6 @@ package com.beust.kobalt.maven
import com.beust.kobalt.KobaltException
import com.beust.kobalt.api.*
import com.beust.kobalt.maven.aether.Filters
import com.beust.kobalt.maven.aether.KobaltAether
import com.beust.kobalt.maven.aether.KobaltMavenResolver
import com.beust.kobalt.maven.aether.Scope
import com.beust.kobalt.maven.dependency.FileDependency
@ -18,8 +17,8 @@ import javax.inject.Inject
import javax.inject.Singleton
@Singleton
class DependencyManager @Inject constructor(val executors: KobaltExecutors, val aether: KobaltMavenResolver)
: IDependencyManager {
class DependencyManager @Inject constructor(val executors: KobaltExecutors,
val resolver: KobaltMavenResolver) : IDependencyManager {
companion object {
fun create(id: String, optional: Boolean = false, projectDirectory: String? = null) =
@ -62,10 +61,10 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
* Create an IClasspathDependency from a Maven id.
*/
override fun createMaven(id: String, optional: Boolean) : IClasspathDependency=
if (KobaltAether.isRangeVersion(id)) {
Kobalt.INJECTOR.getInstance(KobaltAether::class.java).resolve(id).dependency
if (KobaltMavenResolver.isRangeVersion(id)) {
Kobalt.INJECTOR.getInstance(KobaltMavenResolver::class.java).resolveToDependencies(id)[0]
} else {
aether.create(id, optional)
resolver.create(id, optional)
}
/**
@ -163,7 +162,7 @@ class DependencyManager @Inject constructor(val executors: KobaltExecutors, val
dependencies.forEach {
result.add(it)
if (it.isMaven) {
val resolved = aether.resolveToIds(it.id, null, dependencyFilter)
val resolved = resolver.resolveToIds(it.id, null, dependencyFilter)
result.addAll(resolved.map { create(it) })
}
}

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

@ -24,6 +24,14 @@ import org.eclipse.aether.resolution.VersionRangeResult
class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings,
localRepo: LocalRepo, eventBus: EventBus) {
companion object {
fun artifactToId(artifact: Artifact) = artifact.let {
MavenId.toId(it.groupId, it.artifactId, it.extension, it.classifier, it.version)
}
fun isRangeVersion(id: String) = id.contains(",")
}
fun resolve(id: String, scope: Scope? = null, filter: DependencyFilter? = null): DependencyNode {
val dependencyRequest = DependencyRequest(createCollectRequest(id, scope), filter)
val result = system.resolveDependencies(session, dependencyRequest)
@ -69,10 +77,6 @@ class KobaltMavenResolver @Inject constructor(val settings: KobaltSettings,
directDependencies(id, scope)
}
fun artifactToId(artifact: Artifact) = artifact.let {
MavenId.toId(it.groupId, it.artifactId, it.extension, it.classifier, it.version)
}
private fun resolveVersion(artifact: Artifact): VersionRangeResult? {
val request = VersionRangeRequest(artifact, kobaltRepositories, null)
val result = system.resolveVersionRange(session, request)

6
src/main/kotlin/com/beust/kobalt/app/BuildFileCompiler.kt
View file

@ -16,7 +16,7 @@ import com.beust.kobalt.internal.build.BuildFile
import com.beust.kobalt.internal.build.VersionFile
import com.beust.kobalt.maven.DependencyManager
import com.beust.kobalt.maven.PomGenerator
import com.beust.kobalt.maven.aether.KobaltAether
import com.beust.kobalt.maven.aether.KobaltMavenResolver
import com.beust.kobalt.misc.KFiles
import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.kobaltLog
@ -37,7 +37,7 @@ class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val buildFil
val dependencyManager: DependencyManager, val pluginProperties: PluginProperties,
val executors: KobaltExecutors, val buildScriptUtil: BuildScriptUtil, val settings: KobaltSettings,
val incrementalManagerFactory: IncrementalManager.IFactory, val args: Args,
val aether: KobaltAether, val pomGeneratorFactory: PomGenerator.IFactory,
val resolver: KobaltMavenResolver, val pomGeneratorFactory: PomGenerator.IFactory,
val parallelLogger: ParallelLogger) {
interface IFactory {
@ -58,7 +58,7 @@ class BuildFileCompiler @Inject constructor(@Assisted("buildFiles") val buildFil
context.executors = executors
context.settings = settings
context.incrementalManager = incrementalManagerFactory.create()
context.aether = aether
context.resolver = resolver
context.pomGeneratorFactory = pomGeneratorFactory
context.logger = parallelLogger
Kobalt.context = context

11
src/test/kotlin/com/beust/kobalt/TestModule.kt
View file

@ -6,8 +6,7 @@ import com.beust.kobalt.internal.ILogger
import com.beust.kobalt.internal.KobaltSettings
import com.beust.kobalt.internal.KobaltSettingsXml
import com.beust.kobalt.maven.LocalRepo
import com.beust.kobalt.maven.aether.Aether
import com.beust.kobalt.maven.aether.KobaltAether
import com.beust.kobalt.maven.aether.KobaltMavenResolver
import com.google.common.eventbus.EventBus
import com.google.inject.Provider
import com.google.inject.Scopes
@ -25,12 +24,12 @@ class TestModule : MainModule(Args(), TEST_KOBALT_SETTINGS) {
override fun configureTest() {
val localRepo = TestLocalRepo()
bind(LocalRepo::class.java).toInstance(localRepo)
val localAether = Aether(LOCAL_CACHE, TEST_KOBALT_SETTINGS, EventBus())
val testAether = KobaltAether(KobaltSettings(KobaltSettingsXml()), localAether)
bind(KobaltAether::class.java).to(testAether)
// val localAether = Aether(LOCAL_CACHE, TEST_KOBALT_SETTINGS, EventBus())
val testResolver = KobaltMavenResolver(KobaltSettings(KobaltSettingsXml()), TestLocalRepo(), EventBus())
bind(KobaltMavenResolver::class.java).to(testResolver)
bind(KobaltContext::class.java).toProvider(Provider<KobaltContext> {
KobaltContext(args).apply {
aether = testAether
resolver = testResolver
logger = object: ILogger {
override fun log(tag: CharSequence, level: Int, message: CharSequence, newLine: Boolean) {
println("TestLog: [$tag $level] " + message)

9
src/test/kotlin/com/beust/kobalt/maven/DownloadTest.kt
View file

@ -2,7 +2,7 @@ package com.beust.kobalt.maven
import com.beust.kobalt.HostConfig
import com.beust.kobalt.KobaltTest
import com.beust.kobalt.maven.aether.KobaltAether
import com.beust.kobalt.maven.aether.KobaltMavenResolver
import com.beust.kobalt.misc.KobaltExecutors
import com.beust.kobalt.misc.warn
import org.testng.Assert
@ -16,9 +16,8 @@ import kotlin.properties.Delegates
@Test
class DownloadTest @Inject constructor(
val localRepo: LocalRepo,
val pomFactory: Pom.IFactory,
val dependencyManager: DependencyManager,
val aether: KobaltAether,
val resolver: KobaltMavenResolver,
val executors: KobaltExecutors) : KobaltTest() {
private var executor: ExecutorService by Delegates.notNull()
@ -153,8 +152,8 @@ class DownloadTest @Inject constructor(
// since snapshots are not allowed to be returned when looking up a versionless id)
val host = HostConfig("http://repository.jetbrains.com/all/")
val id = "com.squareup.moshi:moshi:1.1.0"
val dr = aether.resolve(id)
Assert.assertEquals(dr.dependency.version, "1.1.0")
val dr = resolver.resolve(id)
Assert.assertEquals(dr.dependency.artifact.version, "1.1.0")
}
@Test