diff options
author | Christopher Vogt <oss.nsp@cvogt.org> | 2016-05-26 09:47:28 -0400 |
---|---|---|
committer | Christopher Vogt <oss.nsp@cvogt.org> | 2016-05-26 09:47:28 -0400 |
commit | dbb012a5dcd4c0c9022f1be4db151b01c99fec43 (patch) | |
tree | b0927db0994426b51b7346e7f57d4bef3f19155c /stage2/Lib.scala | |
parent | d0a4199cdd8602f88d992b88f73443d89b722ab5 (diff) | |
download | cbt-dbb012a5dcd4c0c9022f1be4db151b01c99fec43.tar.gz cbt-dbb012a5dcd4c0c9022f1be4db151b01c99fec43.tar.bz2 cbt-dbb012a5dcd4c0c9022f1be4db151b01c99fec43.zip |
Fix scalaMajorVersion in artifact id
Diffstat (limited to 'stage2/Lib.scala')
-rw-r--r-- | stage2/Lib.scala | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/stage2/Lib.scala b/stage2/Lib.scala index 99f6a55..2523735 100644 --- a/stage2/Lib.scala +++ b/stage2/Lib.scala @@ -298,6 +298,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ groupId: String, artifactId: String, version: String, + scalaMajorVersion: String, name: String, description: String, url: URL, @@ -313,7 +314,7 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ <project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"> <modelVersion>4.0.0</modelVersion> <groupId>{groupId}</groupId> - <artifactId>{artifactId}</artifactId> + <artifactId>{artifactId ++ "_" ++ scalaMajorVersion}</artifactId> <version>{version}</version> <packaging>jar</packaging> <name>{name}</name> @@ -356,7 +357,8 @@ final class Lib(logger: Logger) extends Stage1Lib(logger) with Scaffold{ } </dependencies> </project> - val path = jarTarget.toString ++ ( "/" ++ artifactId ++ "-" ++ version ++ ".pom" ) + // FIXME: do not build this file name including scalaMajorVersion in multiple places + val path = jarTarget.toString ++ ( "/" ++ artifactId++ "_" ++ scalaMajorVersion ++ "-" ++ version ++ ".pom" ) val file = new File(path) Files.write(file.toPath, ("<?xml version='1.0' encoding='UTF-8'?>\n" ++ xml.toString).getBytes) file |