Skip to content

Commit 53460ae

Browse files
committed
Update libs.versions.toml and fix all warnings that came out of it
- invisibleToUser is deprecated and replaced by hideFromAccessibility - The new hiltCompiler no longer crashes and so can be used - @ApplicationContext now requires a param: prefix to keep behaviour as before.
1 parent 34e4a92 commit 53460ae

8 files changed

Lines changed: 36 additions & 36 deletions

File tree

app/src/main/java/org/scottishtecharmy/soundscape/screens/TalkbackHelpers.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ package org.scottishtecharmy.soundscape.screens
33
import androidx.compose.runtime.Composable
44
import androidx.compose.ui.Modifier
55
import androidx.compose.ui.semantics.contentDescription
6+
import androidx.compose.ui.semantics.hideFromAccessibility
67
import androidx.compose.ui.semantics.onClick
78
import androidx.compose.ui.semantics.semantics
8-
import androidx.compose.ui.semantics.invisibleToUser
99

1010
/**
1111
* talkbackHint adds a string which describes what the element does on a double click
@@ -39,5 +39,5 @@ fun Modifier.talkbackDescription(contentDescription: String) =
3939
@Composable
4040
fun Modifier.talkbackHidden() =
4141
semantics {
42-
invisibleToUser()
42+
hideFromAccessibility()
4343
}

app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/HelpScreen.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ import androidx.compose.ui.Alignment
2020
import androidx.compose.ui.Modifier
2121
import androidx.compose.ui.res.stringResource
2222
import androidx.compose.ui.semantics.heading
23-
import androidx.compose.ui.semantics.invisibleToUser
23+
import androidx.compose.ui.semantics.hideFromAccessibility
2424
import androidx.compose.ui.semantics.semantics
2525
import androidx.compose.ui.text.AnnotatedString
2626
import androidx.compose.ui.text.SpanStyle
@@ -396,7 +396,7 @@ fun HelpScreen(
396396
.semantics {
397397
heading()
398398
if(section.skipTalkback)
399-
invisibleToUser()
399+
hideFromAccessibility()
400400
},
401401
color = MaterialTheme.colorScheme.onSurface,
402402
)
@@ -417,7 +417,7 @@ fun HelpScreen(
417417
modifier = Modifier
418418
.semantics {
419419
if(section.skipTalkback)
420-
invisibleToUser()
420+
hideFromAccessibility()
421421
}
422422
)
423423
}

app/src/main/java/org/scottishtecharmy/soundscape/screens/home/home/Home.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import androidx.compose.ui.Modifier
2626
import androidx.compose.ui.platform.LocalContext
2727
import androidx.compose.ui.res.stringResource
2828
import androidx.compose.ui.semantics.heading
29-
import androidx.compose.ui.semantics.invisibleToUser
29+
import androidx.compose.ui.semantics.hideFromAccessibility
3030
import androidx.compose.ui.semantics.semantics
3131
import androidx.compose.ui.tooling.preview.Preview
3232
import kotlinx.coroutines.CoroutineScope
@@ -159,7 +159,7 @@ fun HomeTopAppBar(
159159
title = {
160160
Text(
161161
text = stringResource(R.string.app_name),
162-
modifier = Modifier.semantics { this.invisibleToUser() },
162+
modifier = Modifier.semantics { this.hideFromAccessibility() },
163163
)
164164
},
165165
navigationIcon = {

app/src/main/java/org/scottishtecharmy/soundscape/screens/markers_routes/screens/markersscreen/MarkersViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ class MarkersViewModel
2323
@Inject
2424
constructor(
2525
private val routeDao: RouteDao,
26-
@ApplicationContext private val context: Context,
26+
@param:ApplicationContext private val context: Context,
2727
) : ViewModel() {
2828
private val _uiState = MutableStateFlow(MarkersAndRoutesUiState(markers = true))
2929
val uiState: StateFlow<MarkersAndRoutesUiState> = _uiState

app/src/main/java/org/scottishtecharmy/soundscape/screens/markers_routes/screens/routesscreen/RoutesViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import javax.inject.Inject
2222
@HiltViewModel
2323
class RoutesViewModel @Inject constructor(
2424
private val routeDao: RouteDao,
25-
@ApplicationContext private val context: Context
25+
@param:ApplicationContext private val context: Context
2626
) : ViewModel() {
2727

2828
private val _uiState = MutableStateFlow(MarkersAndRoutesUiState(markers = false))

app/src/main/java/org/scottishtecharmy/soundscape/screens/onboarding/audiobeacons/AudioBeaconsViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import javax.inject.Inject
1616
import androidx.core.content.edit
1717

1818
@HiltViewModel
19-
class AudioBeaconsViewModel @Inject constructor(@ApplicationContext val context: Context, val audioEngine : NativeAudioEngine): ViewModel() {
19+
class AudioBeaconsViewModel @Inject constructor(@param:ApplicationContext val context: Context, val audioEngine : NativeAudioEngine): ViewModel() {
2020

2121
data class AudioBeaconsUiState(
2222
// Data for the ViewMode that affects the UI

gradle/libs.versions.toml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
11
[versions]
2-
agp = "8.9.3"
3-
kotlin = "2.1.21"
2+
agp = "8.11.0"
3+
kotlin = "2.2.0"
44
protobuf-plugin = "0.9.5"
55
dagger-hilt = "2.56.2"
6-
devtools-ksp = "2.1.21-2.0.2"
7-
google-services = "4.4.2"
6+
devtools-ksp = "2.2.0-2.0.2"
7+
google-services = "4.4.3"
88
jetbrains-dokka = "2.0.0"
99
firebase-crashlytics = "3.0.4"
10-
accompanistPermissions = "0.33.2-alpha"
10+
accompanistPermissions = "0.37.3"
1111
androidGpxParser = "2.3.1"
1212
composePreferenceLibrary = "1.1.1"
13-
converterMoshi = "2.11.0"
14-
converterProtobuf = "2.11.0"
13+
converterMoshi = "3.0.0"
14+
converterProtobuf = "3.0.0"
1515
htmlMermaidDokkaPlugin = "0.6.0"
1616
jtsCore = "1.20.0"
1717
leakcanaryAndroid = "2.14"
18-
mapLibre = "11.7.1"
19-
mapLibreAnnotation = "3.0.1"
18+
mapLibre = "11.11.0"
19+
mapLibreAnnotation = "3.0.2"
2020
androidxJunit = "1.2.1"
21-
converterScalars = "2.11.0"
21+
converterScalars = "3.0.0"
2222
coreSplashscreen = "1.0.1"
2323
coreTesting = "2.2.0"
2424
datastorePreferences = "1.1.7"
2525
espressoCoreVersion = "3.6.1"
26-
firebaseBom = "33.15.0"
27-
hiltAndroid = "2.50"
28-
hiltCompiler = "2.50"
26+
firebaseBom = "33.16.0"
27+
hiltAndroid = "2.56.2"
28+
hiltCompiler = "2.56.2"
2929
hiltNavigationCompose = "1.2.0"
30-
junitJupiter = "5.8.1"
30+
junitJupiter = "5.13.3"
3131
coreKtx = "1.16.0"
3232
junit = "4.13.2"
3333
kotlinTestJunit = "1.9.10"
34-
kotlinxCoroutinesCore = "1.8.1"
35-
kotlinxCoroutinesTest = "1.8.0"
36-
kotlinxSerializationJson = "1.7.3"
34+
kotlinxCoroutinesCore = "1.10.2"
35+
kotlinxCoroutinesTest = "1.10.2"
36+
kotlinxSerializationJson = "1.9.0"
3737
lifecycleRuntimeKtx = "2.9.1"
3838
activityCompose = "1.10.1"
3939
composeBom = "2025.06.01"
4040
lifecycleService = "2.9.1"
4141
appcompat = "1.7.1"
4242
coreKtxVersion = "1.6.1"
4343
lifecycleViewmodelCompose = "2.9.1"
44-
loggingInterceptor = "4.10.0"
45-
maplibreComposeMaterial3 = "0.6.0"
46-
moshi = "1.15.1"
47-
moshiKotlinCodegen = "1.15.0"
48-
okhttp = "4.12.0"
44+
loggingInterceptor = "5.0.0"
45+
maplibreComposeMaterial3 = "0.9.1"
46+
moshi = "1.15.2"
47+
moshiKotlinCodegen = "1.15.2"
48+
okhttp = "5.0.0"
4949
playServicesLocation = "21.3.0"
5050
preferenceKtx = "1.2.1"
51-
protobufKotlinLite = "4.28.0"
52-
reorderable = "2.4.3"
53-
retrofit = "2.11.0"
51+
protobufKotlinLite = "4.31.1"
52+
reorderable = "2.5.1"
53+
retrofit = "3.0.0"
5454
review = "2.0.2"
5555
reviewKtx = "2.0.2"
5656
media3Session = "1.7.1"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Thu May 16 20:07:09 BST 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
55
zipStoreBase=GRADLE_USER_HOME
66
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)