Skip to content

Commit e45d04d

Browse files
committed
Update dependencies
1 parent c3b2b21 commit e45d04d

File tree

6 files changed

+25
-23
lines changed

6 files changed

+25
-23
lines changed

app/src/main/kotlin/org/equeim/tremotesf/rpc/GlobalRpcClient.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicBoolean
3131
@SuppressLint("StaticFieldLeak")
3232
object GlobalRpcClient : RpcClient(CoroutineScope(SupervisorJob() + Dispatchers.Default)) {
3333
@Parcelize
34-
data class BackgroundRpcRequestError(val error: RpcRequestError, @StringRes val errorContext: Int) : Parcelable
34+
data class BackgroundRpcRequestError(val error: RpcRequestError, @param:StringRes val errorContext: Int) : Parcelable
3535

3636
val backgroundRpcRequestsErrors: Channel<BackgroundRpcRequestError> = Channel(Channel.UNLIMITED)
3737

app/src/main/kotlin/org/equeim/tremotesf/ui/NavigationActivityViewModel.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class NavigationActivityViewModel(application: Application, savedStateHandle: Sa
3030
AndroidViewModel(application) {
3131
var navigatedInitially: Boolean by savedStateHandle.saved { false }
3232

33-
data class AddTorrentDirections(@IdRes val destinationId: Int, val arguments: Bundle)
33+
data class AddTorrentDirections(@param:IdRes val destinationId: Int, val arguments: Bundle)
3434

3535
fun getAddTorrentDirections(intent: Intent): AddTorrentDirections? {
3636
if (intent.action != Intent.ACTION_VIEW) return null

app/src/main/kotlin/org/equeim/tremotesf/ui/components/TremotesfIconButtonWithTooltip.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ fun TremotesfIconButtonWithTooltipAndMenu(
5151
expanded = expanded,
5252
onDismissRequest = { expanded = false }
5353
) {
54-
val scope = object : DropdownMenuScope by this {
54+
val scope = object : DropdownMenuScope, ColumnScope by this {
5555
override fun dismiss() { expanded = false }
5656
}
5757
with(scope) { menuContent() }

bencode

buildSrc/src/main/kotlin/org/equeim/tremotesf/common-settings.gradle.kts

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,22 +8,29 @@ import com.android.build.api.dsl.ApplicationExtension
88
import com.android.build.api.dsl.CommonExtension
99
import com.android.build.api.dsl.LibraryExtension
1010
import com.android.build.gradle.api.AndroidBasePlugin
11+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
12+
import org.jetbrains.kotlin.gradle.dsl.KotlinAndroidExtension
13+
import org.jetbrains.kotlin.gradle.plugin.KotlinBasePlugin
1114

1215
val libs = extensions.getByType(VersionCatalogsExtension::class).named("libs")
1316
val javaVersion = JavaVersion.VERSION_11
1417

1518
private fun getSdkVersion(alias: String): Int =
1619
libs.findVersion(alias).get().requiredVersion.toInt()
1720

21+
typealias AndroidExtension = CommonExtension<*, *, *, *, *, *>
22+
1823
plugins.withType<AndroidBasePlugin> {
19-
val androidExtension = extensions.getByType(CommonExtension::class)
20-
androidExtension.configureAndroidProject()
21-
@Suppress("DEPRECATION")
22-
(androidExtension as ExtensionAware).extensions.getByType(org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions::class)
23-
.configureKotlin()
24+
extensions.getByName<AndroidExtension>("android").configureAndroidProject()
25+
}
26+
27+
plugins.withType<KotlinBasePlugin> {
28+
extensions.getByName<KotlinAndroidExtension>("kotlin").compilerOptions.jvmTarget.set(
29+
JvmTarget.fromTarget(javaVersion.toString())
30+
)
2431
}
2532

26-
private fun CommonExtension<*, *, *, *, *, *>.configureAndroidProject() {
33+
private fun AndroidExtension.configureAndroidProject() {
2734
compileSdk = getSdkVersion("sdk.platform.compile")
2835
defaultConfig.minSdk = getSdkVersion("sdk.platform.min")
2936
compileOptions {
@@ -50,8 +57,3 @@ private fun LibraryExtension.configureLibraryProject() {
5057
private fun ApplicationExtension.configureApplicationProject() {
5158
defaultConfig.targetSdk = getSdkVersion("sdk.platform.target")
5259
}
53-
54-
@Suppress("DEPRECATION")
55-
private fun org.jetbrains.kotlin.gradle.dsl.KotlinJvmOptions.configureKotlin() {
56-
jvmTarget = javaVersion.toString()
57-
}

gradle/libs.versions.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,29 +3,29 @@
33
# SPDX-License-Identifier: CC0-1.0
44

55
[versions]
6-
android-gradle-plugin = "8.10.1"
7-
kotlin = "2.1.21"
6+
android-gradle-plugin = "8.11.0"
7+
kotlin = "2.2.0"
88
gradle-versions-plugin = "0.52.0"
99

1010
sdk-platform-compile = "35"
1111
sdk-platform-min = "26"
1212
sdk-platform-target = "35"
1313

1414
coroutines = "1.10.2"
15-
serialization = "1.8.1"
15+
serialization = "1.9.0"
1616

1717
androidx-activity = "1.10.1"
1818
androidx-annotation = "1.9.1"
1919
androidx-collection = "1.5.0"
20-
androidx-compose = "2025.06.00"
21-
androidx-compose-material3 = "1.4.0-alpha15"
20+
androidx-compose = "2025.06.01"
21+
androidx-compose-material3 = "1.4.0-alpha16"
2222
androidx-core = "1.16.0"
2323
androidx-fragment = "1.8.8"
2424
androidx-lifecycle = "2.9.1"
2525
androidx-navigation = "2.8.9"
2626
androidx-webkit = "1.14.0"
2727
androidx-window = "1.4.0"
28-
androidx-work = "2.10.1"
28+
androidx-work = "2.10.2"
2929

3030
composeGrid = "2.3.1"
3131
fastscroller = "0.3.2"
@@ -34,8 +34,8 @@ timber = "5.0.1"
3434

3535
okhttp = "4.12.0"
3636

37-
junit = "5.13.1"
38-
mockk = "1.14.2"
37+
junit = "5.13.2"
38+
mockk = "1.14.4"
3939

4040
serialization-bencode = "0.1"
4141

0 commit comments

Comments
 (0)