Skip to content
This repository was archived by the owner on Dec 8, 2022. It is now read-only.

Android 9 support #80

Merged
jubeira merged 6 commits into from
Dec 26, 2018
Merged

Android 9 support #80

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9cad45b
First working draft for API 28; tested with teleop.
Sep 7, 2018
e3fb0db
Removing unnecesary build tools declaration; bumping target SDK versi…
Oct 2, 2018
e5e1ef5
Upgrading gradle to 4.10.2.
Oct 4, 2018
3ed90a5
Upgrading to new android_core_components package and new android_remo…
Oct 4, 2018
a512375
Adding missing permission for Android P.
Oct 4, 2018
e5d1e38
0.3.0.
Oct 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
Changelog
=========
0.3.0 (2018-10-04)
------------------
* Kinetic build, with support for Android P.

0.2.0 (2015-02-22)
------------------
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

task wrapper(type: Wrapper) {
gradleVersion = '3.5.1'
gradleVersion = '4.10.2'
}

buildscript {
Expand Down Expand Up @@ -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'
}
}
}
3 changes: 3 additions & 0 deletions gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Binary file modified gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
78 changes: 43 additions & 35 deletions gradlew
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 4 additions & 10 deletions gradlew.bat
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 5 additions & 6 deletions make_a_map/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)'
Expand All @@ -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"
}
Expand Down
1 change: 1 addition & 0 deletions make_a_map/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<application android:icon="@drawable/map"
android:label="@string/app_name"
Expand Down
11 changes: 5 additions & 6 deletions map_manager/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,20 +14,19 @@
* the License.
*/
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_messages:world_canvas_msgs:[0.2,0.3)'
}

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.0"
}
Expand Down
1 change: 1 addition & 0 deletions map_manager/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<application android:icon="@drawable/map"
android:label="@string/app_name"
Expand Down
11 changes: 5 additions & 6 deletions map_nav/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
* the License.
*/
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:move_base_msgs:[1.12,1.13)'
Expand All @@ -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.0"
}
Expand Down
1 change: 1 addition & 0 deletions map_nav/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<application android:icon="@drawable/map"
android:label="@string/app_name"
Expand Down
2 changes: 1 addition & 1 deletion package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0"?>
<package>
<name>android_apps</name>
<version>0.2.0</version>
<version>0.3.0</version>
<description>
Applications for robot-android pairing..
</description>
Expand Down
11 changes: 5 additions & 6 deletions teleop/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
Expand Down
1 change: 1 addition & 0 deletions teleop/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

<application android:icon="@drawable/teleop"
android:label="@string/app_name"
Expand Down