From 7d47ee42b4a00dd4bbceac80785b6e210fcab9ec Mon Sep 17 00:00:00 2001 From: talregev <tal.regev@gmail.com> Date: Sat, 24 Jan 2015 01:20:07 +0200 Subject: [PATCH] update to the latest gradle plugin. --- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- gradle_plugins/build.gradle | 1 + .../src/main/groovy/org/ros/gradle_plugins/RosAndroid.groovy | 2 +- message_generation/build.gradle | 3 +++ 5 files changed, 7 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 4bf3d5a..e2d4f8f 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ */ task wrapper(type: Wrapper) { - gradleVersion = '1.11' + gradleVersion = '2.2.1' } allprojects { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index f856181..c5f4996 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip diff --git a/gradle_plugins/build.gradle b/gradle_plugins/build.gradle index f9ca5fa..f1dd481 100644 --- a/gradle_plugins/build.gradle +++ b/gradle_plugins/build.gradle @@ -16,6 +16,7 @@ apply plugin: 'groovy' +//noinspection GroovyAssignabilityCheck dependencies { compile gradleApi() compile localGroovy() 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 0eb2297..85cbd7d 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 @@ -11,7 +11,7 @@ class RosAndroidPlugin implements Plugin<Project> { void apply(Project project) { project.apply plugin: "ros" project.extensions.create("rosandroid", RosAndroidPluginExtension) - project.rosandroid.buildToolsVersion = "19.1.0" + project.rosandroid.buildToolsVersion = "21.1.2" /********************************************************************** * Publishing - not we're using old style here. Upgrade to maven-publish diff --git a/message_generation/build.gradle b/message_generation/build.gradle index 9958016..3220e35 100644 --- a/message_generation/build.gradle +++ b/message_generation/build.gradle @@ -14,6 +14,7 @@ * the License. */ +//noinspection GroovyAssignabilityCheck dependencies { compile 'io.netty:netty:3.5.2.Final' compile 'com.google.guava:guava:12.0' @@ -26,4 +27,6 @@ dependencies { } apply plugin: "application" + +//noinspection GroovyUnusedAssignment mainClassName = "org.ros.internal.message.GenerateInterfaces" -- GitLab