Skip to content

Commit 4c31978

Browse files
LaurentTreguierLaurentTreguier
committed
Update dependencies
1 parent eca36f3 commit 4c31978

9 files changed

Lines changed: 55 additions & 62 deletions

File tree

‎.github/workflows/publishing.yml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ jobs:
1616
environment: google-play-store
1717
steps:
1818
- name: Checkout code
19-
uses: actions/checkout@v6
19+
uses: actions/checkout@v7
2020
with:
2121
fetch-depth: 0
2222
submodules: true
@@ -56,28 +56,28 @@ jobs:
5656
bundleLegacyLibreRelease
5757
5858
- name: Upload Google APK
59-
uses: actions/upload-artifact@v6
59+
uses: actions/upload-artifact@v7
6060
with:
6161
name: Fyreplace.google.apk
6262
path: app/build/outputs/apk/legacyGoogle/release/app-legacy-google-release.apk
6363
if-no-files-found: error
6464

6565
- name: Upload Libre APK
66-
uses: actions/upload-artifact@v6
66+
uses: actions/upload-artifact@v7
6767
with:
6868
name: Fyreplace.libre.apk
6969
path: app/build/outputs/apk/legacyLibre/release/app-legacy-libre-release.apk
7070
if-no-files-found: error
7171

7272
- name: Upload Google AAB
73-
uses: actions/upload-artifact@v6
73+
uses: actions/upload-artifact@v7
7474
with:
7575
name: Fyreplace.google.aab
7676
path: app/build/outputs/bundle/legacyGoogleRelease/app-legacy-google-release.aab
7777
if-no-files-found: error
7878

7979
- name: Upload Libre AAB
80-
uses: actions/upload-artifact@v6
80+
uses: actions/upload-artifact@v7
8181
with:
8282
name: Fyreplace.libre.aab
8383
path: app/build/outputs/bundle/legacyLibreRelease/app-legacy-libre-release.aab
@@ -89,7 +89,7 @@ jobs:
8989
environment: google-play-store
9090
steps:
9191
- name: Checkout code
92-
uses: actions/checkout@v6
92+
uses: actions/checkout@v7
9393
with:
9494
fetch-depth: 0
9595
submodules: true
@@ -118,7 +118,7 @@ jobs:
118118
environment: google-play-store
119119
steps:
120120
- name: Checkout code
121-
uses: actions/checkout@v6
121+
uses: actions/checkout@v7
122122
with:
123123
fetch-depth: 0
124124
submodules: true
@@ -127,7 +127,7 @@ jobs:
127127
run: mkdir -p build
128128

129129
- name: Download Google AAB
130-
uses: actions/download-artifact@v7
130+
uses: actions/download-artifact@v8
131131
with:
132132
name: Fyreplace.google.aab
133133
path: build

