Update to the latest nightly to get more deprecation trace, and fix s…

…ome more deprecation warnings in our build.
literalice · Feb 6, 2012 · 9d35bdd · 9d35bdd
1 parent 20dfa8c
commit 9d35bdd
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/gradle/codeQuality.gradle b/gradle/codeQuality.gradle
@@ -7,7 +7,7 @@ checkstyleConfigDir = "$configDir/checkstyle"
 
 checkstyle {
     configFile = new File(checkstyleConfigDir, "checkstyle.xml")
-    configProperties = [checkstyleConfigDir: checkstyleConfigDir]
+    configProperties.checkstyleConfigDir = checkstyleConfigDir
 }
 
 codenarc {
@@ -20,7 +20,7 @@ plugins.withType(GroovyBasePlugin) {
             configFile = new File(checkstyleConfigDir, "checkstyle-groovy.xml")
             source sourceSet.allGroovy
             classpath = sourceSet.compileClasspath
-            reportsFile = new File(checkstyle.reportsDir, "${sourceSet.name}-groovy.xml")
+            reports.xml.destination new File(checkstyle.reportsDir, "${sourceSet.name}-groovy.xml")
         }
     }
 }

diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Feb 06 17:32:36 GMT 2012
+#Mon Feb 06 18:46:37 GMT 2012
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://downloads.gradle.org/distributions-snapshots/gradle-1.0-milestone-8-20120206163847+0100-bin.zip
+distributionUrl=http\://downloads.gradle.org/distributions-snapshots/gradle-1.0-milestone-8-20120206191800+0100-bin.zip
diff --git a/subprojects/docs/docs.gradle b/subprojects/docs/docs.gradle
@@ -147,11 +147,9 @@ task dslHtml(type: Docbook2Xhtml) {
     source dslStandaloneDocbook
     destDir = new File(docsDir, 'dsl')
     stylesheetName = 'dslHtml.xsl'
-    resources = fileTree {
-        from cssSrcDir
+    resources = fileTree(cssSrcDir) {
         include '*.css'
-    } + fileTree {
-        from dslSrcDir
+    } + fileTree(dslSrcDir) {
         include '*.js'
     }
 }
@@ -184,12 +182,10 @@ task userguideHtml(type: Docbook2Xhtml) {
     source userguideDocbook
     destDir = userguideDir
     stylesheetName = 'userGuideHtml.xsl'
-    resources = fileTree {
-        from userguideSrcDir
+    resources = fileTree(userguideSrcDir) {
         include 'img/*.png'
     }
-    resources += fileTree {
-        from cssSrcDir
+    resources += fileTree(cssSrcDir) {
         include '*.css'
     }
 }
@@ -198,12 +194,10 @@ task userguideSingleHtml(type: Docbook2Xhtml) {
     source userguideDocbook
     destFile = new File(userguideDir, 'userguide_single.html')
     stylesheetName = 'userGuideSingleHtml.xsl'
-    resources = fileTree {
-        from userguideSrcDir
+    resources = fileTree(userguideSrcDir) {
         include 'img/*.png'
     }
-    resources += fileTree {
-        from cssSrcDir
+    resources += fileTree(cssSrcDir) {
         include '*.css'
     }
 }
@@ -212,12 +206,10 @@ task userguideXhtml(type: Docbook2Xhtml) {
     source pdfUserguideDocbook
     destFile = new File(buildDir, 'tmp/userguidePdf/userguidePdf.html')
     stylesheetName = 'userGuidePdf.xsl'
-    resources = fileTree {
-        from userguideSrcDir
+    resources = fileTree(userguideSrcDir) {
         include 'img/*.png'
     }
-    resources += fileTree {
-        from cssSrcDir
+    resources += fileTree(cssSrcDir) {
         include '*.css'
     }
 }
@@ -254,7 +246,7 @@ task checkstyleApi(type: Checkstyle) {
     source javadoc.source
     configFile = file("$checkstyleConfigDir/checkstyle-api.xml")
     classpath = files()
-    reportFile = file("$checkstyle.reportsDir/checkstyle-api.xml")
+    reports.xml.destination = file("$checkstyle.reportsDir/checkstyle-api.xml")
 }
 
 //TODO SF - generates for java as well, rename to codedoc?