Upgrading Gradlew and Gradle JS

eriwen · eriwen · commit db7e464f655b · 2012-06-28T06:56:13.000-06:00
diff --git a/build.gradle b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
 		mavenCentral()
 	}
 	dependencies {
-		classpath 'com.eriwen:gradle-js-plugin:0.3'
+		classpath 'com.eriwen:gradle-js-plugin:1.0.2'
 	}
 }
 
@@ -22,10 +22,8 @@ repositories {
 	mavenCentral()
 }
 
-task clean(description: 'Cleans old artifacts') {
-	doLast {
-		ant.delete(dir: buildDir)
-	}
+task clean(type: Delete) {
+	delete buildDir
 }
 
 task init(type: Directory, dependsOn: 'clean', description: 'Creates artifact output directories') {
@@ -36,7 +34,7 @@ task init(type: Directory, dependsOn: 'clean', description: 'Creates artifact ou
 }
 
 task wrapper(type: Wrapper) {
-	gradleVersion = '1.0-milestone-9'
+	gradleVersion = '1.0'
 }
 
 task jshintz(dependsOn: 'init', description: 'runs jshint on all non-test and lib JS files') {
@@ -56,15 +54,16 @@ task jsduck(type: Exec, dependsOn: 'init', description: 'Generates jsduck docume
 
 minifyJs {
 	dependsOn << 'init'
-	ext.input = file(srcFile)
-	ext.output = file(destFile)
-	warningLevel = 'QUIET'
+	source = file(srcFile)
+	dest = file(destFile)
+	closure {
+		warningLevel = 'QUIET'
+	}
 }
 
 gzipJs {
-	dependsOn << 'minifyJs'
-	ext.input = file(destFile)
-	ext.output = input
+	source = minifyJs
+	dest = file(destFile)
 }
 
 task test(dependsOn: 'init') << {
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 @@
-#Fri Apr 06 07:56:41 MDT 2012
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
+#Thu Jun 28 06:45:52 MDT 2012
 zipStoreBase=GRADLE_USER_HOME
+distributionBase=GRADLE_USER_HOME
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-bin.zip
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-9-bin.zip
+distributionPath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -101,13 +101,13 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
             warn "Could not set maximum file descriptor limit: $MAX_FD"
         fi
     else
-        warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
     fi
 fi
 
 # For Darwin, add options to specify how the application appears in the dock
 if $darwin; then
-    JAVA_OPTS="$JAVA_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
 # For Cygwin, switch paths to Windows format before running java

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@ buildscript {`
`4`	`4`	`mavenCentral()`
`5`	`5`	`}`
`6`	`6`	`dependencies {`
`7`		`- classpath 'com.eriwen:gradle-js-plugin:0.3'`
	`7`	`+ classpath 'com.eriwen:gradle-js-plugin:1.0.2'`
`8`	`8`	`}`
`9`	`9`	`}`
`10`	`10`
`@@ -22,10 +22,8 @@ repositories {`
`22`	`22`	`mavenCentral()`
`23`	`23`	`}`
`24`	`24`
`25`		`-task clean(description: 'Cleans old artifacts') {`
`26`		`- doLast {`
`27`		`- ant.delete(dir: buildDir)`
`28`		`- }`
	`25`	`+task clean(type: Delete) {`
	`26`	`+ delete buildDir`
`29`	`27`	`}`
`30`	`28`
`31`	`29`	`task init(type: Directory, dependsOn: 'clean', description: 'Creates artifact output directories') {`
`@@ -36,7 +34,7 @@ task init(type: Directory, dependsOn: 'clean', description: 'Creates artifact ou`
`36`	`34`	`}`
`37`	`35`
`38`	`36`	`task wrapper(type: Wrapper) {`
`39`		`- gradleVersion = '1.0-milestone-9'`
	`37`	`+ gradleVersion = '1.0'`
`40`	`38`	`}`
`41`	`39`
`42`	`40`	`task jshintz(dependsOn: 'init', description: 'runs jshint on all non-test and lib JS files') {`
`@@ -56,15 +54,16 @@ task jsduck(type: Exec, dependsOn: 'init', description: 'Generates jsduck docume`
`56`	`54`
`57`	`55`	`minifyJs {`
`58`	`56`	`dependsOn << 'init'`
`59`		`- ext.input = file(srcFile)`
`60`		`- ext.output = file(destFile)`
`61`		`- warningLevel = 'QUIET'`
	`57`	`+ source = file(srcFile)`
	`58`	`+ dest = file(destFile)`
	`59`	`+ closure {`
	`60`	`+ warningLevel = 'QUIET'`
	`61`	`+ }`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`gzipJs {`
`65`		`- dependsOn << 'minifyJs'`
`66`		`- ext.input = file(destFile)`
`67`		`- ext.output = input`
	`65`	`+ source = minifyJs`
	`66`	`+ dest = file(destFile)`
`68`	`67`	`}`
`69`	`68`
`70`	`69`	`task test(dependsOn: 'init') << {`