Commits

Meikel Brandmeyer committed adb967b Merge

Merge v1.4.4 compat release

Comments (0)

Files changed (5)

 7f8b76c580d0ec794b139cfaaa2259dd7018f656 v1.4.0
 d7a5a96c6ef9b4db5a420b952b4c582be229f237 v1.4.1
 f607177c468dc9203ebda58854b654636adfee90 v1.4.2
+d39915ebf52aaf6a28d2d1e5c4c0ca7979593207 v1.4.3
+c92d98bdf192408de62f9ffbdd4867f1036f6082 v1.4.4
     }
 
     dependencies {
-        compile 'org.clojure:clojure:1.+'
+        compile 'org.clojure:clojure:[1.2,1.4)'
     }
 }
 
 subprojects {
     uploadArchives.doLast {
-        String pomName = project.buildDirName + "/" + project.pomDirName + "/" +
+        String pomName = project.buildDirName + "/" + project.mavenPomDir.name + "/" +
             project.name + "-" + project.version + ".xml"
 
         project.pom().writeTo(pomName)

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

             String compileTaskName = set.getCompileTaskName("clojure")
             ClojureCompileTask task = project.tasks.add(name: compileTaskName,
                     type: ClojureCompileTask.class) {
-                destinationDir = set.classesDir
+                destinationDir = set.output.classesDir
                 source set.clojure
                 clojureRoots = set.clojure
                 compileClasspath = set.compileClasspath
             source project.sourceSets.test.clojure
             testRoots = project.sourceSets.test.clojure
             testClasspath = project.configurations.testRuntime
-            classesDir = project.sourceSets.main.classesDir
+            classesDir = project.sourceSets.main.output.classesDir
             dependsOn project.tasks.classes, project.configurations.testRuntime
             description = "Run Clojure tests in src/test."
             if (project.hasProperty("clojuresque.test.vars")) {

clojuresque/src/main/groovy/clojuresque/ClojureRepositoryConvention.groovy

         this.repos = repos
     }
 
-    public void clojureSnapshotsRepo() {
-        repos.mavenRepo name: 'clojureSnapshots',
-            urls: 'http://build.clojure.org/snapshots'
-    }
-
-    public void clojureReleasesRepo() {
-        repos.mavenRepo name: 'clojureReleases',
-            urls: 'http://build.clojure.org/releases'
-    }
-
     public void clojarsRepo() {
-        repos.mavenRepo name: 'clojars', urls: 'http://clojars.org/repo'
+        repos.maven { url 'http://clojars.org/repo' }
     }
 }

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

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