diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 231aff5..4eed929 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,5 +1,8 @@ Changelog ========= +0.3.0 (2018-10-04) +------------------ +* Kinetic build, with support for Android P. 0.2.0 (2015-02-22) ------------------ diff --git a/build.gradle b/build.gradle index 4bc0e95..edaf076 100644 --- a/build.gradle +++ b/build.gradle @@ -15,7 +15,7 @@ */ task wrapper(type: Wrapper) { - gradleVersion = '3.5.1' + gradleVersion = '4.10.2' } buildscript { @@ -50,12 +50,12 @@ subprojects { afterEvaluate { project -> android { - packagingOptions { /* https://github.com/rosjava/android_core/issues/194 */ exclude 'META-INF/LICENSE.txt' exclude 'META-INF/NOTICE.txt' } + flavorDimensions 'default' } } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 1a644c7..c151d1b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,4 @@ org.gradle.daemon=true +# Disabling the SNI extension fixes "handshake alert: unrecognized_name" error +# in Java 7. +org.gradle.jvmargs=-XX:MaxPermSize=512m -Djsse.enableSNIExtension=false diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 72eace8..29953ea 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 7004efb..e0b3fb8 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Fri Jan 26 13:47:21 ART 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.5.1-bin.zip diff --git a/gradlew b/gradlew index 91a7e26..cccdd3d 100755 --- a/gradlew +++ b/gradlew @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/usr/bin/env sh ############################################################################## ## @@ -6,20 +6,38 @@ ## ############################################################################## -# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" -warn ( ) { +warn () { echo "$*" } -die ( ) { +die () { echo echo "$*" echo @@ -30,6 +48,7 @@ die ( ) { cygwin=false msys=false darwin=false +nonstop=false case "`uname`" in CYGWIN* ) cygwin=true @@ -40,31 +59,11 @@ case "`uname`" in MINGW* ) msys=true ;; + NONSTOP* ) + nonstop=true + ;; esac -# For Cygwin, ensure paths are in UNIX format before anything is touched. -if $cygwin ; then - [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"` -fi - -# Attempt to set APP_HOME -# Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi -done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >&- -APP_HOME="`pwd -P`" -cd "$SAVED" >&- - CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar # Determine the Java command to use to start the JVM. @@ -90,7 +89,7 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then MAX_FD_LIMIT=`ulimit -H -n` if [ $? -eq 0 ] ; then if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then @@ -114,6 +113,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` @@ -154,11 +154,19 @@ if $cygwin ; then esac fi -# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules -function splitJvmOpts() { - JVM_OPTS=("$@") +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " } -eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS -JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" +APP_ARGS=$(save "$@") + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong +if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then + cd "$(dirname "$0")" +fi -exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index aec9973..e95643d 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -8,14 +8,14 @@ @rem Set local scope for the variables with windows NT shell if "%OS%"=="Windows_NT" setlocal -@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= - set DIRNAME=%~dp0 if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -46,10 +46,9 @@ echo location of your Java installation. goto fail :init -@rem Get command-line arguments, handling Windowz variants +@rem Get command-line arguments, handling Windows variants if not "%OS%" == "Windows_NT" goto win9xME_args -if "%@eval[2+2]" == "4" goto 4NT_args :win9xME_args @rem Slurp the command line arguments. @@ -60,11 +59,6 @@ set _SKIP=2 if "x%~1" == "x" goto execute set CMD_LINE_ARGS=%* -goto execute - -:4NT_args -@rem Get arguments from the 4NT Shell from JP Software -set CMD_LINE_ARGS=%$ :execute @rem Setup the command line diff --git a/make_a_map/build.gradle b/make_a_map/build.gradle index a93e25a..88a1de3 100644 --- a/make_a_map/build.gradle +++ b/make_a_map/build.gradle @@ -15,8 +15,8 @@ */ dependencies { - compile 'com.github.rosjava.android_remocons:common_tools:[0.2,0.3)' - compile 'org.ros.android_core:android_15:[0.3,0.4)' + compile 'com.github.rosjava.android_remocons:common_tools:[0.3,0.4)' + compile 'org.ros.android_core:android_core_components:[0.4,0.5)' compile 'org.ros.rosjava_core:rosjava_geometry:[0.3,0.4)' compile 'org.ros.rosjava_messages:map_store:[0.3,0.4)' compile 'org.ros.rosjava_messages:world_canvas_msgs:[0.2,0.3)' @@ -25,12 +25,11 @@ dependencies { apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 28 defaultConfig { - minSdkVersion 15 - targetSdkVersion 22 + minSdkVersion 16 + targetSdkVersion 28 versionCode 3 versionName "1.0.1" } diff --git a/make_a_map/src/main/AndroidManifest.xml b/make_a_map/src/main/AndroidManifest.xml index e24d956..2d017d8 100644 --- a/make_a_map/src/main/AndroidManifest.xml +++ b/make_a_map/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ + + + android_apps - 0.2.0 + 0.3.0 Applications for robot-android pairing.. diff --git a/teleop/build.gradle b/teleop/build.gradle index 758158a..c771a91 100644 --- a/teleop/build.gradle +++ b/teleop/build.gradle @@ -15,19 +15,18 @@ */ dependencies { - compile 'com.github.rosjava.android_remocons:common_tools:[0.2,0.3)' - compile 'org.ros.android_core:android_15:[0.3,0.4)' + compile 'com.github.rosjava.android_remocons:common_tools:[0.3,0.4)' + compile 'org.ros.android_core:android_core_components:[0.4,0.5)' } apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "25.0.2" + compileSdkVersion 28 defaultConfig { - minSdkVersion 15 - targetSdkVersion 22 + minSdkVersion 16 + targetSdkVersion 28 versionCode 2 versionName "1.0.0" } diff --git a/teleop/src/main/AndroidManifest.xml b/teleop/src/main/AndroidManifest.xml index 04a08ba..e348d6b 100644 --- a/teleop/src/main/AndroidManifest.xml +++ b/teleop/src/main/AndroidManifest.xml @@ -5,6 +5,7 @@ +