summaryrefslogtreecommitdiffhomepage
path: root/android/lib/map
diff options
context:
space:
mode:
authorDavid Göransson <david.goransson@mullvad.net>2024-10-03 09:22:35 +0200
committerDavid Göransson <david.goransson@mullvad.net>2024-10-03 09:22:35 +0200
commit1364302d5d02858150acf21d4e36f1501fd296e1 (patch)
treedf5c5bd6ee2296448eba0762b4a80370eb906ac8 /android/lib/map
parent50714d904e3fff7e74a1923e9118c32aa60737ff (diff)
parentd78b533b6c24d287531fa92d4825f70cdb1868e4 (diff)
downloadmullvadvpn-1364302d5d02858150acf21d4e36f1501fd296e1.tar.xz
mullvadvpn-1364302d5d02858150acf21d4e36f1501fd296e1.zip
Merge branch 'upgrade-compiler-warnings-to-errors-droid-1301'
Diffstat (limited to 'android/lib/map')
-rw-r--r--android/lib/map/build.gradle.kts5
-rw-r--r--android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt2
2 files changed, 5 insertions, 2 deletions
diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts
index 8367a435de..a0253ebc4d 100644
--- a/android/lib/map/build.gradle.kts
+++ b/android/lib/map/build.gradle.kts
@@ -16,7 +16,10 @@ android {
targetCompatibility = JavaVersion.VERSION_17
}
- kotlinOptions { jvmTarget = Versions.jvmTarget }
+ kotlinOptions {
+ jvmTarget = Versions.jvmTarget
+ allWarningsAsErrors = true
+ }
buildFeatures {
compose = true
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt
index a1e411bece..05b8d59701 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/Map.kt
@@ -4,10 +4,10 @@ import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.remember
import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalLifecycleOwner
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.Lifecycle
import androidx.lifecycle.LifecycleEventObserver
+import androidx.lifecycle.compose.LocalLifecycleOwner
import net.mullvad.mullvadvpn.lib.map.data.CameraPosition
import net.mullvad.mullvadvpn.lib.map.data.GlobeColors
import net.mullvad.mullvadvpn.lib.map.data.MapViewState