Commits

Meikel Brandmeyer committed 26b8761

Really fix clojars upload

  • Participants
  • Parent commits d8fc252

Comments (0)

Files changed (2)

File build.gradle

 }
 
 subprojects {
-    uploadArchives.doLast {
-        String pomFile = project.mavenPomDir.name + "/" +
+    ext.pomFile = project.buildDir.path + "/" +
+            project.mavenPomDir.name + "/" +
             project.name + "-" + project.version + ".xml"
 
-        project.pom().writeTo(pomFile)
+    task writePom {
+        outputs.file project.pomFile
+    } << {
+        project.pom().writeTo(project.pomFile)
+    }
 
+    uploadArchives {
+        dependsOn project.writePom
+    } << {
         project.exec {
             commandLine(
                 '/usr/bin/scp',
-                pomFile,
+                project.pomFile,
                 project.jar.archivePath.path,
                 'clojars@clojars.org:'
             )

File clojuresque/src/main/groovy/clojuresque/ClojureUploadConvention.groovy

 
     public void clojarsDeploy() {
         upload.doLast {
-            String pomName = project.mavenPomDir.path + "/" +
+            String pomName = project.buildDir.path + "/" +
+                project.mavenPomDir.path + "/" +
                 "pom-" + upload.configuration.name + ".xml"
 
             project.pom().writeTo(pomName)