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

Commit c5c2aff

Browse files
author
Juan Ignacio Ubeira
authored
Merge pull request #286 from jubeira/android_9_support
Android 9 support
2 parents 7bdff28 + 6d94603 commit c5c2aff

File tree

132 files changed

+166
-144
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+166
-144
lines changed

CHANGELOG.rst

Lines changed: 7 additions & 0 deletions

android_15/AndroidManifest.xml

Lines changed: 0 additions & 2 deletions
This file was deleted.

android_15/build.gradle

Lines changed: 0 additions & 35 deletions
This file was deleted.

android_acm_serial/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,18 +15,17 @@
1515
*/
1616

1717
dependencies {
18-
compile project(':android_15')
19-
compile project(':android_10')
18+
compile project(':android_core_components')
2019
}
2120

2221
apply plugin: 'com.android.library'
2322

2423
android {
25-
compileSdkVersion 25
24+
compileSdkVersion 28
2625

2726
defaultConfig {
28-
minSdkVersion 15
29-
targetSdkVersion 15
27+
minSdkVersion 16
28+
targetSdkVersion 28
3029
versionCode 1
3130
versionName "1.0"
3231
}

android_benchmarks/AndroidManifest.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33

44
<uses-permission android:name="android.permission.INTERNET" />
55
<uses-permission android:name="android.permission.WAKE_LOCK" />
6+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
67

78
<application
89
android:icon="@mipmap/icon"

android_benchmarks/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,18 @@
1616

1717
dependencies {
1818
compile 'org.ros.rosjava_core:rosjava_benchmarks:[0.3,0.4)'
19-
compile project(':android_10')
19+
compile project(':android_core_components')
2020
}
2121

2222
apply plugin: 'com.android.application'
2323

2424
android {
25-
compileSdkVersion 25
25+
compileSdkVersion 28
2626

2727
defaultConfig {
28-
minSdkVersion 10
28+
minSdkVersion 16
2929
applicationId "org.ros.android.android_benchmarks"
30-
targetSdkVersion 10
30+
targetSdkVersion 28
3131
versionCode 1
3232
versionName "1.0"
3333
}

android_10/AndroidManifest.xml renamed to android_core_components/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:tools="http://schemas.android.com/tools"
4-
package="org.ros.android.android_10">
4+
package="org.ros.android.android_core_components">
55

66

77

@@ -10,6 +10,7 @@
1010
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
1111
<uses-permission android:name="android.permission.WAKE_LOCK"/>
1212
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
13+
<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
1314

1415
<application
1516
android:icon="@mipmap/icon"

android_10/build.gradle renamed to android_core_components/build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,20 @@ dependencies {
1818
compile "org.ros.rosjava_core:rosjava:[0.3.2,0.4)"
1919
compile "org.ros.rosjava_messages:diagnostic_msgs:[1.12,1.13)"
2020
compile "org.ros.rosjava_messages:sensor_msgs:[1.12,1.13)"
21-
compile "com.android.support:appcompat-v7:25.1.0"
21+
compile 'org.ros.rosjava_core:rosjava_geometry:[0.3,0.4)'
22+
compile 'org.ros.rosjava_messages:visualization_msgs:[1.12,1.13)'
23+
compile "com.android.support:appcompat-v7:28.0.0"
24+
compile 'com.android.support:support-v4:28.0.0'
2225
}
2326

2427
apply plugin: "com.android.library"
2528

2629
android {
27-
compileSdkVersion 25
30+
compileSdkVersion 28
2831

2932
defaultConfig {
30-
minSdkVersion 10
31-
targetSdkVersion 10
33+
minSdkVersion 16
34+
targetSdkVersion 28
3235
versionCode 1
3336
versionName "1.0"
3437
}

0 commit comments

Comments
 (0)