diff --git a/build.gradle b/build.gradle index a006b1465831f4de0c24a5000cc0901453965bc8..22eed749bcde37405a1b867ef6bf2e7664dbe96c 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ */ task wrapper(type: Wrapper) { - gradleVersion = '1.8' + gradleVersion = '1.11' } project.ext { diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 667288ad6c2b3b87c990ece1267e56f0bcbf3622..3c7abdf12790879c06b07176de29647f77aa4129 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 63b909dad703a64bb2415cc20474c2d753c96737..f856181f5999b5ca9353e3b5fcbd6b466c5206f9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Oct 18 14:47:55 CEST 2013 +#Tue Mar 11 23:34:43 MSK 2014 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.8-bin.zip +distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip diff --git a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy index d72465208024e9c9f7f62d15137133f6d0a88f94..bf6f85cf63758bee3ab76f37e6b01bc88a7b72ad 100644 --- a/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy +++ b/gradle_plugins/src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy @@ -17,7 +17,7 @@ class RosAndroidPlugin implements Plugin<Project> { project.apply(plugin: 'ros') } project.extensions.create("rosandroid", RosAndroidPluginExtension) - project.rosandroid.buildToolsVersion = "18.1.1" + project.rosandroid.buildToolsVersion = "19.0.3" /********************************************************************* * Find the android plugin *********************************************************************/ @@ -26,7 +26,7 @@ class RosAndroidPlugin implements Plugin<Project> { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:0.7.1' + classpath 'com.android.tools.build:gradle:0.9.+' } } /**********************************************************************