Skip to content

Commit 27869f5

Browse files
Update dependencies
1 parent c767ef9 commit 27869f5

File tree

8 files changed

+41
-42
lines changed

8 files changed

+41
-42
lines changed

.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@v5
19+
uses: actions/checkout@v6
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@v5
59+
uses: actions/upload-artifact@v6
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@v5
66+
uses: actions/upload-artifact@v6
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@v5
73+
uses: actions/upload-artifact@v6
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@v5
80+
uses: actions/upload-artifact@v6
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@v5
92+
uses: actions/checkout@v6
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@v5
121+
uses: actions/checkout@v6
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@v6
130+
uses: actions/download-artifact@v7
131131
with:
132132
name: Fyreplace.google.aab
133133
path: build

app/build.gradle.kts

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import java.util.Properties
33

44
plugins {
55
alias(libs.plugins.android)
6-
alias(libs.plugins.kotlin)
76
alias(libs.plugins.kotlin.serialization)
87
alias(libs.plugins.kotlin.parcelize)
98
alias(libs.plugins.compose)
@@ -17,9 +16,9 @@ plugins {
1716
}
1817

1918
val localProperties = Properties()
20-
val localPropertiesFile = rootProject.file("local.properties")
19+
val localPropertiesFile: File? = rootProject.file("local.properties")
2120

22-
if (localPropertiesFile.exists()) {
21+
if (localPropertiesFile?.exists() == true) {
2322
localPropertiesFile.inputStream().use(localProperties::load)
2423
}
2524

@@ -183,12 +182,13 @@ android {
183182

184183
sourceSets {
185184
named("main") {
186-
java.srcDir("build/openapi/src/main")
185+
kotlin.directories += "build/openapi/src/main"
187186
}
188187
}
189188

190189
buildFeatures {
191190
buildConfig = true
191+
resValues = true
192192
compose = true
193193
dataBinding = true
194194
}
@@ -270,13 +270,13 @@ protobuf {
270270
generateProtoTasks {
271271
all().configureEach {
272272
builtins {
273-
create("java")
274-
create("kotlin")
273+
create("java") { option("lite") }
274+
create("kotlin") { option("lite") }
275275
}
276276

277277
plugins {
278-
create("grpc")
279-
create("grpckt")
278+
create("grpc") { option("lite") }
279+
create("grpckt") { option("lite") }
280280
}
281281
}
282282
}
@@ -309,7 +309,6 @@ dependencies {
309309
implementation(libs.moshi)
310310
implementation(libs.moshi.adapters)
311311
implementation(libs.okhttp.logging.interceptor)
312-
implementation(libs.protobuf.java)
313312
implementation(libs.protobuf.kotlin)
314313
implementation(libs.retrofit)
315314
implementation(libs.retrofit.converter.moshi)

build.gradle.kts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
plugins {
22
alias(libs.plugins.android) apply false
3-
alias(libs.plugins.kotlin) apply false
43
alias(libs.plugins.kotlin.serialization) apply false
54
alias(libs.plugins.kotlin.parcelize) apply false
65
alias(libs.plugins.compose) apply false

gradle.properties

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
org.gradle.jvmargs=-Xmx4096m -Dfile.encoding=UTF-8
22
# org.gradle.parallel=true
33
org.gradle.configuration-cache=false
4-
android.useAndroidX=true
54
kotlin.code.style=official
5+
android.newDsl=false
6+
android.disallowKotlinSourceSets=false
7+
android.useAndroidX=true
68
android.nonTransitiveRClass=true

gradle/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
gradle-daemon-jvm.properties

gradle/libs.versions.toml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[versions]
2-
androidPlugin = "8.13.2"
3-
kotlinPlugin = "2.2.21"
4-
sentryPlugin = "5.12.2"
5-
openapiPlugin = "7.17.0"
6-
protobufPlugin = "0.9.5"
7-
kspPlugin = "2.3.3"
2+
androidPlugin = "9.0.1"
3+
kotlinPlugin = "2.3.10"
4+
sentryPlugin = "6.1.0"
5+
openapiPlugin = "7.20.0"
6+
protobufPlugin = "0.9.6"
7+
kspPlugin = "2.3.6"
88
googlePlugin = "4.4.4"
9-
androidxComposeBom = "2025.12.00"
10-
androidxActivity = "1.12.1"
11-
androidxComposeAnimation = "1.10.0"
9+
androidxComposeBom = "2026.02.00"
10+
androidxActivity = "1.12.4"
11+
androidxComposeAnimation = "1.10.3"
1212
androidxComposeMaterialAdaptive = "1.2.0"
1313
androidxCoordinatorLayout = "1.3.0"
1414
androidxCore = "1.17.0"
@@ -19,31 +19,31 @@ androidxFragment = "1.8.9"
1919
androidxHilt = "1.3.0"
2020
androidxJunit = "1.3.0"
2121
androidxLifecycle = "2.10.0"
22-
androidxNavigation = "2.9.6"
23-
androidxPaging = "3.3.6"
22+
androidxNavigation = "2.9.7"
23+
androidxPaging = "3.4.1"
2424
androidxPreference = "1.2.1"
2525
androidxRecyclerView = "1.4.0"
2626
androidxRecyclerViewSelection = "1.2.0"
2727
androidxSwipeRefreshLayout = "1.2.0"
28-
androidxWork = "2.11.0"
28+
androidxWork = "2.11.1"
2929
coilCompose = "2.7.0"
3030
conscrypt = "2.5.3"
3131
desugar = "2.1.5"
32-
firebaseBom = "34.7.0"
32+
firebaseBom = "34.9.0"
3333
firebaseMessaging = "24.1.2"
3434
glide = "5.0.5"
35-
grpc = "1.77.0"
35+
grpc = "1.79.0"
3636
grpcKotlinStub = "1.5.0"
3737
grpcProtocKotlin = "1.5.0:jdk8@jar"
38-
hilt = "2.57.2"
38+
hilt = "2.59.1"
3939
junit = "4.13.2"
4040
kotlinxCouroutines = "1.10.2"
41-
kotlinxSerialization = "1.9.0"
41+
kotlinxSerialization = "1.10.0"
4242
material = "1.13.0"
4343
moshi = "1.15.2"
4444
okhttp = "5.3.2"
45-
playServicesBase = "18.9.0"
46-
protobuf = "4.33.2"
45+
playServicesBase = "18.10.0"
46+
protobuf = "4.33.5"
4747
retrofit = "3.0.0"
4848

4949
[libraries]
@@ -89,7 +89,7 @@ glide = { group = "com.github.bumptech.glide", name = "glide", version.ref = "gl
8989
glide-okhttp = { group = "com.github.bumptech.glide", name = "okhttp3-integration", version.ref = "glide" }
9090
glide-compiler = { group = "com.github.bumptech.glide", name = "ksp", version.ref = "glide" }
9191
grpc-okhttp = { group = "io.grpc", name = "grpc-okhttp", version.ref = "grpc" }
92-
grpc-protobuf = { group = "io.grpc", name = "grpc-protobuf", version.ref = "grpc" }
92+
grpc-protobuf = { group = "io.grpc", name = "grpc-protobuf-lite", version.ref = "grpc" }
9393
grpc-protoc-java = { group = "io.grpc", name = "protoc-gen-grpc-java", version.ref = "grpc" }
9494
grpc-protoc-kotlin = { group = "io.grpc", name = "protoc-gen-grpc-kotlin", version.ref = "grpcProtocKotlin" }
9595
grpc-stub = { group = "io.grpc", name = "grpc-stub", version.ref = "grpc" }
@@ -107,16 +107,14 @@ moshi-adapters = { group = "com.squareup.moshi", name = "moshi-adapters", versio
107107
moshi-compiler = { group = "com.squareup.moshi", name = "moshi-kotlin-codegen", version.ref = "moshi" }
108108
okhttp-logging-interceptor = { group = "com.squareup.okhttp3", name = "logging-interceptor", version.ref = "okhttp" }
109109
play-services-base = { group = "com.google.android.gms", name = "play-services-base", version.ref = "playServicesBase" }
110-
protobuf-java = { group = "com.google.protobuf", name = "protobuf-java", version.ref = "protobuf" }
111-
protobuf-kotlin = { group = "com.google.protobuf", name = "protobuf-kotlin", version.ref = "protobuf" }
110+
protobuf-kotlin = { group = "com.google.protobuf", name = "protobuf-kotlin-lite", version.ref = "protobuf" }
112111
protobuf-protoc = { group = "com.google.protobuf", name = "protoc", version.ref = "protobuf" }
113112
retrofit = { group = "com.squareup.retrofit2", name = "retrofit", version.ref = "retrofit" }
114113
retrofit-converter-moshi = { group = "com.squareup.retrofit2", name = "converter-moshi", version.ref = "retrofit" }
115114
retrofit-converter-scalars = { group = "com.squareup.retrofit2", name = "converter-scalars", version.ref = "retrofit" }
116115

117116
[plugins]
118117
android = { id = "com.android.application", version.ref = "androidPlugin" }
119-
kotlin = { id = "org.jetbrains.kotlin.android", version.ref = "kotlinPlugin" }
120118
kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlinPlugin" }
121119
kotlin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlinPlugin" }
122120
hilt = { id = "com.google.dagger.hilt.android", version.ref = "hilt" }

gradle/wrapper/gradle-wrapper.jar

542 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-9.2.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

0 commit comments

Comments
 (0)