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

Commit c758ade

Browse files
stonierstonier
committed
fix min versions and disable all but teleop.
Damon made some changes to the map view/camera views which need to be updated here for indigo. Disabling those that depend on it for now just so we have a working build.
1 parent a300ee6 commit c758ade

File tree

12 files changed

+43
-28
lines changed

12 files changed

+43
-28
lines changed

‎make_a_map/build.gradle

+7
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,11 @@ apply plugin: 'com.android.application'
2525

2626
android {
2727
compileSdkVersion 15
28+
29+
defaultConfig {
30+
minSdkVersion 15
31+
targetSdkVersion 15
32+
versionCode 3
33+
versionName "1.0"
34+
}
2835
}

‎make_a_map/src/main/AndroidManifest.xml

-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.github.rosjava.android_apps.make_a_map"
4-
android:versionCode="3"
5-
android:versionName="1.0"
64
xmlns:tools="http://schemas.android.com/tools">
75

8-
<uses-sdk android:minSdkVersion="13" />
9-
106
<uses-permission android:name="android.permission.INTERNET" />
117
<uses-permission android:name="android.permission.WAKE_LOCK" />
128

‎make_a_map/src/main/res/layout/main.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
android:layout_width="fill_parent"
5858
android:layout_height="fill_parent"
5959
android:layout_weight=".25"
60-
android:src="@drawable/icon" />
60+
android:src="@mipmap/icon" />
6161

6262
<LinearLayout
6363
android:id="@+id/side_layout"
@@ -82,4 +82,4 @@
8282
</LinearLayout>
8383
</LinearLayout>
8484

85-
</LinearLayout>
85+
</LinearLayout>

‎map_manager/build.gradle

+8-1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,13 @@ dependencies {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25-
compileSdkVersion 15
25+
compileSdkVersion 15
26+
27+
defaultConfig {
28+
minSdkVersion 15
29+
targetSdkVersion 15
30+
versionCode 3
31+
versionName "1.0"
32+
}
2633
}
2734

‎map_manager/src/main/AndroidManifest.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.github.rosjava.android_apps.map_manager"
4-
android:versionCode="3"
5-
android:versionName="1.0"
64
xmlns:tools="http://schemas.android.com/tools">
75

8-
<uses-sdk android:minSdkVersion="13" />
9-
106
<uses-permission android:name="android.permission.INTERNET" />
117
<uses-permission android:name="android.permission.WAKE_LOCK" />
128

@@ -35,4 +31,4 @@
3531
</intent-filter>
3632
</service>
3733
</application>
38-
</manifest>
34+
</manifest>

‎map_nav/build.gradle

+8-1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,13 @@ dependencies {
2424
apply plugin: 'com.android.application'
2525

2626
android {
27-
compileSdkVersion 15
27+
compileSdkVersion 15
28+
29+
defaultConfig {
30+
minSdkVersion 15
31+
targetSdkVersion 15
32+
versionCode 3
33+
versionName "1.0"
34+
}
2835
}
2936

‎map_nav/src/main/AndroidManifest.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.github.rosjava.android_apps.map_nav"
4-
android:versionCode="3"
5-
android:versionName="1.0"
64
xmlns:tools="http://schemas.android.com/tools">
75

8-
<uses-sdk android:minSdkVersion="13" />
9-
106
<uses-permission android:name="android.permission.INTERNET" />
117
<uses-permission android:name="android.permission.WAKE_LOCK" />
128

@@ -35,4 +31,4 @@
3531
</intent-filter>
3632
</service>
3733
</application>
38-
</manifest>
34+
</manifest>

‎map_nav/src/main/res/layout/main.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
android:layout_width="fill_parent"
6868
android:layout_height="fill_parent"
6969
android:layout_weight=".25"
70-
android:src="@drawable/icon" />
70+
android:src="@mipmap/icon" />
7171

7272
<LinearLayout
7373
android:id="@+id/side_layout"
@@ -92,4 +92,4 @@
9292
</LinearLayout>
9393
</LinearLayout>
9494

95-
</LinearLayout>
95+
</LinearLayout>

‎settings.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
*/
1616

1717
include 'teleop'
18+
/*
1819
include 'map_nav'
1920
include 'make_a_map'
2021
include 'map_manager'
22+
*/

‎teleop/build.gradle

+9-1
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,13 @@ dependencies {
2222
apply plugin: 'com.android.application'
2323

2424
android {
25-
compileSdkVersion 15
25+
compileSdkVersion 15
26+
27+
defaultConfig {
28+
minSdkVersion 15
29+
targetSdkVersion 15
30+
versionCode 2
31+
versionName "1.0"
32+
}
33+
2634
}

‎teleop/src/main/AndroidManifest.xml

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
33
package="com.github.rosjava.android_apps.teleop"
4-
android:versionCode="2"
5-
android:versionName="1.0"
64
xmlns:tools="http://schemas.android.com/tools">
75

8-
<uses-sdk android:minSdkVersion="13" />
9-
106
<uses-permission android:name="android.permission.INTERNET" />
117
<uses-permission android:name="android.permission.WAKE_LOCK" />
128

@@ -35,4 +31,4 @@
3531
</intent-filter>
3632
</service>
3733
</application>
38-
</manifest>
34+
</manifest>

‎teleop/src/main/res/layout/main.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
android:layout_width="fill_parent"
4040
android:layout_height="fill_parent"
4141
android:layout_weight=".5"
42-
android:src="@drawable/icon" />
42+
android:src="@mipmap/icon" />
4343

4444
<LinearLayout
4545
android:id="@+id/side_layout"
@@ -68,4 +68,4 @@
6868
</LinearLayout>
6969
</LinearLayout>
7070

71-
</LinearLayout>
71+
</LinearLayout>

0 commit comments

Comments
 (0)