@@ -62,6 +62,8 @@ import org.gradle.external.javadoc.JavadocOutputLevel
62
62
import org.gradle.external.javadoc.MinimalJavadocOptions
63
63
import org.gradle.plugins.ide.eclipse.EclipsePlugin
64
64
import org.gradle.plugins.ide.idea.IdeaPlugin
65
+ import org.gradle.api.plugins.BasePluginExtension
66
+
65
67
import org.w3c.dom.NodeList
66
68
67
69
import javax.inject.Inject
@@ -669,7 +671,8 @@ class BuildPlugin implements Plugin<Project> {
669
671
// Set the pom's destination to the distribution directory
670
672
project. tasks. withType(GenerateMavenPom ). all { GenerateMavenPom pom ->
671
673
if (pom. name == " generatePomFileFor${ publication.name.capitalize()} Publication" ) {
672
- pom. destination = project. provider({" ${ project.buildDir} /distributions/${ project.archivesBaseName} -${ project.getVersion()} .pom" })
674
+ BasePluginExtension baseExtension = project. getExtensions(). getByType(BasePluginExtension . class);
675
+ pom. destination = project. provider({" ${ project.buildDir} /distributions/${ baseExtension.archivesName.get()} -${ project.getVersion()} .pom" })
673
676
}
674
677
}
675
678
@@ -728,7 +731,8 @@ class BuildPlugin implements Plugin<Project> {
728
731
private static void updateVariantPomLocationAndArtifactId (Project project , MavenPublication publication , SparkVariant variant ) {
729
732
// Add variant classifier to the pom file name if required
730
733
String classifier = variant. shouldClassifySparkVersion() && variant. isDefaultVariant() == false ? " -${ variant.getName()} " : ' '
731
- String filename = " ${ project.base.archivesName} _${ variant.scalaMajorVersion} -${ project.getVersion()}${ classifier} "
734
+ BasePluginExtension baseExtension = project. getExtensions(). getByType(BasePluginExtension . class);
735
+ String filename = " ${ baseExtension.archivesName.get()} _${ variant.scalaMajorVersion} -${ project.getVersion()}${ classifier} "
732
736
// Fix the pom name
733
737
project. tasks. withType(GenerateMavenPom ). all { GenerateMavenPom pom ->
734
738
if (pom. name == " generatePomFileFor${ publication.name.capitalize()} Publication" ) {
@@ -739,7 +743,7 @@ class BuildPlugin implements Plugin<Project> {
739
743
publication. getPom(). withXml { XmlProvider xml ->
740
744
Node root = xml. asNode()
741
745
Node artifactId = (root. get(' artifactId' ) as NodeList ). get(0 ) as Node
742
- artifactId. setValue(" ${ project.archivesBaseName } _${ variant.scalaMajorVersion} " )
746
+ artifactId. setValue(" ${ baseExtension.archivesName.get() } _${ variant.scalaMajorVersion} " )
743
747
}
744
748
}
745
749
0 commit comments