From 734d2f801a47f272d79b99531815e19704146b37 Mon Sep 17 00:00:00 2001 From: Christopher Vogt Date: Tue, 28 Feb 2017 05:21:39 +0800 Subject: jar / doc refactor - split out manifest and scaladoc logic - refactor lib calls from inheritance layer - only strip project directory prefix from individually specified files --- stage2/PackageJars.scala | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'stage2/PackageJars.scala') diff --git a/stage2/PackageJars.scala b/stage2/PackageJars.scala index 0e4a444..7b6e844 100644 --- a/stage2/PackageJars.scala +++ b/stage2/PackageJars.scala @@ -10,20 +10,20 @@ trait PackageJars extends BaseBuild with ArtifactInfo{ Seq(() => jar, () => docJar, () => srcJar) )( _() ).flatten + + def jarFilePrefix = artifactId++"_"++scalaMajorVersion++"-"++version + def jar: Option[File] = taskCache[PackageJars]("jar").memoize{ - lib.jar( artifactId, scalaMajorVersion, version, exportedClasspath.files, jarTarget ) + lib.createJar( jarTarget / jarFilePrefix++".jar", exportedClasspath.files ) } def srcJar: Option[File] = taskCache[PackageJars]("srcJar").memoize{ - lib.srcJar( sources, artifactId, scalaMajorVersion, version, scalaTarget, sourceFileFilter, projectDirectory ) + lib.createJar( + jarTarget / jarFilePrefix++"-sources.jar", sourceFiles, Some(projectDirectory) + ) } def docJar: Option[File] = taskCache[PackageJars]("docJar").memoize{ - lib.docJar( - context.cbtLastModified, - scalaVersion, sourceFiles, compileClasspath, docTarget, - jarTarget, artifactId, scalaMajorVersion, version, - scalacOptions, context.paths.mavenCache - ) + lib.createJar( jarTarget / jarFilePrefix++"-javadoc.jar", scaladoc.toSeq ) } } -- cgit v1.2.3