Merge pull request #170 from josephm28/update-android-client-to-sdk-2.1.0

Update to 2.1.0, Java 17, gradle 8.6 / plugin 8.4.1

Author: JonasVautherin

examples/android-client/app/build.gradle

@@ -5,17 +5,19 @@ configurations {
 }
 
 android {
-    compileSdkVersion 30
+    namespace "io.mavsdk.androidclient"
+
+    compileSdkVersion 33
 
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
     }
 
     defaultConfig {
         applicationId "io.mavsdk.androidclient"
         minSdkVersion 21
-        targetSdkVersion 30
+        targetSdkVersion 33
         versionCode 2
         versionName "1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@@ -40,10 +42,8 @@ task checkstyle(type: Checkstyle) {
     maxWarnings 0
 
     reports {
-        xml.enabled true
         xml.destination new File("$project.buildDir/reports/checkstyle/checkstyle_report.xml")
 
-        html.enabled true
         html.destination new File("$project.buildDir/reports/checkstyle/checkstyle_report.html")
     }
 }
@@ -58,11 +58,11 @@ dependencies {
     implementation 'com.github.tony19:logback-android:2.0.0'
     implementation 'com.google.android.material:material:1.2.0'
     implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.0'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-telemetry:6.1.0'
-    implementation 'io.mavsdk:mavsdk:1.2.0'
-    implementation 'io.mavsdk:mavsdk-server:1.2.1'
-    implementation 'org.slf4j:slf4j-api:1.7.28'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.1'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-telemetry:7.0.0'
+    implementation 'io.mavsdk:mavsdk:2.1.0'
+    implementation 'io.mavsdk:mavsdk-server:2.1.0'
+    implementation 'org.slf4j:slf4j-api:2.0.13'
 
     testImplementation 'junit:junit:4.13'
 

examples/android-client/app/src/main/AndroidManifest.xml

@@ -15,7 +15,8 @@
 
         <activity
             android:name=".MapsActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <action android:name="android.intent.action.VIEW" />

examples/android-client/app/src/main/java/io/mavsdk/androidclient/MapsActivity.java

@@ -141,21 +141,17 @@ public boolean onCreateOptionsMenu(Menu menu) {
   @Override
   public boolean onOptionsItemSelected(MenuItem item) {
     // Handle item selection
-    switch (item.getItemId()) {
-      case R.id.disarm:
-        drone.getAction().kill().subscribe();
-        break;
-      case R.id.land:
-        drone.getAction().land().subscribe();
-        break;
-      case R.id.return_home:
-        drone.getAction().returnToLaunch().subscribe();
-        break;
-      case R.id.takeoff:
-        drone.getAction().arm().andThen(drone.getAction().takeoff()).subscribe();
-        break;
-      default:
-        return super.onOptionsItemSelected(item);
+    int itemId = item.getItemId();
+    if(itemId == R.id.disarm) {
+      drone.getAction().kill().subscribe();
+    } else if (itemId == R.id.land) {
+      drone.getAction().land().subscribe();
+    } else if (itemId == R.id.return_home) {
+      drone.getAction().returnToLaunch().subscribe();
+    } else if (itemId == R.id.takeoff) {
+      drone.getAction().arm().andThen(drone.getAction().takeoff()).subscribe();
+    } else {
+      return super.onOptionsItemSelected(item);
     }
     return true;
   }
@@ -228,7 +224,7 @@ public void onMapReady(@NonNull MapboxMap mapboxMap) {
       // Add the marker image to map
       style.addImage("marker-icon-id",
               BitmapFactory.decodeResource(
-                      MapsActivity.this.getResources(), R.drawable.mapbox_marker_icon_default));
+                      MapsActivity.this.getResources(), com.mapbox.mapboxsdk.plugins.annotation.R.drawable.mapbox_marker_icon_default));
 
       symbolManager = new SymbolManager(this.mapView, this.map, style);
       symbolManager.setIconAllowOverlap(true);

examples/android-client/app/src/main/java/io/mavsdk/androidclient/MapsViewModel.java

@@ -6,6 +6,7 @@
 import com.mapbox.mapboxsdk.geometry.LatLng;
 import io.mavsdk.System;
 import io.mavsdk.mission.Mission;
+import io.mavsdk.mission.Mission.MissionItem.VehicleAction;
 import io.mavsdk.mission.Mission.MissionPlan;
 import java.util.ArrayList;
 import java.util.List;
@@ -55,7 +56,8 @@ void startMission(System drone) {
             1.0,
             Float.NaN,
             Float.NaN,
-            Float.NaN);
+            Float.NaN,
+            VehicleAction.NONE);
         missionItems.add(missionItem);
       }
 

examples/android-client/build.gradle

@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.1'
+        classpath 'com.android.tools.build:gradle:8.4.1'
     }
 }
 

examples/android-client/gradle/wrapper/gradle-wrapper.properties

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip