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:
commit
b24647663d
|
@ -160,7 +160,7 @@ play {
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar", "*.aar"))))
|
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-core:1.6.4")
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
|
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4")
|
||||||
|
|
||||||
|
|
|
@ -148,7 +148,7 @@ class SettingsFragment :
|
||||||
}
|
}
|
||||||
|
|
||||||
preferenceManager.findPreference<SeekBarPreference>("media_cache_size")?.let {
|
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 {
|
preferenceManager.findPreference<Preference>("version")?.let {
|
||||||
|
|
|
@ -8,7 +8,7 @@ buildscript {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("com.android.tools.build:gradle:7.3.1")
|
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.bjoernq:unmockplugin:0.7.9")
|
||||||
classpath("com.github.ben-manes:gradle-versions-plugin:0.44.0")
|
classpath("com.github.ben-manes:gradle-versions-plugin:0.44.0")
|
||||||
classpath("org.jacoco:org.jacoco.core:0.8.8")
|
classpath("org.jacoco:org.jacoco.core:0.8.8")
|
||||||
|
|
Loading…
Reference in New Issue