Upgraded to Gradle 1.1

build.gradle

@@ -17,15 +17,15 @@ configure(allprojects) {
     sourceCompatibility=1.5
     targetCompatibility=1.5
 
-    springSocialVersion = '1.1.0.BUILD-SNAPSHOT'
-    jacksonVersion = '1.9.9'
-    jspApiVersion = '2.1'
-    junitVersion = '4.10'
-    mockitoVersion = '1.9.0'
-    servletApiVersion = '2.5'
-    springSecurityCryptoVersion = '3.1.0.RELEASE'
-    springVersion = '3.1.2.RELEASE'
-    springTestMvcVersion = "1.0.0.BUILD-SNAPSHOT"
+    ext.springSocialVersion = '1.1.0.BUILD-SNAPSHOT'
+    ext.jacksonVersion = '1.9.9'
+    ext.jspApiVersion = '2.1'
+    ext.junitVersion = '4.10'
+    ext.mockitoVersion = '1.9.0'
+    ext.servletApiVersion = '2.5'
+    ext.springSecurityCryptoVersion = '3.1.2.RELEASE'
+    ext.springVersion = '3.1.2.RELEASE'
+    ext.springTestMvcVersion = "1.0.0.BUILD-SNAPSHOT"
 
     [compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none']
 
@@ -103,12 +103,12 @@ project('spring-social-facebook-web') {
     description = 'Facebook Web'
     dependencies {
         compile ("org.springframework:spring-web:$springVersion")
-        compile ("org.springframework.social:spring-social-core:$springSocialVersion") { optional = true }
-        compile project(':spring-social-facebook') { optional = true }
-        compile ("org.springframework.security:spring-security-crypto:$springSecurityCryptoVersion") { optional = true }
-        compile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion") { optional = true }
-        compile ("javax.servlet:servlet-api:$servletApiVersion") { provided = true }
-        compile ("javax.servlet.jsp:jsp-api:$jspApiVersion") { provided = true }
+        compile ("org.springframework.social:spring-social-core:$springSocialVersion", optional)
+        compile project(':spring-social-facebook', optional)
+        compile ("org.springframework.security:spring-security-crypto:$springSecurityCryptoVersion", optional)
+        compile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional)
+        compile ("javax.servlet:servlet-api:$servletApiVersion", provided)
+        compile ("javax.servlet.jsp:jsp-api:$jspApiVersion", provided)
         testCompile "org.springframework:spring-test-mvc:$springTestMvcVersion"
     }
 }
@@ -119,7 +119,7 @@ configure(rootProject) {
     apply plugin: 'docbook-reference'
 
     reference {
-        sourceDir = file('src/reference/docbook')
+        ext.sourceDir = file('src/reference/docbook')
     }
 
     // don't publish the default jar for the root project
@@ -201,7 +201,7 @@ configure(rootProject) {
         description = "Builds -${classifier} archive, containing all jars and docs, " +
                       "suitable for community download page."
 
-        baseDir = "${project.name}-${project.version}";
+        ext.baseDir = "${project.name}-${project.version}";
 
         from('src/dist') {
             include 'readme.txt'
@@ -215,9 +215,9 @@ configure(rootProject) {
             into "${baseDir}/docs"
         }
 
-        from(zipTree(schemaZip.archivePath)) {
-            into "${baseDir}/schema"
-        }
+//        from(zipTree(schemaZip.archivePath)) {
+//            into "${baseDir}/schema"
+//        }
 
         subprojects.each { subproject ->
             into ("${baseDir}/libs") {
@@ -240,7 +240,7 @@ configure(rootProject) {
 
     task wrapper(type: Wrapper) {
         description = 'Generates gradlew[.bat] scripts'
-        gradleVersion = '1.0-milestone-8a'
+        gradleVersion = '1.1'
     }
 
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Feb 23 13:43:17 CET 2012
+#Wed Aug 29 14:53:15 CDT 2012
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-8a-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip

gradlew

@@ -9,10 +9,6 @@
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS=""
 
-# ADDED BY HAND -- DO NOT ACCIDENTALLY DELETE WHEN UPGRADING GRADLE WRAPPER!
-GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1024m $GRADLE_OPTS"
-# END ADDED BY HAND
-
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`