Funkwhale
/
funkwhale-app-android
mirror of https://dev.funkwhale.audio/funkwhale/funkwhale-android
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'renovate/org.jetbrains.kotlin-kotlin-stdlib-jdk7-1.x' into 'develop' 

Update dependency org.jetbrains.kotlin:kotlin-stdlib-jdk7 to v1.8.0

See merge request funkwhale/funkwhale-android!280
This commit is contained in:
Ryan Harg 2023-01-05 13:09:31 +00:00
parent 7a01dc3a64 7abbd8dbaa
commit b24647663d
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle.kts
View File

@ -160,7 +160,7 @@ play {
dependencies {
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.7.22")
implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")

2
app/src/main/java/audio/funkwhale/ffa/activities/SettingsActivity.kt
View File

@ -148,7 +148,7 @@ class SettingsFragment :
}
preferenceManager.findPreference<SeekBarPreference>("media_cache_size")?.let {
it.summary = getString(R.string.settings_media_cache_size_summary, it.value)
it.summary = getString(R.string.settings_media_cache_size_summary, it.value as Int) // manual cast to address a bug in AGP
}
preferenceManager.findPreference<Preference>("version")?.let {

2
build.gradle.kts
View File

@ -8,7 +8,7 @@ buildscript {
dependencies {
classpath("com.android.tools.build:gradle:7.3.1")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.22")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0")
classpath("com.github.bjoernq:unmockplugin:0.7.9")
classpath("com.github.ben-manes:gradle-versions-plugin:0.44.0")
classpath("org.jacoco:org.jacoco.core:0.8.8")