Commits

Meikel Brandmeyer committed 664fb35

Add ClojureUploadConvention

Allow more fine-grained configuration of clojars deployment. Eg. install
is also an Upload task, but here we certainly don't want deployment.
Inspired by Adam Murdoch.

Comments (0)

Files changed (3)

src/main/groovy/clojuresque/ClojurePlugin.groovy

         project.tasks.whenTaskAdded { upload ->
             if (!upload instanceof Upload)
                 return
-
-            upload.doLast {
-                if (project.clojarsUpload) {
-                    String pomName = project.buildDirName + "/" +
-                        project.pomDirName + "/" +
-                        "pom-" + upload.configuration.name + ".xml"
-
-                    project.pom().writeTo(pomName)
-                    project.exec {
-                        executable = '/usr/bin/scp'
-                        args = project.files(upload.artifacts)*.path +
-                            [ project.file(pomName).path,
-                              'clojars@clojars.org:' ]
-                    }
-                }
-            }
+            upload.convention.plugins.clojure =
+                new ClojureUploadConvention(upload)
         }
     }
 }

src/main/groovy/clojuresque/ClojurePluginConvention.groovy

 class ClojurePluginConvention {
     def boolean warnOnReflection = false
     def boolean aotCompile = false
-    def boolean clojarsUpload = true
 }

src/main/groovy/clojuresque/ClojureUploadConvention.groovy

+/*-
+ * Copyright 2009,2010 © Meikel Brandmeyer.
+ * All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
+ * IN THE SOFTWARE.
+ */
+
+package clojuresque
+
+import org.gradle.api.Project
+import org.gradle.api.tasks.Upload
+
+class ClojureUploadConvention {
+    private Upload upload
+
+    public ClojureUploadConvention(Upload upload) {
+        this.upload = upload
+    }
+
+    public void clojarsDeploy() {
+        upload.doLast {
+            String pomName = project.buildDirName + "/" +
+                project.pomDirName + "/" +
+                "pom-" + upload.configuration.name + ".xml"
+
+            project.pom().writeTo(pomName)
+            project.exec {
+                executable = '/usr/bin/scp'
+                args = project.files(upload.artifacts)*.path +
+                    [ project.file(pomName).path,
+                      'clojars@clojars.org:' ]
+            }
+        }
+    }
+}
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.