MOBILE-34 update to Gradle 1.0-rc-1

build.gradle

@@ -17,8 +17,6 @@ configure(allprojects) {
     sourceCompatibility=1.5
     targetCompatibility=1.5
 
-    slf4jLog4jVersion = '1.5.10'
-
     [compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none']
 
     sourceSets.test.resources.srcDirs = ['src/test/resources', 'src/test/java']
@@ -63,7 +61,6 @@ configure(subprojects) { subproject ->
         options.memberLevel = org.gradle.external.javadoc.JavadocMemberLevel.PROTECTED
         options.author = true
         options.header = project.name
-        //options.overview = "${projectDir}/src/main/java/overview.html"
     }
 
     task sourcesJar(type: Jar, dependsOn:classes) {
@@ -87,8 +84,7 @@ project('spring-mobile-device') {
     description = 'Spring Mobile Device Resolution Support'
     dependencies {
         compile "org.springframework:spring-webmvc:3.1.1.RELEASE"
-        compile ("javax.servlet:servlet-api:2.5") { provided = true }
-//        testCompile "log4j:log4j:1.2.16"
+        compile ("javax.servlet:servlet-api:2.5", provided)
     }
 }
 
@@ -180,7 +176,7 @@ configure(rootProject) {
         description = "Builds -${classifier} archive, containing all jars and docs, " +
                       "suitable for community download page."
 
-        baseDir = "${project.name}-${project.version}";
+        def baseDir = "${project.name}-${project.version}";
 
         from('src/dist') {
             include 'readme.txt'
@@ -219,7 +215,7 @@ configure(rootProject) {
 
     task wrapper(type: Wrapper) {
         description = 'Generates gradlew[.bat] scripts'
-        gradleVersion = '1.0-milestone-8a'
+        gradleVersion = '1.0-rc-1'
     }
 
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Thu Feb 23 13:43:17 CET 2012
+#Sat Apr 14 10:56:11 EEST 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.0-rc-1-bin.zip

publish-maven.gradle

@@ -1,10 +1,10 @@
 apply plugin: 'maven'
 
-optionalDeps = []
-providedDeps = []
+ext.optionalDeps = []
+ext.providedDeps = []
 
-optional = { optionalDeps << it }
-provided = { providedDeps << it }
+ext.optional = { optionalDeps << it }
+ext.provided = { providedDeps << it }
 
 install {
     repositories.mavenInstaller {