Merge pull request #168 from mavlink/prepare-release-2.1.0

Prepare release 2.1.0
mavlink · Jun 26, 2024 · aee2c1e · aee2c1e
2 parents ef48590 + 064dd1a
commit aee2c1e
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 35 deletions.
diff --git a/README.md b/README.md
@@ -19,7 +19,7 @@ MAVSDK-Java is distributed through MavenCentral, meaning that it can be imported
 ```
 dependencies {
     ...
-    implementation 'io.mavsdk:mavsdk:2.0.1'
+    implementation 'io.mavsdk:mavsdk:2.1.0'
     ...
 }
 ```
@@ -29,8 +29,8 @@ For Android, `mavsdk_server` is distributed as an Android library (`aar`):
 ```
 dependencies {
     ...
-    implementation 'io.mavsdk:mavsdk:2.0.1'
-    implementation 'io.mavsdk:mavsdk-server:2.0.0'
+    implementation 'io.mavsdk:mavsdk:2.1.0'
+    implementation 'io.mavsdk:mavsdk-server:2.1.0'
     ...
 }
 ```

diff --git a/mavsdk_server/build.gradle b/mavsdk_server/build.gradle
@@ -123,8 +123,8 @@ android {
 
         archivesBaseName = 'mavsdk-server'
         group = 'io.mavsdk'
-        versionCode 2
-        version '2.0.1'
+        versionCode 3
+        version '2.1.0'
 
         ndk {
             abiFilters 'arm64-v8a', 'armeabi-v7a', 'x86', 'x86_64'

diff --git a/sdk/README.md b/sdk/README.md
@@ -8,7 +8,7 @@ Because it is deployed on Maven Central, adding MAVSDK-Java to your project is a
 
 ```groovy
 dependencies {
-    implementation 'io.mavsdk:mavsdk:2.0.1'
+    implementation 'io.mavsdk:mavsdk:2.1.0'
 }
 ```
 

diff --git a/sdk/build.gradle b/sdk/build.gradle
@@ -18,7 +18,7 @@ subprojects {
 
     group = 'io.mavsdk'
     archivesBaseName = 'mavsdk'
-    version = '2.0.1'
+    version = '2.1.0'
 
     repositories {
         jcenter()
@@ -85,8 +85,8 @@ subprojects {
         }
     }
 
-    tasks.withType(Copy).all {
-        duplicatesStrategy 'include'
+    tasks.withType(Jar).all {
+        duplicatesStrategy = DuplicatesStrategy.INCLUDE
     }
 
     java {

diff --git a/sdk/mavsdk/src/main/java/io/mavsdk/System.java b/sdk/mavsdk/src/main/java/io/mavsdk/System.java
@@ -4,8 +4,6 @@
 import io.mavsdk.action_server.ActionServer;
 import io.mavsdk.calibration.Calibration;
 import io.mavsdk.camera.Camera;
-import io.mavsdk.component_information.ComponentInformation;
-import io.mavsdk.component_information_server.ComponentInformationServer;
 import io.mavsdk.core.Core;
 import io.mavsdk.failure.Failure;
 import io.mavsdk.follow_me.FollowMe;
@@ -27,7 +25,6 @@
 import io.mavsdk.shell.Shell;
 import io.mavsdk.telemetry.Telemetry;
 import io.mavsdk.telemetry_server.TelemetryServer;
-import io.mavsdk.tracking_server.TrackingServer;
 import io.mavsdk.transponder.Transponder;
 import io.mavsdk.tune.Tune;
 import io.reactivex.annotations.NonNull;
@@ -38,8 +35,6 @@ public class System {
   private final LazyPlugin<ActionServer> actionServer;
   private final LazyPlugin<Calibration> calibration;
   private final LazyPlugin<Camera> camera;
-  private final LazyPlugin<ComponentInformation> componentInformation;
-  private final LazyPlugin<ComponentInformationServer> componentInformationServer;
   private final LazyPlugin<Core> core;
   private final LazyPlugin<Failure> failure;
   private final LazyPlugin<FollowMe> followMe;
@@ -60,7 +55,6 @@ public class System {
   private final LazyPlugin<Shell> shell;
   private final LazyPlugin<Telemetry> telemetry;
   private final LazyPlugin<TelemetryServer> telemetryServer;
-  private final LazyPlugin<TrackingServer> trackingServer;
   private final LazyPlugin<Transponder> transponder;
   private final LazyPlugin<Tune> tune;
 
@@ -86,8 +80,6 @@ public System(@NonNull String host, int port) {
     actionServer = LazyPlugin.from(() -> new ActionServer(host, port));
     calibration = LazyPlugin.from(() -> new Calibration(host, port));
     camera = LazyPlugin.from(() -> new Camera(host, port));
-    componentInformation = LazyPlugin.from(() -> new ComponentInformation(host, port));
-    componentInformationServer = LazyPlugin.from(() -> new ComponentInformationServer(host, port));
     core = LazyPlugin.from(() -> new Core(host, port));
     failure = LazyPlugin.from(() -> new Failure(host, port));
     followMe = LazyPlugin.from(() -> new FollowMe(host, port));
@@ -108,7 +100,6 @@ public System(@NonNull String host, int port) {
     shell = LazyPlugin.from(() -> new Shell(host, port));
     telemetry = LazyPlugin.from(() -> new Telemetry(host, port));
     telemetryServer = LazyPlugin.from(() -> new TelemetryServer(host, port));
-    trackingServer = LazyPlugin.from(() -> new TrackingServer(host, port));
     transponder = LazyPlugin.from(() -> new Transponder(host, port));
     tune = LazyPlugin.from(() -> new Tune(host, port));
   }
@@ -133,16 +124,6 @@ public Camera getCamera() {
     return camera.get();
   }
 
-  @NonNull
-  public ComponentInformation getComponentInformation() {
-    return componentInformation.get();
-  }
-
-  @NonNull
-  public ComponentInformationServer getComponentInformationServer() {
-    return componentInformationServer.get();
-  }
-
   @NonNull
   public Core getCore() {
     return core.get();
@@ -243,10 +224,6 @@ public TelemetryServer getTelemetryServer() {
     return telemetryServer.get();
   }
 
-  @NonNull
-  public TrackingServer getTrackingServer() {
-    return trackingServer.get();
-  }
 
   @NonNull
   public Transponder getTransponder() {
@@ -266,8 +243,6 @@ public void dispose() {
     actionServer.dispose();
     calibration.dispose();
     camera.dispose();
-    componentInformation.dispose();
-    componentInformationServer.dispose();
     core.dispose();
     failure.dispose();
     followMe.dispose();
@@ -288,7 +263,6 @@ public void dispose() {
     shell.dispose();
     telemetry.dispose();
     telemetryServer.dispose();
-    trackingServer.dispose();
     transponder.dispose();
     tune.dispose();
   }