Commits

Meikel Brandmeyer committed 3835ef2 Merge

Merge v1.4.1 compat release

  • Participants
  • Parent commits 66b85f6, a46f01a

Comments (0)

Files changed (3)

 d5847210de0fbbccb9e44c1a850492256f52cc7f v1.2.1
 eed2a4eb6507d171e637161f137f0ddb80b6555a v1.3.0
 7f8b76c580d0ec794b139cfaaa2259dd7018f656 v1.4.0
+d7a5a96c6ef9b4db5a420b952b4c582be229f237 v1.4.1

File build.gradle

 }
 
 project(':runtime') {
-    apply plugin: 'java'
+    apply {
+        plugin 'java'
+        plugin 'maven'
+    }
 
     repositories {
         mavenCentral()
 
 subprojects {
     uploadArchives.doLast {
-        if (!project.version.endsWith("-SNAPSHOT")) {
-            String pomName = project.buildDirName + "/" + project.pomDirName + "/" +
-                project.name + "-" + project.version + ".xml"
+        String pomName = project.buildDirName + "/" + project.pomDirName + "/" +
+            project.name + "-" + project.version + ".xml"
 
-            project.pom().writeTo(pomName)
+        project.pom().writeTo(pomName)
 
-            project.exec {
-                commandLine(
-                    '/usr/bin/scp',
-                    project.file(project.tasks.jar.archivePath).path,
-                    project.file(pomName).path,
-                    'clojars@clojars.org:'
-                )
-            }
+        project.exec {
+            commandLine(
+                '/usr/bin/scp',
+                project.file(project.tasks.jar.archivePath).path,
+                project.file(pomName).path,
+                'clojars@clojars.org:'
+            )
         }
     }
 }

File clojuresque/src/main/groovy/clojuresque/ClojureBasePlugin.groovy

             sourceSet.convention.plugins.clojure = clojureSourceSet
             sourceSet.clojure.srcDirs = [ String.format("src/%s/clojure", sourceSet.name) ]
             sourceSet.resources.filter.exclude("**/*.clj")
-            sourceSet.allSource.add(clojureSourceSet.clojure)
+            sourceSet.allSource.source(clojureSourceSet.clojure)
         }
     }