Merge pull request #207 from Esri/main

Updated to 1.0.8
mavlink · Jan 25, 2022 · 54e4eb5 · 54e4eb5
2 parents 606a20f + 2092516
commit 54e4eb5
Show file tree

Hide file tree

Showing 22 changed files with 124 additions and 124 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -15,8 +15,8 @@
         "repositoryURL": "https://github.com/ReactiveX/RxSwift.git",
         "state": {
           "branch": null,
-          "revision": "254617dd7fae0c45319ba5fbea435bf4d0e15b5d",
-          "version": "5.1.2"
+          "revision": "b4307ba0b6425c0ba4178e138799946c3da594f8",
+          "version": "6.5.0"
         }
       },
       {

diff --git a/Package.swift b/Package.swift
@@ -26,7 +26,7 @@ let package = Package(
   ],
   dependencies: [
     .package(url: "https://github.com/grpc/grpc-swift", from: "1.0.0"),
-    .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "5.1.1")
+    .package(url: "https://github.com/ReactiveX/RxSwift.git", from: "6.5.0")
   ],
   targets: [
     .target(name: "Mavsdk",
@@ -47,8 +47,8 @@ let package = Package(
             ]
     ),
     .binaryTarget(name: "mavsdk_server",
-                      url: "https://github.com/mavlink/MAVSDK/releases/download/v1.0.2/mavsdk_server.xcframework.zip",
-                      checksum: "6d652ab90390ae8dca6e2d8f136e305ea2ecccd23399f040c71da6f49c95d241"),
+                      url: "https://github.com/mavlink/MAVSDK/releases/download/v1.0.8/mavsdk_server.xcframework.zip",
+                      checksum: "ac1cad61e9101f15725cbecb995a7be18ff87ee80d5aa67c91a70e9d0b43816f"),
     .testTarget(name: "MavsdkTests",
                 dependencies: [
                   "Mavsdk",

diff --git a/Sources/Mavsdk/Generated/Action.swift b/Sources/Mavsdk/Generated/Action.swift
@@ -831,7 +831,7 @@ public class Action {
 
                 let result = try response.response.wait().actionResult
                 if (result.result != Mavsdk_Rpc_Action_ActionResult.Result.success) {
-                    single(.error(ActionError(code: ActionResult.Result.translateFromRpc(result.result), description: result.resultStr)))
+                    single(.failure(ActionError(code: ActionResult.Result.translateFromRpc(result.result), description: result.resultStr)))
 
                     return Disposables.create()
                 }
@@ -841,7 +841,7 @@ public class Action {
 
                 single(.success(altitude))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()
@@ -900,7 +900,7 @@ public class Action {
 
                 let result = try response.response.wait().actionResult
                 if (result.result != Mavsdk_Rpc_Action_ActionResult.Result.success) {
-                    single(.error(ActionError(code: ActionResult.Result.translateFromRpc(result.result), description: result.resultStr)))
+                    single(.failure(ActionError(code: ActionResult.Result.translateFromRpc(result.result), description: result.resultStr)))
 
                     return Disposables.create()
                 }
@@ -910,7 +910,7 @@ public class Action {
 
                 single(.success(speed))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()
@@ -969,7 +969,7 @@ public class Action {
 
                 let result = try response.response.wait().actionResult
                 if (result.result != Mavsdk_Rpc_Action_ActionResult.Result.success) {
-                    single(.error(ActionError(code: ActionResult.Result.translateFromRpc(result.result), description: result.resultStr)))
+                    single(.failure(ActionError(code: ActionResult.Result.translateFromRpc(result.result), description: result.resultStr)))
 
                     return Disposables.create()
                 }
@@ -979,7 +979,7 @@ public class Action {
 
                 single(.success(relativeAltitudeM))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()

diff --git a/Sources/Mavsdk/Generated/ActionServer.swift b/Sources/Mavsdk/Generated/ActionServer.swift
@@ -467,7 +467,7 @@ public class ActionServer {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeActionServerError else { throw $0 }
             }
@@ -512,7 +512,7 @@ public class ActionServer {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeActionServerError else { throw $0 }
             }
@@ -558,7 +558,7 @@ public class ActionServer {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeActionServerError else { throw $0 }
             }
@@ -604,7 +604,7 @@ public class ActionServer {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeActionServerError else { throw $0 }
             }
@@ -650,7 +650,7 @@ public class ActionServer {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeActionServerError else { throw $0 }
             }
@@ -696,7 +696,7 @@ public class ActionServer {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeActionServerError else { throw $0 }
             }
@@ -742,7 +742,7 @@ public class ActionServer {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeActionServerError else { throw $0 }
             }
@@ -923,7 +923,7 @@ public class ActionServer {
 
                 single(.success(flightModes))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()

diff --git a/Sources/Mavsdk/Generated/Calibration.swift b/Sources/Mavsdk/Generated/Calibration.swift
@@ -305,7 +305,7 @@ public class Calibration {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCalibrationError else { throw $0 }
             }
@@ -349,7 +349,7 @@ public class Calibration {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCalibrationError else { throw $0 }
             }
@@ -393,7 +393,7 @@ public class Calibration {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCalibrationError else { throw $0 }
             }
@@ -437,7 +437,7 @@ public class Calibration {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCalibrationError else { throw $0 }
             }
@@ -481,7 +481,7 @@ public class Calibration {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCalibrationError else { throw $0 }
             }

diff --git a/Sources/Mavsdk/Generated/Camera.swift b/Sources/Mavsdk/Generated/Camera.swift
@@ -1659,7 +1659,7 @@ public class Camera {
 
                 let result = try response.response.wait().cameraResult
                 if (result.result != Mavsdk_Rpc_Camera_CameraResult.Result.success) {
-                    single(.error(CameraError(code: CameraResult.Result.translateFromRpc(result.result), description: result.resultStr)))
+                    single(.failure(CameraError(code: CameraResult.Result.translateFromRpc(result.result), description: result.resultStr)))
 
                     return Disposables.create()
                 }
@@ -1670,7 +1670,7 @@ public class Camera {
 
                 single(.success(captureInfos))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()
@@ -1705,7 +1705,7 @@ public class Camera {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCameraError else { throw $0 }
             }
@@ -1741,7 +1741,7 @@ public class Camera {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCameraError else { throw $0 }
             }
@@ -1777,7 +1777,7 @@ public class Camera {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCameraError else { throw $0 }
             }
@@ -1813,7 +1813,7 @@ public class Camera {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCameraError else { throw $0 }
             }
@@ -1849,7 +1849,7 @@ public class Camera {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCameraError else { throw $0 }
             }
@@ -1884,7 +1884,7 @@ public class Camera {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCameraError else { throw $0 }
             }
@@ -1919,7 +1919,7 @@ public class Camera {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCameraError else { throw $0 }
             }
@@ -1988,7 +1988,7 @@ public class Camera {
 
                 let result = try response.response.wait().cameraResult
                 if (result.result != Mavsdk_Rpc_Camera_CameraResult.Result.success) {
-                    single(.error(CameraError(code: CameraResult.Result.translateFromRpc(result.result), description: result.resultStr)))
+                    single(.failure(CameraError(code: CameraResult.Result.translateFromRpc(result.result), description: result.resultStr)))
 
                     return Disposables.create()
                 }
@@ -1999,7 +1999,7 @@ public class Camera {
 
                 single(.success(setting))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()

diff --git a/Sources/Mavsdk/Generated/Core.swift b/Sources/Mavsdk/Generated/Core.swift
@@ -116,7 +116,7 @@ public class Core {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeCoreError else { throw $0 }
             }

diff --git a/Sources/Mavsdk/Generated/FollowMe.swift b/Sources/Mavsdk/Generated/FollowMe.swift
@@ -422,7 +422,7 @@ public class FollowMe {
 
                 single(.success(config))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()
@@ -484,7 +484,7 @@ public class FollowMe {
 
                 single(.success(isActive))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()
@@ -547,7 +547,7 @@ public class FollowMe {
 
                 single(.success(location))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()

diff --git a/Sources/Mavsdk/Generated/Ftp.swift b/Sources/Mavsdk/Generated/Ftp.swift
@@ -333,7 +333,7 @@ public class Ftp {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeFtpError else { throw $0 }
             }
@@ -385,7 +385,7 @@ public class Ftp {
 
             return Disposables.create()
         }
-        .retryWhen { error in
+        .retry { error in
             error.map {
                 guard $0 is RuntimeFtpError else { throw $0 }
             }
@@ -415,7 +415,7 @@ public class Ftp {
 
                 let result = try response.response.wait().ftpResult
                 if (result.result != Mavsdk_Rpc_Ftp_FtpResult.Result.success) {
-                    single(.error(FtpError(code: FtpResult.Result.translateFromRpc(result.result), description: result.resultStr)))
+                    single(.failure(FtpError(code: FtpResult.Result.translateFromRpc(result.result), description: result.resultStr)))
 
                     return Disposables.create()
                 }
@@ -425,7 +425,7 @@ public class Ftp {
 
                 single(.success(paths))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()
@@ -606,7 +606,7 @@ public class Ftp {
 
                 let result = try response.response.wait().ftpResult
                 if (result.result != Mavsdk_Rpc_Ftp_FtpResult.Result.success) {
-                    single(.error(FtpError(code: FtpResult.Result.translateFromRpc(result.result), description: result.resultStr)))
+                    single(.failure(FtpError(code: FtpResult.Result.translateFromRpc(result.result), description: result.resultStr)))
 
                     return Disposables.create()
                 }
@@ -616,7 +616,7 @@ public class Ftp {
 
                 single(.success(areIdentical))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()
@@ -713,7 +713,7 @@ public class Ftp {
 
                 single(.success(compid))
             } catch {
-                single(.error(error))
+                single(.failure(error))
             }
 
             return Disposables.create()