diff --git a/app/src/main/kotlin/org/equeim/tremotesf/ui/Dimens.kt b/app/src/main/kotlin/org/equeim/tremotesf/ui/Dimens.kt index c03719ec..9f0cfd95 100644 --- a/app/src/main/kotlin/org/equeim/tremotesf/ui/Dimens.kt +++ b/app/src/main/kotlin/org/equeim/tremotesf/ui/Dimens.kt @@ -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 @@ -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( @@ -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)) { @@ -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)) { diff --git a/bencode b/bencode index d05c13fb..a4c97c55 160000 --- a/bencode +++ b/bencode @@ -1 +1 @@ -Subproject commit d05c13fb05ed7a5a21135ebacb16259e9e20858e +Subproject commit a4c97c5595fc4581fb1fde34f12a1dd16ea97128 diff --git a/buildSrc/build.gradle.kts b/build-logic/build.gradle.kts similarity index 83% rename from buildSrc/build.gradle.kts rename to build-logic/build.gradle.kts index e7f9084e..a5204091 100644 --- a/buildSrc/build.gradle.kts +++ b/build-logic/build.gradle.kts @@ -18,6 +18,6 @@ tasks.withType { } dependencies { - implementation(libs.android.gradle.plugin) - implementation(libs.kotlin.gradle.plugin) + implementation(libs.android.gradle.plugin.api) + implementation(libs.kotlin.gradle.plugin.api) } diff --git a/buildSrc/gradle.properties b/build-logic/gradle.properties similarity index 100% rename from buildSrc/gradle.properties rename to build-logic/gradle.properties diff --git a/buildSrc/gradle/wrapper b/build-logic/gradle/wrapper similarity index 100% rename from buildSrc/gradle/wrapper rename to build-logic/gradle/wrapper diff --git a/buildSrc/gradlew b/build-logic/gradlew similarity index 100% rename from buildSrc/gradlew rename to build-logic/gradlew diff --git a/buildSrc/gradlew.bat b/build-logic/gradlew.bat similarity index 100% rename from buildSrc/gradlew.bat rename to build-logic/gradlew.bat diff --git a/buildSrc/settings.gradle.kts b/build-logic/settings.gradle.kts similarity index 100% rename from buildSrc/settings.gradle.kts rename to build-logic/settings.gradle.kts diff --git a/buildSrc/src/main/kotlin/org/equeim/tremotesf/common-settings.gradle.kts b/build-logic/src/main/kotlin/org/equeim/tremotesf/common-settings.gradle.kts similarity index 100% rename from buildSrc/src/main/kotlin/org/equeim/tremotesf/common-settings.gradle.kts rename to build-logic/src/main/kotlin/org/equeim/tremotesf/common-settings.gradle.kts diff --git a/build.gradle.kts b/build.gradle.kts index 7000fa9e..3447bf0c 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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) diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index df38b98e..5619e779 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -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" @@ -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" @@ -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" } @@ -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" } diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index b1b8ef56..eddabd2e 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a9db1155..69dd0d04 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/settings.gradle.kts b/settings.gradle.kts index 84dead63..3f84527e 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -18,5 +18,6 @@ dependencyResolutionManagement { } } +includeBuild("build-logic") includeBuild("bencode") include(":common", ":rpc", ":torrentfile", ":app")