Merge pull request #79 from jubeira/task/update_to_android_0.4.0

Update to android_core 0.4.0

Author: Juan Ignacio Ubeira

CHANGELOG.rst

@@ -1,6 +1,10 @@
 Changelog
 =========
 
+0.3.0 (2018-04-10)
+------------------
+* First build on Kinetic with refactored android_core for Android P.
+
 0.2.0 (2015-02-22)
 ------------------
 * First build on indigo

build.gradle

@@ -15,11 +15,11 @@
  */
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '2.2.1'
+  gradleVersion = '4.10.2'
 }
 
 buildscript {
-    apply from: "https://github.com/rosjava/android_core/raw/indigo/buildscript.gradle"
+    apply from: "https://github.com/rosjava/android_core/raw/kinetic/buildscript.gradle"
 }
 
 apply plugin: 'catkin'
@@ -56,6 +56,7 @@ subprojects {
         exclude "META-INF/LICENSE.txt"
         exclude "META-INF/NOTICE.txt"
       }
+      flavorDimensions 'default'
     }
 
   }

common_tools/build.gradle

@@ -16,16 +16,16 @@
 
 //noinspection GroovyAssignabilityCheck
 dependencies {
-    compile 'org.ros.android_core:android_10:[0.2,0.3)'
-    compile 'org.ros.rosjava_core:rosjava:[0.2,0.3)'
-    compile 'org.ros.rosjava_bootstrap:message_generation:[0.2,0.3)'
-    compile 'org.ros.rosjava_messages:diagnostic_msgs:[1.11, 1.12)'
+    compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
+    compile 'org.ros.rosjava_core:rosjava:[0.3,0.4)'
+    compile 'org.ros.rosjava_bootstrap:message_generation:[0.3,0.4)'
+    compile 'org.ros.rosjava_messages:diagnostic_msgs:[1.12, 1.13)'
     compile 'org.ros.rosjava_messages:rocon_interaction_msgs:[0.7,0.8)'
     compile 'org.ros.rosjava_messages:rocon_std_msgs:[0.7,0.8)'
     compile 'org.ros.rosjava_messages:rocon_app_manager_msgs:[0.7,0.8)'
-    compile 'com.github.rosjava.android_extras:gingerbread:[0.2,0.3)'
-    compile 'com.github.rosjava.android_extras:zxing:[0.2,0.3)'
-    compile 'com.github.rosjava.zeroconf_jmdns_suite:jmdns:[0.2,0.3)'
+    compile 'com.github.rosjava.android_extras:gingerbread:[0.3,0.4)'
+    compile 'com.github.rosjava.android_extras:zxing:[0.3,0.4)'
+    compile 'com.github.rosjava.zeroconf_jmdns_suite:jmdns:[0.3,0.4)'
     compile 'com.github.robotics_in_concert.rocon_rosjava_core:rosjava_utils:[0.2,0.3)'
     compile 'com.github.robotics_in_concert.rocon_rosjava_core:master_info:[0.2,0.3)'
     compile 'com.github.robotics_in_concert.rocon_rosjava_core:rocon_interactions:[0.2,0.3)'
@@ -35,15 +35,17 @@ dependencies {
 apply plugin: 'com.android.library'
 
 android {
-  compileSdkVersion 15
+  compileSdkVersion 28
 
   defaultConfig {
-    minSdkVersion 15
-    targetSdkVersion 15
+    minSdkVersion 16
+    targetSdkVersion 28
     versionCode 1
     versionName "1.0.1"
   }
-
+  lintOptions {
+    abortOnError = false
+  }
 }
 
 defaultTasks 'assembleRelease'

gradle.properties

@@ -1,2 +1,4 @@
 org.gradle.daemon=true
-org.gradle.parallel=true
+# Disabling the SNI extension fixes "handshake alert:  unrecognized_name" error
+# in Java 7.
+org.gradle.jvmargs=-XX:MaxPermSize=512m -Djsse.enableSNIExtension=false

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,5 @@
-#Sat Feb 21 01:36:03 KST 2015
 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-2.2.1-all.zip

gradle/wrapper/gradle-wrapper.properties

@@ -22,21 +22,22 @@ dependencies {
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 15
+  compileSdkVersion 28
 
   defaultConfig {
-    minSdkVersion 15
-    targetSdkVersion 15
+    minSdkVersion 16
+    targetSdkVersion 28
     versionCode 6
     versionName "1.4.1"
   }
-
   productFlavors {
-    indigo {
-      applicationId "com.github.rosjava.android_remocons.headless_launcher.indigo"
+    kinetic {
+      applicationId "com.github.rosjava.android_remocons.headless_launcher.kinetic"
     }
   }
-
+  lintOptions {
+    abortOnError = false
+  }
 }
 
 defaultTasks 'assembleRelease'

gradlew

@@ -16,28 +16,31 @@
 
 //noinspection GroovyAssignabilityCheck
 dependencies {
-  compile 'org.ros.android_core:android_10:[0.2,0.3)'
-  compile 'org.ros.rosjava_core:rosjava:[0.2,0.3)'
+  compile 'org.ros.android_core:android_core_components:[0.4,0.5)'
+  compile 'org.ros.rosjava_core:rosjava:[0.3,0.4)'
   compile 'org.ros.rosjava_messages:std_msgs:[0.5,0.6)'
   compile project(':common_tools')
 }
 
 apply plugin: 'com.android.application'
 
 android {
-  compileSdkVersion 15
+  compileSdkVersion 28
 
   defaultConfig {
-    minSdkVersion 15
-    targetSdkVersion 15
+    minSdkVersion 16
+    targetSdkVersion 28
     versionCode 2
     versionName "1.0.1"
   }
   productFlavors {
-    indigo {
-      applicationId "com.github.rosjava.android_remocons.listener.indigo"
+    kinetic {
+      applicationId "com.github.rosjava.android_remocons.listener.kinetic"
     }
   }
+  lintOptions {
+    abortOnError = false
+  }
 }
 
 defaultTasks 'assembleRelease'