Skip to content
This repository
Browse code

Upgraded to Gradle 1.3 and addressed some build warnings

  • Loading branch information...
commit e27296b83b70b6d4ed55b76f87c59eece57d4ba6 1 parent b901005
Roy Clarkson authored December 06, 2012
36  build.gradle
@@ -103,10 +103,10 @@ project('spring-social-core') {
103 103
         compile ("org.springframework:spring-web:$springVersion")
104 104
         compile ("org.springframework.security:spring-security-crypto:$springSecurityVersion", optional)
105 105
         compile ("org.apache.httpcomponents:httpclient:$httpComponentsVersion", optional)
106  
-        testCompile "com.h2database:h2:$h2Version"
107  
-        testCompile "org.springframework:spring-test-mvc:$springTestMvcVersion"
  106
+        testCompile ("com.h2database:h2:$h2Version")
  107
+        testCompile ("org.springframework:spring-test-mvc:$springTestMvcVersion")
108 108
         testCompile ("javax.servlet:servlet-api:$servletApiVersion")
109  
-        testCompile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
  109
+        testCompile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion")
110 110
     }
111 111
 }
112 112
 
@@ -114,13 +114,13 @@ project('spring-social-web') {
114 114
     description = 'Spring Web Integration'
115 115
     dependencies {
116 116
         compile ("javax.inject:javax.inject:$javaxInjectVersion")
117  
-        compile "org.springframework:spring-web:$springVersion"
118  
-        compile "org.springframework:spring-webmvc:$springVersion"
  117
+        compile ("org.springframework:spring-web:$springVersion")
  118
+        compile ("org.springframework:spring-webmvc:$springVersion")
119 119
         compile ("javax.servlet:servlet-api:$servletApiVersion", provided)
120 120
         compile ("javax.servlet.jsp:javax.servlet.jsp-api:$jspApiVersion", provided)
121  
-        compile project(':spring-social-core')
122  
-        testCompile "org.springframework:spring-test-mvc:$springTestMvcVersion"
123  
-        testCompile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
  121
+        compile project (':spring-social-core')
  122
+        testCompile ("org.springframework:spring-test-mvc:$springTestMvcVersion")
  123
+        testCompile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion")
124 124
     }
125 125
     metaInf << files("src/main/resources/tld/spring-social.tld")
126 126
 }
@@ -128,24 +128,24 @@ project('spring-social-web') {
128 128
 project('spring-social-config') {
129 129
     description = 'Spring Social Config'
130 130
     dependencies {
131  
-      compile project(':spring-social-core')
132  
-      compile project(':spring-social-web')
  131
+      compile project (':spring-social-core')
  132
+      compile project (':spring-social-web')
133 133
       compile ("org.springframework.security:spring-security-core:$springSecurityVersion", optional)
134 134
       testCompile ("javax.servlet:servlet-api:$servletApiVersion", provided)
135  
-      testCompile "com.h2database:h2:$h2Version"
136  
-      testCompile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
137  
-      testCompile "org.springframework:spring-jdbc:$springVersion"
  135
+      testCompile ("com.h2database:h2:$h2Version")
  136
+      testCompile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion")
  137
+      testCompile ("org.springframework:spring-jdbc:$springVersion")
138 138
     }
139 139
 }
140 140
 
141 141
 project('spring-social-security') {
142 142
     description = 'Spring Security Integration'
143 143
     dependencies {
144  
-        compile "org.springframework:spring-web:$springVersion"
145  
-        compile "org.springframework:spring-webmvc:$springVersion"
  144
+        compile ("org.springframework:spring-web:$springVersion")
  145
+        compile ("org.springframework:spring-webmvc:$springVersion")
146 146
         compile ("org.springframework.security:spring-security-web:$springSecurityVersion")
147  
-        compile ("javax.servlet:servlet-api:$servletApiVersion") { provided = true }
148  
-        compile project(':spring-social-core')
  147
+        compile ("javax.servlet:servlet-api:$servletApiVersion", provided)
  148
+        compile project (':spring-social-core')
149 149
     }
150 150
 }
151 151
 
@@ -276,7 +276,7 @@ configure(rootProject) {
276 276
 
277 277
     task wrapper(type: Wrapper) {
278 278
         description = 'Generates gradlew[.bat] scripts'
279  
-        gradleVersion = '1.1'
  279
+        gradleVersion = '1.3'
280 280
     }
281 281
 
282 282
 }
BIN  gradle/wrapper/gradle-wrapper.jar
Binary file not shown
4  gradle/wrapper/gradle-wrapper.properties
... ...
@@ -1,6 +1,6 @@
1  
-#Wed Aug 29 09:43:10 CDT 2012
  1
+#Thu Dec 06 11:22:23 EST 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.1-bin.zip
  6
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip
4  gradlew
@@ -101,13 +101,13 @@ if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
101 101
             warn "Could not set maximum file descriptor limit: $MAX_FD"
102 102
         fi
103 103
     else
104  
-        warn "Could not query businessSystem maximum file descriptor limit: $MAX_FD_LIMIT"
  104
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
105 105
     fi
106 106
 fi
107 107
 
108 108
 # For Darwin, add options to specify how the application appears in the dock
109 109
 if $darwin; then
110  
-    JAVA_OPTS="$JAVA_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
  110
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
111 111
 fi
112 112
 
113 113
 # For Cygwin, switch paths to Windows format before running java
12  publish-maven.gradle
... ...
@@ -1,10 +1,10 @@
1 1
 apply plugin: 'maven'
2 2
 
3  
-optionalDeps = []
4  
-providedDeps = []
  3
+ext.optionalDeps = []
  4
+ext.providedDeps = []
5 5
 
6  
-optional = { optionalDeps << it }
7  
-provided = { providedDeps << it }
  6
+ext.optional = { optionalDeps << it }
  7
+ext.provided = { providedDeps << it }
8 8
 
9 9
 install {
10 10
     repositories.mavenInstaller {
@@ -16,10 +16,10 @@ def customizePom(pom, gradleProject) {
16 16
     pom.whenConfigured { generatedPom ->
17 17
         // respect 'optional' and 'provided' dependencies
18 18
         gradleProject.optionalDeps.each { dep ->
19  
-            generatedPom.dependencies.find { it.artifactId == dep.name }?.optional = true
  19
+            generatedPom.dependencies.findAll { it.artifactId == dep.name }*.optional = true
20 20
         }
21 21
         gradleProject.providedDeps.each { dep ->
22  
-            generatedPom.dependencies.find { it.artifactId == dep.name }?.scope = 'provided'
  22
+            generatedPom.dependencies.findAll { it.artifactId == dep.name }*.scope = 'provided'
23 23
         }
24 24
 
25 25
         // eliminate test-scoped dependencies (no need in maven central poms)
1  settings.gradle
@@ -16,7 +16,6 @@
16 16
 
17 17
 rootProject.name = 'spring-social'
18 18
 
19  
-include 'docs'
20 19
 include 'spring-social-core'
21 20
 include 'spring-social-web'
22 21
 include 'spring-social-config'

0 notes on commit e27296b

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