From 5cc90c2880eba5fc42d9c9c1a7e3781227066727 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leroy=20R=C3=BCgemer?= <lruegeme@techfak.uni-bielefeld.de>
Date: Wed, 14 Mar 2018 11:12:46 +0100
Subject: [PATCH] missing template version bump, changed gradle logging -
ROS_GRADLE_VERBOSE is now using --debug
---
cmake/rosjava.cmake.em | 2 +-
src/rosjava_build_tools/create_rosjava_project.py | 4 ++--
.../templates/android_package/build.gradle.in | 2 +-
.../templates/rosjava_package/build.gradle.in | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/cmake/rosjava.cmake.em b/cmake/rosjava.cmake.em
index b59faf5..7d44e7d 100644
--- a/cmake/rosjava.cmake.em
+++ b/cmake/rosjava.cmake.em
@@ -77,7 +77,7 @@ macro(catkin_rosjava_setup)
set(gradle_tasks ${ARGV})
endif()
if(ROS_GRADLE_VERBOSE)
- set(gradle_options "")
+ set(gradle_options "--debug")
else()
set(gradle_options "-q")
endif()
diff --git a/src/rosjava_build_tools/create_rosjava_project.py b/src/rosjava_build_tools/create_rosjava_project.py
index 62136c2..25e1b21 100644
--- a/src/rosjava_build_tools/create_rosjava_project.py
+++ b/src/rosjava_build_tools/create_rosjava_project.py
@@ -175,8 +175,8 @@ def add_tasks_to_cmake_setup(tasks):
gradle_tasks = set([])
if rosjava_setup_string.find("publish") == -1:
gradle_tasks.add("publish")
- if rosjava_setup_string.find("installApp") == -1:
- gradle_tasks.add("installApp")
+ if rosjava_setup_string.find("install") == -1:
+ gradle_tasks.add("install")
gradle_tasks |= set(tasks)
console.pretty_print(' File : ', console.cyan)
console.pretty_println('CMakeLists.txt (gradle task update)', console.yellow)
diff --git a/src/rosjava_build_tools/templates/android_package/build.gradle.in b/src/rosjava_build_tools/templates/android_package/build.gradle.in
index cf10362..f71843a 100644
--- a/src/rosjava_build_tools/templates/android_package/build.gradle.in
+++ b/src/rosjava_build_tools/templates/android_package/build.gradle.in
@@ -15,7 +15,7 @@
*/
task wrapper(type: Wrapper) {
- gradleVersion = '2.14.1'
+ gradleVersion = '4.6'
}
buildscript {
diff --git a/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in b/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in
index 2de70bd..f8269b7 100644
--- a/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in
+++ b/src/rosjava_build_tools/templates/rosjava_package/build.gradle.in
@@ -15,7 +15,7 @@
*/
task wrapper(type: Wrapper) {
- gradleVersion = '2.14.1'
+ gradleVersion = '4.6'
}
buildscript {
--
GitLab