Permalink
Browse files

Upgraded to Gradle 1.3 and addressed some build warnings

  • Loading branch information...
1 parent b901005 commit e27296b83b70b6d4ed55b76f87c59eece57d4ba6 @royclarkson royclarkson committed Dec 6, 2012
View
@@ -103,49 +103,49 @@ project('spring-social-core') {
compile ("org.springframework:spring-web:$springVersion")
compile ("org.springframework.security:spring-security-crypto:$springSecurityVersion", optional)
compile ("org.apache.httpcomponents:httpclient:$httpComponentsVersion", optional)
- testCompile "com.h2database:h2:$h2Version"
- testCompile "org.springframework:spring-test-mvc:$springTestMvcVersion"
+ testCompile ("com.h2database:h2:$h2Version")
+ testCompile ("org.springframework:spring-test-mvc:$springTestMvcVersion")
testCompile ("javax.servlet:servlet-api:$servletApiVersion")
- testCompile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
+ testCompile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion")
}
}
project('spring-social-web') {
description = 'Spring Web Integration'
dependencies {
compile ("javax.inject:javax.inject:$javaxInjectVersion")
- compile "org.springframework:spring-web:$springVersion"
- compile "org.springframework:spring-webmvc:$springVersion"
+ compile ("org.springframework:spring-web:$springVersion")
+ compile ("org.springframework:spring-webmvc:$springVersion")
compile ("javax.servlet:servlet-api:$servletApiVersion", provided)
compile ("javax.servlet.jsp:javax.servlet.jsp-api:$jspApiVersion", provided)
- compile project(':spring-social-core')
- testCompile "org.springframework:spring-test-mvc:$springTestMvcVersion"
- testCompile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
+ compile project (':spring-social-core')
+ testCompile ("org.springframework:spring-test-mvc:$springTestMvcVersion")
+ testCompile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion")
}
metaInf << files("src/main/resources/tld/spring-social.tld")
}
project('spring-social-config') {
description = 'Spring Social Config'
dependencies {
- compile project(':spring-social-core')
- compile project(':spring-social-web')
+ compile project (':spring-social-core')
+ compile project (':spring-social-web')
compile ("org.springframework.security:spring-security-core:$springSecurityVersion", optional)
testCompile ("javax.servlet:servlet-api:$servletApiVersion", provided)
- testCompile "com.h2database:h2:$h2Version"
- testCompile "org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion"
- testCompile "org.springframework:spring-jdbc:$springVersion"
+ testCompile ("com.h2database:h2:$h2Version")
+ testCompile ("org.codehaus.jackson:jackson-mapper-asl:$jacksonVersion")
+ testCompile ("org.springframework:spring-jdbc:$springVersion")
}
}
project('spring-social-security') {
description = 'Spring Security Integration'
dependencies {
- compile "org.springframework:spring-web:$springVersion"
- compile "org.springframework:spring-webmvc:$springVersion"
+ compile ("org.springframework:spring-web:$springVersion")
+ compile ("org.springframework:spring-webmvc:$springVersion")
compile ("org.springframework.security:spring-security-web:$springSecurityVersion")
- compile ("javax.servlet:servlet-api:$servletApiVersion") { provided = true }
- compile project(':spring-social-core')
+ compile ("javax.servlet:servlet-api:$servletApiVersion", provided)
+ compile project (':spring-social-core')
}
}
@@ -276,7 +276,7 @@ configure(rootProject) {
task wrapper(type: Wrapper) {
description = 'Generates gradlew[.bat] scripts'
- gradleVersion = '1.1'
+ gradleVersion = '1.3'
}
}
Binary file not shown.
@@ -1,6 +1,6 @@
-#Wed Aug 29 09:43:10 CDT 2012
+#Thu Dec 06 11:22:23 EST 2012
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.3-bin.zip
View
@@ -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
View
@@ -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 {
@@ -16,10 +16,10 @@ def customizePom(pom, gradleProject) {
pom.whenConfigured { generatedPom ->
// respect 'optional' and 'provided' dependencies
gradleProject.optionalDeps.each { dep ->
- generatedPom.dependencies.find { it.artifactId == dep.name }?.optional = true
+ generatedPom.dependencies.findAll { it.artifactId == dep.name }*.optional = true
}
gradleProject.providedDeps.each { dep ->
- generatedPom.dependencies.find { it.artifactId == dep.name }?.scope = 'provided'
+ generatedPom.dependencies.findAll { it.artifactId == dep.name }*.scope = 'provided'
}
// eliminate test-scoped dependencies (no need in maven central poms)
View
@@ -16,7 +16,6 @@
rootProject.name = 'spring-social'
-include 'docs'
include 'spring-social-core'
include 'spring-social-web'
include 'spring-social-config'

0 comments on commit e27296b

Please sign in to comment.