From a5c3c93657fdb4f6179ed699d26f7c6471940c0b Mon Sep 17 00:00:00 2001 From: Cedric Beust Date: Thu, 5 Jan 2017 12:23:31 -0800 Subject: [PATCH] Set JAR_NAME correctly. --- .../src/main/kotlin/com/beust/kobalt/archive/Archives.kt | 2 -- .../kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Archives.kt b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Archives.kt index 21c254c2..2c72c7b6 100644 --- a/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Archives.kt +++ b/modules/kobalt-plugin-api/src/main/kotlin/com/beust/kobalt/archive/Archives.kt @@ -50,8 +50,6 @@ class Archives { context.logger.log(project.name, 3, " $result is up to date") } - project.projectProperties.put(JAR_NAME, result.absolutePath) - return result } diff --git a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt index a5f5e1b7..d27bea12 100644 --- a/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt +++ b/src/main/kotlin/com/beust/kobalt/plugin/packaging/PackagingPlugin.kt @@ -73,6 +73,8 @@ class PackagingPlugin @Inject constructor(val dependencyManager : DependencyMana { null }, { project -> try { + project.projectProperties.put(Archives.JAR_NAME, + context.variant.archiveName(project, null, ".jar")) packages.filter { it.project.name == project.name }.forEach { packageConfig -> packageConfig.jars.forEach { jarGenerator.generateJar(packageConfig.project, context, it) } packageConfig.wars.forEach { warGenerator.generateWar(packageConfig.project, context, it) }