Commits

Meikel Brandmeyer  committed a132405 Merge

Merge release v1.5.2

  • Participants
  • Parent commits 34ffb9f, 4a5998e

Comments (0)

Files changed (3)

 c92d98bdf192408de62f9ffbdd4867f1036f6082 v1.4.4
 754e8708574a87dba6caf5e5378682e123b9044c v1.4.5
 55713b80d7632926d86511c31804b5b90c27ae5b v1.5.0
+5b10b0793d182590eae0846c208ab7de9b8cfd9e v1.5.1
+ab1c08a1b455839a35353e00201e1659bd9cf381 v1.5.2

File build.gradle

 }
 
 project(':clojuresque') {
-    apply plugin: 'groovy'
+    apply {
+        plugin 'groovy'
+        plugin 'maven'
+    }
 
     dependencies {
         compile gradleApi()
 }
 
 project(':clojuresque-runtime') {
-    apply plugin: 'java'
+    apply {
+        plugin 'java'
+        plugin 'maven'
+    }
 
     repositories {
         mavenCentral()
     }
 
     dependencies {
-        compile 'org.clojure:clojure:[1.2,1.4)'
+        compile 'org.clojure:clojure:[1.2,1.5)'
     }
 }
 
 project(':scriptoresque') {
-    apply plugin: 'groovy'
+    apply {
+        plugin 'groovy'
+        plugin 'maven'
+    }
 
     repositories {
         mavenCentral()
 }
 
 project(':scriptoresque-runtime') {
-    apply plugin: 'java'
+    apply {
+        plugin 'java'
+        plugin 'maven'
+    }
 
     repositories {
         mavenCentral()
 }
 
 subprojects {
-    apply plugin: 'maven'
+    ext.pomFile = project.buildDir.path + "/" +
 
-    uploadArchives.doLast {
-        String 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.buildDirName + "/" +
-                project.mavenPomDir.name + "/" +
+            String pomName = project.buildDir.path + "/" +
+                project.mavenPomDir.path + "/" +
                 "pom-" + upload.configuration.name + ".xml"
 
             project.pom().writeTo(pomName)