RomanNum3ral
/
for-android
mirror of https://github.com/stoatchat/for-android.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: upgrade dependencies and AGP

This commit is contained in:
infi 2026-03-13 23:40:53 +01:00
parent 80abbc999c
commit 4ba9b59127
10 changed files with 44 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.idea/gradle.xml
View File

@ -7,7 +7,6 @@
<option name="testRunner" value="CHOOSE_PER_TEST" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="gradleHome" value="$PROJECT_DIR$/../../../../Gradle" />
<option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />

3
app/build.gradle.kts
View File

@ -196,7 +196,6 @@ dependencies {
implementation(libs.lifecycle.viewmodel.compose)
implementation(libs.activity.compose)
implementation(libs.accompanist.systemuicontroller)
implementation(libs.accompanist.permissions)
implementation(libs.ktor.client.core)
@ -212,7 +211,7 @@ dependencies {
implementation(libs.hilt.android)
implementation(libs.hilt.navigation.compose)
kapt(libs.hilt.compiler)
ksp(libs.hilt.compiler)
implementation(libs.glide)
implementation(libs.glide.compose)

2
app/src/main/java/chat/stoat/activities/media/VideoViewActivity.kt
View File

@ -224,7 +224,7 @@ class VideoViewActivity : FragmentActivity() {
.setActionTextColor(
MaterialColors.getColor(
binding.xpPlayer,
com.google.android.material.R.attr.colorPrimary
androidx.appcompat.R.attr.colorPrimary
)
)
.show()

7
app/src/main/java/chat/stoat/api/internals/TextViewCompat.kt
View File

@ -24,7 +24,7 @@ object TextViewCompat {
return when (varName) {
"--accent" -> MaterialColors.getColor(
tv,
com.google.android.material.R.attr.colorPrimary
androidx.appcompat.R.attr.colorPrimary
)
"--foreground" -> MaterialColors.getColor(
@ -34,7 +34,10 @@ object TextViewCompat {
"--background" -> SurfaceColors.SURFACE_0.getColor(tv.context)
"--error" -> MaterialColors.getColor(tv, com.google.android.material.R.attr.colorError)
"--error" -> MaterialColors.getColor(
tv,
androidx.appcompat.R.attr.colorError
)
else -> tv.currentTextColor
}

2
app/src/main/java/chat/stoat/fragments/ChangelogBottomSheetFragment.kt
View File

@ -156,7 +156,7 @@ class ChangelogBottomSheetFragment(
return argbAsCssColour(
MaterialColors.getColor(
binding.wvChangelog,
com.google.android.material.R.attr.colorPrimary
androidx.appcompat.R.attr.colorPrimary
)
)
}

5
gradle.properties
View File

@ -22,4 +22,7 @@ kotlin.code.style=official
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true
android.nonFinalResIds=false
org.gradle.configuration-cache=false
org.gradle.configuration-cache=false
android.defaults.buildfeatures.resvalues=true
android.builtInKotlin=false
android.newDsl=false

13
gradle/gradle-daemon-jvm.properties Normal file
View File

@ -0,0 +1,13 @@
#This file is generated by updateDaemonJvm
toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/ecd23fd7707c683afbcd6052998cb6a9/redirect
toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/e99bae143b75f9a10ead10248f02055e/redirect
toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/658299a896470fbb3103ba3a430ee227/redirect
toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/536afcd1dff540251f85e5d2c80458cf/redirect
toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/398ffe3949748bfb1d5636f023d228fd/redirect
toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/39846e8427e64a3824c13e399d7d813c/redirect
toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/dbd05c4936d573642f94cd149e1356c8/redirect
toolchainVendor=JETBRAINS
toolchainVersion=21

31
gradle/libs.versions.toml
View File

@ -3,25 +3,25 @@ compileSdk = "36"
minSdk = "26"
targetSdk = "36"
kotlin = "2.2.0"
kotlin-serialization = "1.6.3"
ksp = "2.2.0-2.0.2"
agp = "8.11.1"
hilt = "2.57"
google-services = "4.4.2"
kotlin = "2.3.10"
kotlin-serialization = "1.10.0"
ksp = "2.3.5"
agp = "9.1.0"
hilt = "2.59.2"
google-services = "4.4.4"
sentry = "8.13.2" # This is separate from the gradle plugin version which is defined ad hoc below
sqldelight = "2.0.1"
compose-bom = "2025.03.00"
material3 = "1.4.0-alpha15"
lifecycle = "2.9.1"
accompanist = "0.34.0"
ktor = "3.3.2"
compose-bom = "2026.03.00"
material3 = "1.5.0-alpha15"
lifecycle = "2.10.0"
accompanist = "0.37.3"
ktor = "3.4.1"
glide = "5.0.5"
aboutlibraries = "11.3.0-rc02"
media3 = "1.7.1"
media3 = "1.9.2"
telephoto = "1.0.0-alpha02"
haze = "1.6.4"
chucker = "4.0.0"
haze = "1.7.2"
chucker = "4.3.1"
androidx-test = "1.6.1"
livekit = "2.21.0"
livekit-compose = "1.4.0"
@ -38,7 +38,7 @@ android-core-telecom = { module = "androidx.core:core-telecom", version = "1.0.0
android-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version = "2.2.1" }
android-constraintlayout-compose = { module = "androidx.constraintlayout:constraintlayout-compose", version = "1.1.1" }
android-appcompat = { module = "androidx.appcompat:appcompat", version = "1.7.1" }
android-material = { module = "com.google.android.material:material", version = "1.12.0" }
android-material = { module = "com.google.android.material:material", version = "1.13.0" }
android-test-core = { module = "androidx.test:runner", version.ref = "androidx-test" }
android-test-rules = { module = "androidx.test:rules", version.ref = "androidx-test" }
android-datastore = { module = "androidx.datastore:datastore", version = "1.1.7" }
@ -61,7 +61,6 @@ compose-ui-test-junit4 = { module = "androidx.compose.ui:ui-test-junit4" }
lifecycle-runtime-ktx = { module = "androidx.lifecycle:lifecycle-runtime-ktx", version.ref = "lifecycle" }
lifecycle-viewmodel-compose = { module = "androidx.lifecycle:lifecycle-viewmodel-compose", version.ref = "lifecycle" }
activity-compose = { module = "androidx.activity:activity-compose", version = "1.10.1" }
accompanist-systemuicontroller = { module = "com.google.accompanist:accompanist-systemuicontroller", version.ref = "accompanist" }
accompanist-permissions = { module = "com.google.accompanist:accompanist-permissions", version.ref = "accompanist" }
ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" }
ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" }

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +1,6 @@
#Sun Nov 20 00:24:55 CET 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME

3
settings.gradle.kts
View File

@ -5,6 +5,9 @@ pluginManagement {
mavenCentral()
}
}
plugins {
id("org.gradle.toolchains.foojay-resolver-convention") version "1.0.0"
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {