Merge pull request #202 from matthieu-db/update_mavsdk_3.5

JonasVautherin · web-flow · commit 8d80ec83842f · 2025-05-26T18:27:51.000+02:00
Update mavsdk-server to 3.5.0
diff --git a/examples/android-client/app/build.gradle b/examples/android-client/app/build.gradle
@@ -7,8 +7,6 @@ configurations {
 android {
     namespace "io.mavsdk.androidclient"
 
-    compileSdkVersion 33
-
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
         targetCompatibility JavaVersion.VERSION_17
@@ -17,10 +15,12 @@ android {
     defaultConfig {
         applicationId "io.mavsdk.androidclient"
         minSdkVersion 21
-        targetSdkVersion 33
+        compileSdk 35
+        targetSdkVersion 35
         versionCode 2
         versionName "1.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        resValue "string", "mapbox_access_token", project.property("mapbox_access_token")
     }
     buildTypes {
         release {
@@ -30,7 +30,7 @@ android {
     }
 }
 
-task checkstyle(type: Checkstyle) {
+tasks.register('checkstyle', Checkstyle) {
     configFile = rootProject.file("config/checkstyle/checkstyle.xml")
     source 'src'
     include '**/*.java'
@@ -53,19 +53,18 @@ build.dependsOn 'checkstyle'
 dependencies {
     checkstyleClasspath 'com.puppycrawl.tools:checkstyle:8.17'
 
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    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.github.tony19:logback-android:3.0.0'
+    implementation 'com.google.android.material:material:1.12.0'
     implementation 'com.mapbox.mapboxsdk:mapbox-android-sdk:9.2.1'
-    implementation 'com.mapbox.mapboxsdk:mapbox-android-telemetry:7.0.0'
+    implementation 'com.mapbox.mapboxsdk:mapbox-android-plugin-annotation-v9:0.9.0'
     implementation 'io.mavsdk:mavsdk:2.1.0'
-    implementation 'io.mavsdk:mavsdk-server:2.1.0'
-    implementation 'org.slf4j:slf4j-api:2.0.13'
+    implementation 'io.mavsdk:mavsdk-server:2.1.6'
+    implementation 'org.slf4j:slf4j-api:2.0.17'
 
-    testImplementation 'junit:junit:4.13'
+    testImplementation 'junit:junit:4.13.2'
 
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
-    androidTestImplementation 'androidx.test:runner:1.2.0'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
+    androidTestImplementation 'androidx.test:runner:1.6.2'
 }
diff --git a/examples/android-client/app/src/main/AndroidManifest.xml b/examples/android-client/app/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
 
         <activity
             android:name=".MapsActivity"
-            android:label="@string/app_name"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/examples/android-client/app/src/main/java/io/mavsdk/androidclient/MapsActivity.java b/examples/android-client/app/src/main/java/io/mavsdk/androidclient/MapsActivity.java
@@ -10,6 +10,7 @@
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProviders;
 import com.google.android.material.floatingactionbutton.FloatingActionButton;
@@ -71,8 +72,10 @@ public class MapsActivity extends AppCompatActivity implements OnMapReadyCallbac
   @Override
   public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    Mapbox.getInstance(this, getString(R.string.access_token));
+    Mapbox.getInstance(this, getString(R.string.mapbox_access_token));
     setContentView(R.layout.activity_maps);
+    Toolbar toolbar = findViewById(R.id.toolbar);
+    setSupportActionBar(toolbar);
     mapView = findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
     mapView.getMapAsync(this);
diff --git a/examples/android-client/app/src/main/res/layout/activity_maps.xml b/examples/android-client/app/src/main/res/layout/activity_maps.xml
@@ -1,39 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:mapbox="http://schemas.android.com/apk/res-auto"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/container"
     android:layout_height="match_parent"
-    android:layout_width="match_parent">
+    android:layout_width="match_parent"
+    android:fitsSystemWindows="true">
+
+    <com.google.android.material.appbar.MaterialToolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <com.mapbox.mapboxsdk.maps.MapView
         android:id="@+id/mapView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        mapbox:mapbox_cameraTargetLat="41.885"
-        mapbox:mapbox_cameraTargetLng="-87.679"
-        mapbox:mapbox_cameraTilt="60"
-        mapbox:mapbox_cameraZoom="12"/>
+        android:layout_height="0dp"
+        app:mapbox_cameraTargetLat="41.885"
+        app:mapbox_cameraTargetLng="-87.679"
+        app:mapbox_cameraTilt="60"
+        app:mapbox_cameraZoom="12"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"/>
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/fab"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:src="@drawable/ic_play_arrow_black_24dp"
-        android:tint="@color/white"
-        android:layout_gravity="end|bottom"/>
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
 
-    <Button
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/buttonRunDestroyMavsdkServer"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_margin="16dp"
         android:text="@string/run_mavsdk_server"
-        android:layout_gravity="start|top"/>
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintStart_toStartOf="parent"/>
 
     <FrameLayout
         android:id="@+id/start_mission_fragment_container"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@id/toolbar"
+        app:layout_constraintBottom_toBottomOf="parent"/>
 
-</FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/examples/android-client/app/src/main/res/values/colors.xml b/examples/android-client/app/src/main/res/values/colors.xml
diff --git a/examples/android-client/app/src/main/res/values/strings.xml b/examples/android-client/app/src/main/res/values/strings.xml
@@ -1,7 +1,6 @@
 <resources>
     <string name="app_name">MAVSDK Android Client</string>
 
-    <string name="access_token">pk.eyJ1IjoibWF2ZHNrLWphdmEtc2FtcGxlIiwiYSI6ImNrMGZjY2lxNTBpbzIzZ2xjaGlsNDZ5YXkifQ.f0jCQvYbGQecPCFFy_3jSA</string>
     <string name="kill">Kill</string>
     <string name="return_home">Return</string>
     <string name="land">Land</string>
diff --git a/examples/android-client/app/src/main/res/values/styles.xml b/examples/android-client/app/src/main/res/values/styles.xml
@@ -1,11 +1,6 @@
 <resources>
 
     <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
+    <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar"/>
 
 </resources>
diff --git a/examples/android-client/build.gradle b/examples/android-client/build.gradle
@@ -5,17 +5,27 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.4.1'
+        classpath 'com.android.tools.build:gradle:8.10.0'
     }
 }
 
 allprojects {
     repositories {
         google()
+        maven {
+            url 'https://api.mapbox.com/downloads/v2/releases/maven'
+            authentication {
+                basic(BasicAuthentication)
+            }
+            credentials {
+                username = "mapbox"
+                password = project.properties["mapbox_access_token"]
+            }
+        }
         jcenter()
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
diff --git a/examples/android-client/gradle.properties b/examples/android-client/gradle.properties
@@ -16,5 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
 
+mapbox_access_token=pk.eyJ1IjoibWF2ZHNrLWphdmEtc2FtcGxlIiwiYSI6ImNrMGZjY2lxNTBpbzIzZ2xjaGlsNDZ5YXkifQ.f0jCQvYbGQecPCFFy_3jSA
diff --git a/examples/android-client/gradle/wrapper/gradle-wrapper.properties b/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-8.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
diff --git a/mavsdk_server/build.gradle b/mavsdk_server/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.2.2'
+        classpath 'com.android.tools.build:gradle:8.10.0'
     }
 }
 
@@ -19,9 +19,9 @@ allprojects {
         mavenCentral()
     }
 
-    def mavsdk_server_release = "v2.14.1"
+    def mavsdk_server_release = "v3.5.0"
 
-    task extractMavsdkServer(type: Copy) {
+    tasks.register('extractMavsdkServer', Copy) {
         mkdir project.buildDir.getAbsolutePath() + "/tmp"
 
         def extractForArch = { arch ->
@@ -110,7 +110,6 @@ allprojects {
 }
 
 android {
-    compileSdkVersion 33
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_17
@@ -119,7 +118,8 @@ android {
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 33
+        targetSdkVersion 35
+        compileSdk 35
 
         archivesBaseName = 'mavsdk-server'
         group = 'io.mavsdk'
diff --git a/mavsdk_server/gradle/wrapper/gradle-wrapper.properties b/mavsdk_server/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/mavsdk_server/src/main/cpp/native-lib.cpp b/mavsdk_server/src/main/cpp/native-lib.cpp
@@ -22,7 +22,9 @@ extern "C"
         auto mavsdk_server = reinterpret_cast<MavsdkServer*>(mavsdkServerHandle);
 
         LOGD("Running mavsdk_server with connection url: %s", native_connection_url);
-        if (!mavsdk_server_run(mavsdk_server, native_connection_url, mavsdk_server_port)) {
+        auto result = mavsdk_server_run(mavsdk_server, native_connection_url, mavsdk_server_port);
+        if (result != 0) {
+            LOGD("Failed to start mavsdk_server: %d", result);
             return false;
         }
 
diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -18,7 +18,7 @@ subprojects {
 
     group = 'io.mavsdk'
     archivesBaseName = 'mavsdk'
-    version = '2.1.0'
+    version = '3.0.0'
 
     repositories {
         jcenter()
diff --git a/sdk/gradle/wrapper/gradle-wrapper.properties b/sdk/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
diff --git a/sdk/proto b/sdk/proto
@@ -1 +1 @@
-Subproject commit 736bc2af1b6eae5c255b5b68014597527bd78c8c
+Subproject commit e053ecabc5b825bb9c831f3f31ab24ff727ce1e6
diff --git a/sdk/templates/request.j2 b/sdk/templates/request.j2
@@ -1,5 +1,5 @@
 @CheckReturnValue
-public Single<{% if return_type.is_primitive %}{{ return_type.name }}{% elif return_type.is_repeated %}List<{{ plugin_name.upper_camel_case }}.{{ return_type.inner_name }}>{% else %}{{ plugin_name.upper_camel_case }}.{{ return_type.name }}{% endif %}> {{ name.lower_camel_case }}({% for param in params %}@NonNull {{ param.type_info.name }} {{ param.name.lower_camel_case }}{{ ", " if not loop.last }}{% endfor %}) {
+public Single<{% if return_type.is_primitive %}{{ return_type.name }}{% elif return_type.is_repeated %}List<{{ plugin_name.upper_camel_case }}.{{ return_type.inner_name }}>{% else %}{{ plugin_name.upper_camel_case }}.{{ return_type.name }}{% endif %}> {{ name.lower_camel_case }}{% if name.lower_camel_case == "getFlightInformation" %}Sync{% endif %}({% for param in params %}@NonNull {{ param.type_info.name }} {{ param.name.lower_camel_case }}{{ ", " if not loop.last }}{% endfor %}) {
   {{ plugin_name.upper_camel_case }}Proto.{{ name.upper_camel_case }}Request request = {{ plugin_name.upper_camel_case }}Proto.{{ name.upper_camel_case }}Request.newBuilder()
   {%- for param in params %}
     {%- if param.type_info.is_primitive %}

Original file line number	Diff line number	Diff line change
`@@ -5,17 +5,27 @@ buildscript {`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`dependencies {`
`8`		`- classpath 'com.android.tools.build:gradle:8.4.1'`
	`8`	`+ classpath 'com.android.tools.build:gradle:8.10.0'`
`9`	`9`	`}`
`10`	`10`	`}`
`11`	`11`
`12`	`12`	`allprojects {`
`13`	`13`	`repositories {`
`14`	`14`	`google()`
	`15`	`+ maven {`
	`16`	`+ url 'https://api.mapbox.com/downloads/v2/releases/maven'`
	`17`	`+ authentication {`
	`18`	`+ basic(BasicAuthentication)`
	`19`	`+ }`
	`20`	`+ credentials {`
	`21`	`+ username = "mapbox"`
	`22`	`+ password = project.properties["mapbox_access_token"]`
	`23`	`+ }`
	`24`	`+ }`
`15`	`25`	`jcenter()`
`16`	`26`	`}`
`17`	`27`	`}`
`18`	`28`
`19`		`-task clean(type: Delete) {`
	`29`	`+tasks.register('clean', Delete) {`
`20`	`30`	`delete rootProject.buildDir`
`21`	`31`	`}`