‎app/build.gradle.kts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ fun getVersionString(variant: String? = null): String {
101101

102102
android {
103103
namespace = "app.fyreplace.fyreplace"
104-
compileSdk = 36
104+
compileSdk = 37
105105
compileSdkMinor = 1
106106

107107
defaultConfig {
108108
applicationId = "app.fyreplace.fyreplace"
109109
minSdk = 24
110-
targetSdk = 36
110+
targetSdk = 37
111111
versionCode = getVersionNumber()
112112
versionName = getVersionString()
113113
testInstrumentationRunner = "app.fyreplace.fyreplace.androidtest.TestRunner"
@@ -237,8 +237,8 @@ sentry {
237237

238238
openApiGenerate {
239239
generatorName = "kotlin"
240-
inputSpec = "$projectDir/src/main/assets/openapi.yaml"
241-
outputDir = "$projectDir/build/openapi"
240+
inputSpec.set("$projectDir/src/main/assets/openapi.yaml")
241+
outputDir.set("$projectDir/build/openapi")
242242
apiPackage = "app.fyreplace.api"
243243
modelPackage = "app.fyreplace.api.data"
244244
validateSpec = false

‎app/src/main/kotlin/app/fyreplace/fyreplace/ui/MainContent.kt‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import androidx.compose.ui.input.key.KeyEventType
3737
import androidx.compose.ui.input.key.onKeyEvent
3838
import androidx.compose.ui.input.key.type
3939
import androidx.compose.ui.platform.LocalContext
40+
import androidx.compose.ui.platform.LocalResources
4041
import androidx.compose.ui.res.stringResource
4142
import androidx.compose.ui.tooling.preview.Preview
4243
import androidx.compose.ui.tooling.preview.PreviewParameter
@@ -78,6 +79,7 @@ import kotlinx.coroutines.launch
7879
@Composable
7980
fun MainContent(viewModel: MainViewModel = hiltViewModel()) {
8081
val context = LocalContext.current
82+
val resources = LocalResources.current
8183
val scope = rememberCoroutineScope()
8284
val sizeClass = currentWindowAdaptiveInfo().windowSizeClass
8385
val compactWidth = !sizeClass.isWidthAtLeastBreakpoint(600)
@@ -163,7 +165,7 @@ fun MainContent(viewModel: MainViewModel = hiltViewModel()) {
163165
}
164166

165167
composable<Destination.Login>(
166-
deepLinks = context.makeDeepLinks(context.getString(R.string.deep_link_path_login))
168+
deepLinks = context.makeDeepLinks(resources.getString(R.string.deep_link_path_login))
167169
) {
168170
LoginScreen(
169171
visibilityScope = this,
@@ -173,7 +175,7 @@ fun MainContent(viewModel: MainViewModel = hiltViewModel()) {
173175
}
174176

175177
composable<Destination.Register>(
176-
deepLinks = context.makeDeepLinks(context.getString(R.string.deep_link_path_register))
178+
deepLinks = context.makeDeepLinks(resources.getString(R.string.deep_link_path_register))
177179
) {
178180
RegisterScreen(
179181
visibilityScope = this,

‎app/src/main/res/values/themes.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33

4-
<style name="Theme.Fyreplace" parent="Theme.Material3.DayNight.NoActionBar" />
4+
<style name="Theme.Fyreplace" parent="Theme.Material3Expressive.DynamicColors.DayNight.NoActionBar" />
55

66
</resources>

‎gradle/libs.versions.toml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
[versions]
2-
androidPlugin = "9.1.1"
3-
kotlinPlugin = "2.3.20"
4-
sentryPlugin = "6.4.0"
5-
openapiPlugin = "7.21.0"
6-
kspPlugin = "2.3.6"
7-
googlePlugin = "4.4.4"
8-
androidxComposeBom = "2026.03.01"
2+
androidPlugin = "9.2.1"
3+
kotlinPlugin = "2.4.0"
4+
sentryPlugin = "6.13.0"
5+
openapiPlugin = "7.23.0"
6+
kspPlugin = "2.3.9"
7+
googlePlugin = "4.5.0"
8+
androidxComposeBom = "2026.06.01"
99
androidxActivity = "1.13.0"
10-
androidxComposeAnimation = "1.10.6"
10+
androidxComposeAnimation = "1.11.4"
1111
androidxComposeMaterialAdaptive = "1.2.0"
1212
androidxCoordinatorLayout = "1.3.0"
13-
androidxCore = "1.18.0"
13+
androidxCore = "1.19.0"
1414
androidxDatastore = "1.2.1"
1515
androidxEspressoCore = "3.7.0"
1616
androidxExifInterface = "1.4.2"
1717
androidxFragment = "1.8.9"
18-
androidxHilt = "1.3.0"
18+
androidxHilt = "1.4.0"
1919
androidxJunit = "1.3.0"
20-
androidxLifecycle = "2.10.0"
21-
androidxNavigation = "2.9.7"
22-
androidxPaging = "3.4.2"
20+
androidxLifecycle = "2.11.0"
21+
androidxNavigation = "2.9.8"
22+
androidxPaging = "3.5.0"
2323
androidxPreference = "1.2.1"
2424
androidxRecyclerView = "1.4.0"
2525
androidxRecyclerViewSelection = "1.2.0"
@@ -29,20 +29,20 @@ androidxWork = "2.11.2"
2929
coilCompose = "2.7.0"
3030
conscrypt = "2.5.3"
3131
desugar = "2.1.5"
32-
firebaseBom = "34.12.0"
32+
firebaseBom = "34.15.0"
3333
firebaseMessaging = "24.1.2"
34-
glide = "5.0.5"
35-
hilt = "2.59.2"
34+
glide = "5.0.7"
35+
hilt = "2.60"
3636
junit = "4.13.2"
37-
kotlinxCouroutines = "1.10.2"
37+
kotlinxCouroutines = "1.11.0"
3838
kotlinxSerialization = "1.11.0"
39-
material = "1.13.0"
39+
material = "1.14.0"
4040
moshi = "1.15.2"
41-
okhttp = "5.3.2"
41+
okhttp = "5.4.0"
4242
okio = "3.17.0"
4343
playServicesBase = "18.10.0"
4444
retrofit = "3.0.0"
45-
wire = "6.2.0"
45+
wire = "6.4.5"
4646

4747
[libraries]
4848
androidx-compose-bom = { group = "androidx.compose", name = "compose-bom", version.ref = "androidxComposeBom" }

‎gradle/wrapper/gradle-wrapper.jar‎

-504 Bytes
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
44
networkTimeout=10000
5+
retries=0
6+
retryBackOffMs=500
57
validateDistributionUrl=true
68
zipStoreBase=GRADLE_USER_HOME
79
zipStorePath=wrapper/dists

‎gradlew‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎gradlew.bat‎

Lines changed: 12 additions & 23 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)