Merge branch 'update-dependencies-droid-2259'

3 files changed, 9 insertions, 10 deletions

diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/CameraPosition.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/CameraPosition.kt
index b66b0ea657..ba58b334bb 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/CameraPosition.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/data/CameraPosition.kt
@@ -3,5 +3,4 @@ package net.mullvad.mullvadvpn.lib.map.data
 import androidx.compose.runtime.Immutable
 import net.mullvad.mullvadvpn.lib.model.LatLong
 
-@Immutable
-data class CameraPosition(val latLong: LatLong, val zoom: Float, val verticalBias: Float)
+@Immutable data class CameraPosition(val latLong: LatLong, val zoom: Float, val verticalBias: Float)
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt
index 29578f5169..a89d9a7428 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/Globe.kt
@@ -159,27 +159,27 @@ internal class Globe(resources: Resources) {
         private val vertexShaderCode =
             """
             attribute vec3 aVertexPosition;
-            
+
             uniform vec4 uColor;
             uniform mat4 uModelViewMatrix;
             uniform mat4 uProjectionMatrix;
-            
+
             varying lowp vec4 vColor;
-            
+
             void main(void) {
                 gl_Position = uProjectionMatrix * uModelViewMatrix * vec4(aVertexPosition, 1.0);
                 vColor = uColor;
             }
-                """
+            """
                 .trimIndent()
         private val fragmentShaderCode =
             """
             varying lowp vec4 vColor;
-            
+
             void main(void) {
                 gl_FragColor = vColor;
             }
-                """
+            """
                 .trimIndent()
     }
 }
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/LocationMarker.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/LocationMarker.kt
index 1955daef70..07caa6ec36 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/LocationMarker.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/shapes/LocationMarker.kt
@@ -209,7 +209,7 @@ internal class LocationMarker(val colors: LocationMarkerColors) {
                 gl_Position = uProjectionMatrix * uModelViewMatrix * vec4(aVertexPosition, 1.0);
                 vColor = aVertexColor;
             }
-                """
+            """
                 .trimIndent()
         private val fragmentShaderCode =
             """
@@ -218,7 +218,7 @@ internal class LocationMarker(val colors: LocationMarkerColors) {
             void main(void) {
                 gl_FragColor = vColor;
             }
-                """
+            """
                 .trimIndent()
     }
 }