Skip to content
This repository
Browse code

Upgraded to Gradle 1.1

  • Loading branch information...
commit e1d5b01c717b7afaf58336d234f6473bda05e8fb 1 parent 3c459aa
authored August 29, 2012
42  build.gradle
@@ -17,15 +17,15 @@ configure(allprojects) {
17 17
     sourceCompatibility=1.5
18 18
     targetCompatibility=1.5
19 19
 
20  
-    springSocialVersion = '1.1.0.BUILD-SNAPSHOT'
21  
-    jacksonVersion = '1.9.9'
22  
-    jspApiVersion = '2.1'
23  
-    junitVersion = '4.10'
24  
-    mockitoVersion = '1.9.0'
25  
-    servletApiVersion = '2.5'
26  
-    springSecurityCryptoVersion = '3.1.0.RELEASE'
27  
-    springVersion = '3.1.2.RELEASE'
28  
-    springTestMvcVersion = "1.0.0.BUILD-SNAPSHOT"
  20
+    ext.springSocialVersion = '1.1.0.BUILD-SNAPSHOT'
  21
+    ext.jacksonVersion = '1.9.9'
  22
+    ext.jspApiVersion = '2.1'
  23
+    ext.junitVersion = '4.10'
  24
+    ext.mockitoVersion = '1.9.0'
  25
+    ext.servletApiVersion = '2.5'
  26
+    ext.springSecurityCryptoVersion = '3.1.2.RELEASE'
  27
+    ext.springVersion = '3.1.2.RELEASE'
  28
+    ext.springTestMvcVersion = "1.0.0.BUILD-SNAPSHOT"
29 29
 
30 30
     [compileJava, compileTestJava]*.options*.compilerArgs = ['-Xlint:none']
31 31
 
@@ -103,12 +103,12 @@ project('spring-social-facebook-web') {
103 103
     description = 'Facebook Web'
104 104
     dependencies {
105 105
         compile ("org.springframework:spring-web:$springVersion")
106  
-        compile ("org.springframework.social:spring-social-core:$springSocialVersion") { optional = true }
107  
-        compile project(':spring-social-facebook') { optional = true }
108  
-        compile ("org.springframework.security:spring-security-crypto:$springSecurityCryptoVersion") { optional = true }
109  
-        compile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion") { optional = true }
110  
-        compile ("javax.servlet:servlet-api:$servletApiVersion") { provided = true }
111  
-        compile ("javax.servlet.jsp:jsp-api:$jspApiVersion") { provided = true }
  106
+        compile ("org.springframework.social:spring-social-core:$springSocialVersion", optional)
  107
+        compile project(':spring-social-facebook', optional)
  108
+        compile ("org.springframework.security:spring-security-crypto:$springSecurityCryptoVersion", optional)
  109
+        compile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion", optional)
  110
+        compile ("javax.servlet:servlet-api:$servletApiVersion", provided)
  111
+        compile ("javax.servlet.jsp:jsp-api:$jspApiVersion", provided)
112 112
         testCompile "org.springframework:spring-test-mvc:$springTestMvcVersion"
113 113
     }
114 114
 }
@@ -119,7 +119,7 @@ configure(rootProject) {
119 119
     apply plugin: 'docbook-reference'
120 120
 
121 121
     reference {
122  
-        sourceDir = file('src/reference/docbook')
  122
+        ext.sourceDir = file('src/reference/docbook')
123 123
     }
124 124
 
125 125
     // don't publish the default jar for the root project
@@ -201,7 +201,7 @@ configure(rootProject) {
201 201
         description = "Builds -${classifier} archive, containing all jars and docs, " +
202 202
                       "suitable for community download page."
203 203
 
204  
-        baseDir = "${project.name}-${project.version}";
  204
+        ext.baseDir = "${project.name}-${project.version}";
205 205
 
206 206
         from('src/dist') {
207 207
             include 'readme.txt'
@@ -215,9 +215,9 @@ configure(rootProject) {
215 215
             into "${baseDir}/docs"
216 216
         }
217 217
 
218  
-        from(zipTree(schemaZip.archivePath)) {
219  
-            into "${baseDir}/schema"
220  
-        }
  218
+//        from(zipTree(schemaZip.archivePath)) {
  219
+//            into "${baseDir}/schema"
  220
+//        }
221 221
 
222 222
         subprojects.each { subproject ->
223 223
             into ("${baseDir}/libs") {
@@ -240,7 +240,7 @@ configure(rootProject) {
240 240
 
241 241
     task wrapper(type: Wrapper) {
242 242
         description = 'Generates gradlew[.bat] scripts'
243  
-        gradleVersion = '1.0-milestone-8a'
  243
+        gradleVersion = '1.1'
244 244
     }
245 245
 
246 246
 }
4  gradle/wrapper/gradle-wrapper.properties
... ...
@@ -1,6 +1,6 @@
1  
-#Thu Feb 23 13:43:17 CET 2012
  1
+#Wed Aug 29 14:53:15 CDT 2012
2 2
 distributionBase=GRADLE_USER_HOME
3 3
 distributionPath=wrapper/dists
4 4
 zipStoreBase=GRADLE_USER_HOME
5 5
 zipStorePath=wrapper/dists
6  
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.0-milestone-8a-bin.zip
  6
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
4  gradlew
@@ -9,10 +9,6 @@
9 9
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
10 10
 DEFAULT_JVM_OPTS=""
11 11
 
12  
-# ADDED BY HAND -- DO NOT ACCIDENTALLY DELETE WHEN UPGRADING GRADLE WRAPPER!
13  
-GRADLE_OPTS="-XX:MaxPermSize=1024m -Xmx1024m $GRADLE_OPTS"
14  
-# END ADDED BY HAND
15  
-
16 12
 APP_NAME="Gradle"
17 13
 APP_BASE_NAME=`basename "$0"`
18 14
 
0  gradlew.bat 100755 → 100644
File mode changed

0 notes on commit e1d5b01

Please sign in to comment.
Something went wrong with that request. Please try again.