From 15c43dec0f6f43b438c6ca08d03506000e518597 Mon Sep 17 00:00:00 2001 From: anttil <anttil> Date: Tue, 1 Apr 2014 07:31:30 +0000 Subject: [PATCH] SWE-22 / SSDM-16: remove task.execute() from source jar generation SVN: 31251 --- gradle/javaproject.gradle | 14 +++----------- 1 file changed, 3 insertions(+), 11 deletions(-) diff --git a/gradle/javaproject.gradle b/gradle/javaproject.gradle index f51078a30d3..09367092a1b 100644 --- a/gradle/javaproject.gradle +++ b/gradle/javaproject.gradle @@ -192,27 +192,19 @@ task testJar(type: Jar, dependsOn: testClasses) { from sourceSets.test.output } -jar { - doLast { - tasks.sourcesJar.execute() - } -} - task sourcesJar(type: Jar) { classifier = 'sources' from sourceSets.main.allSource - - doLast { - tasks.sourceJarForEclipseLaunchConfigs.execute() - } } -task sourceJarForEclipseLaunchConfigs(type: Copy) { +task sourceJarForEclipseLaunchConfigs(type: Copy, dependsOn: sourcesJar) { into sourcesJar.destinationDir from sourcesJar.archivePath rename '.*', 'sources.jar' } +jar.dependsOn sourceJarForEclipseLaunchConfigs + artifacts { tests testJar } -- GitLab