Skip to content

Commit ffcc10a

Browse files
committed
feat: updated compileSdk version
1 parent 3ba3831 commit ffcc10a

File tree

5 files changed

+18
-10
lines changed

5 files changed

+18
-10
lines changed

maps-compose-utils/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
}
1111

1212
namespace = "com.google.maps.android.compose.utils"
13-
compileSdk = 34
13+
compileSdk = 35
1414

1515
defaultConfig {
1616
minSdk = 21

maps-compose-widgets/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
}
1111

1212
namespace = "com.google.maps.android.compose.widgets"
13-
compileSdk = 34
13+
compileSdk = 35
1414

1515
defaultConfig {
1616
minSdk = 21

maps-compose/build.gradle.kts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ android {
1010
}
1111

1212
namespace = "com.google.maps.android.compose"
13-
compileSdk = 34
13+
compileSdk = 35
1414

1515
defaultConfig {
1616
minSdk = 21

maps-compose/src/main/java/com/google/maps/android/compose/GoogleMap.kt

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.google.maps.android.compose
1616

1717
import android.content.ComponentCallbacks
18+
import android.content.ComponentCallbacks2
1819
import android.content.res.Configuration
1920
import android.location.Location
2021
import android.os.Bundle
@@ -27,7 +28,6 @@ import androidx.compose.runtime.CompositionContext
2728
import androidx.compose.runtime.CompositionLocalProvider
2829
import androidx.compose.runtime.Stable
2930
import androidx.compose.runtime.getValue
30-
import androidx.compose.runtime.mutableIntStateOf
3131
import androidx.compose.runtime.mutableStateOf
3232
import androidx.compose.runtime.remember
3333
import androidx.compose.runtime.rememberCompositionContext
@@ -149,9 +149,11 @@ public fun GoogleMap(
149149
modifier = modifier,
150150
factory = { context ->
151151
MapView(context, googleMapOptionsFactory()).also { mapView ->
152-
val componentCallbacks = object : ComponentCallbacks {
152+
val componentCallbacks = object : ComponentCallbacks2 {
153153
override fun onConfigurationChanged(newConfig: Configuration) {}
154+
@Deprecated("Deprecated in Java", ReplaceWith("onTrimMemory(level)"))
154155
override fun onLowMemory() { mapView.onLowMemory() }
156+
override fun onTrimMemory(level: Int) { mapView.onLowMemory() }
155157
}
156158
context.registerComponentCallbacks(componentCallbacks)
157159

@@ -255,7 +257,7 @@ internal class MapUpdaterState(
255257
var locationSource by mutableStateOf(locationSource)
256258
var mapProperties by mutableStateOf(mapProperties)
257259
var mapUiSettings by mutableStateOf(mapUiSettings)
258-
var mapColorScheme by mutableStateOf<Int?>(mapColorScheme)
260+
var mapColorScheme by mutableStateOf(mapColorScheme)
259261
}
260262

261263
/** Used to store things in the tag which must be retrievable across recompositions */

maps-compose/src/main/java/com/google/maps/android/compose/streetview/StreetView.kt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
package com.google.maps.android.compose.streetview
1616

1717
import android.content.ComponentCallbacks
18+
import android.content.ComponentCallbacks2
1819
import android.content.res.Configuration
1920
import android.os.Bundle
2021
import android.util.Log
@@ -118,7 +119,7 @@ private fun StreetViewLifecycle(streetView: StreetViewPanoramaView) {
118119
val previousState = remember { mutableStateOf(Lifecycle.Event.ON_CREATE) }
119120
DisposableEffect(context, lifecycle, streetView) {
120121
val streetViewLifecycleObserver = streetView.lifecycleObserver(previousState)
121-
val callbacks = streetView.componentCallbacks()
122+
val callbacks = streetView.componentCallbacks2()
122123

123124
lifecycle.addObserver(streetViewLifecycleObserver)
124125
context.registerComponentCallbacks(callbacks)
@@ -177,11 +178,16 @@ private fun StreetViewPanoramaView.lifecycleObserver(previousState: MutableState
177178
previousState.value = event
178179
}
179180

180-
private fun StreetViewPanoramaView.componentCallbacks(): ComponentCallbacks =
181-
object : ComponentCallbacks {
181+
private fun StreetViewPanoramaView.componentCallbacks2(): ComponentCallbacks2 =
182+
object : ComponentCallbacks2 {
182183
override fun onConfigurationChanged(config: Configuration) {}
183184

185+
@Deprecated("Deprecated in Java", ReplaceWith("onTrimMemory(level)"))
184186
override fun onLowMemory() {
185-
this@componentCallbacks.onLowMemory()
187+
this@componentCallbacks2.onLowMemory()
188+
}
189+
190+
override fun onTrimMemory(level: Int) {
191+
this@componentCallbacks2.onLowMemory()
186192
}
187193
}

0 commit comments

Comments
 (0)