Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions app/src/main/kotlin/org/equeim/tremotesf/ui/Dimens.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
package org.equeim.tremotesf.ui

import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
import androidx.compose.material3.adaptive.currentWindowAdaptiveInfoV2
import androidx.compose.runtime.Composable
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.dp
Expand All @@ -19,7 +19,7 @@ object Dimens {

@Composable
fun screenContentPadding(): PaddingValues {
val windowSizeClass = currentWindowAdaptiveInfo().windowSizeClass
val windowSizeClass = currentWindowAdaptiveInfoV2().windowSizeClass
val horizontal = screenContentPaddingHorizontal(windowSizeClass)
val vertical = screenContentPaddingVertical(windowSizeClass)
return PaddingValues(
Expand All @@ -31,7 +31,7 @@ object Dimens {
}

@Composable
fun screenContentPaddingVertical(): Dp = screenContentPaddingVertical(currentWindowAdaptiveInfo().windowSizeClass)
fun screenContentPaddingVertical(): Dp = screenContentPaddingVertical(currentWindowAdaptiveInfoV2().windowSizeClass)

private fun screenContentPaddingVertical(windowSizeClass: WindowSizeClass): Dp =
if (windowSizeClass.isHeightAtLeastBreakpoint(WindowSizeClass.HEIGHT_DP_MEDIUM_LOWER_BOUND)) {
Expand All @@ -42,7 +42,7 @@ object Dimens {

@Composable
fun screenContentPaddingHorizontal(): Dp =
screenContentPaddingHorizontal(currentWindowAdaptiveInfo().windowSizeClass)
screenContentPaddingHorizontal(currentWindowAdaptiveInfoV2().windowSizeClass)

private fun screenContentPaddingHorizontal(windowSizeClass: WindowSizeClass): Dp =
if (windowSizeClass.isWidthAtLeastBreakpoint(WindowSizeClass.WIDTH_DP_MEDIUM_LOWER_BOUND)) {
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts → build-logic/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,6 @@ tasks.withType<KotlinCompile> {
}

dependencies {
implementation(libs.android.gradle.plugin)
implementation(libs.kotlin.gradle.plugin)
implementation(libs.android.gradle.plugin.api)
implementation(libs.kotlin.gradle.plugin.api)
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 3 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,9 @@
// SPDX-License-Identifier: CC0-1.0

plugins {
alias(libs.plugins.android.application) apply (false)
alias(libs.plugins.android.library) apply (false)
alias(libs.plugins.kotlin.plugin.parcelize) apply (false)
alias(libs.plugins.kotlin.plugin.compose) apply (false)
alias(libs.plugins.kotlin.plugin.serialization) apply (false)
alias(libs.plugins.tremotesf.common.settings) apply(false)
Expand Down
23 changes: 11 additions & 12 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
# SPDX-License-Identifier: CC0-1.0

[versions]
android-gradle-plugin = "9.3.0"
android-gradle-plugin = "9.3.1"
kotlin = "2.4.10"
deezer-caupain = "1.9.1"
deezer-caupain = "1.10.1"

sdk-platform-compile = "37"
sdk-platform-min = "26"
Expand All @@ -17,11 +17,11 @@ serialization = "1.11.0"
androidx-activity = "1.13.0"
androidx-annotation = "1.10.0"
androidx-collection = "1.6.0"
androidx-compose = "2026.06.01"
androidx-compose = "2026.08.00"
androidx-core = "1.19.0"
androidx-lifecycle = "2.11.0"
androidx-navigation3 = "1.1.5"
androidx-webkit = "1.16.0"
androidx-navigation3 = "1.1.6"
androidx-webkit = "1.17.0"
androidx-window = "1.5.1"
androidx-work = "2.11.2"

Expand All @@ -32,14 +32,14 @@ lazycolumnscrollbar = "2.2.0"

okhttp = "5.4.0"

junit = "6.1.2"
junit = "6.1.3"
mockk = "1.14.11"

serialization-bencode = "0.1"

[libraries]
android-gradle-plugin = { module = "com.android.tools.build:gradle", version.ref = "android-gradle-plugin" }
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
android-gradle-plugin-api = { module = "com.android.tools.build:gradle-api", version.ref = "android-gradle-plugin" }
kotlin-gradle-plugin-api = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin-api", version.ref = "kotlin" }

coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines" }
coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "coroutines" }
Expand Down Expand Up @@ -85,10 +85,9 @@ mockk = { module = "io.mockk:mockk", version.ref = "mockk" }
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test-junit5", version.ref = "kotlin" }

[plugins]
# Not setting version for com.android.application, com.android.library and org.jetbrains.kotlin.plugin.parcelize since they are already on classpath through buildSrc
android-application = { id = "com.android.application" }
android-library = { id = "com.android.library" }
kotlin-plugin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize" }
android-application = { id = "com.android.application", version.ref = "android-gradle-plugin" }
android-library = { id = "com.android.library", version.ref = "android-gradle-plugin" }
kotlin-plugin-parcelize = { id = "org.jetbrains.kotlin.plugin.parcelize", version.ref = "kotlin" }
kotlin-plugin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
kotlin-plugin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
deezer-caupain = { id = "com.deezer.caupain", version.ref = "deezer-caupain" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-9.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.0-bin.zip
networkTimeout=10000
retries=0
retryBackOffMs=500
Expand Down
1 change: 1 addition & 0 deletions settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@ dependencyResolutionManagement {
}
}

includeBuild("build-logic")
includeBuild("bencode")
include(":common", ":rpc", ":torrentfile", ":app")