Permalink
Browse files

Upgrade Gradle to 1.6. Upgrade Ant to 1.9.1.

  • Loading branch information...
russel committed May 24, 2013
1 parent 1e41a20 commit de73c6acad73ea2c03e19f806b570d1a80135a2a
View
@@ -170,7 +170,7 @@ subprojects {
dependencies{
compile(
'commons-cli:commons-cli:1.2',
- 'org.apache.ant:ant:1.8.4'
+ 'org.apache.ant:ant:1.9.1'
)
testCompile 'junit:junit:4.11'
testRuntime 'org.apache.ivy:ivy:2.2.0'
@@ -668,7 +668,7 @@ task uploadRelease(dependsOn: archivesUploadTasks + [uploadDistribution, uploadD
task ciBuild(description: 'Run just the builds that use Groovy from the Maven repository. Used mainly on CI servers.', dependsOn: ciBuildTasks)
task wrapper(type: Wrapper) {
- gradleVersion = '1.5'
+ gradleVersion = '1.6'
}
task clobber(description: 'Do a really detailed clean.') << {
Binary file not shown.
@@ -1,6 +1,6 @@
-#Thu Mar 28 15:19:16 GMT 2013
-distributionPath=wrapper/dists
+#Fri May 24 21:17:53 CEST 2013
+zipStorePath=wrapper/dists
distributionBase=GRADLE_USER_HOME
zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.5-bin.zip
+distributionPath=wrapper/dists
+distributionUrl=http\://services.gradle.org/distributions/gradle-1.6-bin.zip
@@ -202,12 +202,12 @@ public Definition createDefinition() {
*/
// Russel Winder rehacked the code provided by Eric Van Dewoestine.
private void addAlmostAll(final Project newProject, final Project oldProject) {
- @SuppressWarnings("unchecked") final Hashtable<String,String> properties = oldProject.getProperties();
+ final Hashtable<String,Object> properties = oldProject.getProperties();
final Enumeration<String> e = properties.keys();
while (e.hasMoreElements()) {
final String key = e.nextElement();
if (!(MagicNames.PROJECT_BASEDIR.equals(key) || MagicNames.ANT_FILE.equals(key))) {
- if (newProject.getProperty(key) == null) { newProject.setNewProperty(key, properties.get(key)); }
+ if (newProject.getProperty(key) == null) { newProject.setNewProperty(key, (String)properties.get(key)); }
}
}
}

0 comments on commit de73c6a

Please sign in to comment.