From e46568e525ecb34f9bd1360ccce496500f065ddc Mon Sep 17 00:00:00 2001 From: Yuriy Elistratov Date: Fri, 13 Dec 2024 18:43:56 +0400 Subject: [PATCH 1/2] Build: Update version of version catalog --- buildSrc/settings.gradle.kts | 2 +- buildSrc/src/main/kotlin/Project.kt | 9 ++------- buildSrc/src/main/kotlin/internal/Versions.kt | 2 +- gradle/wrapper/gradle-wrapper.properties | 2 +- panel-common/build.gradle.kts | 1 + .../debug/core/inapp/compose/DebugBottomSheet.kt | 7 ++----- settings.gradle.kts | 2 +- 7 files changed, 9 insertions(+), 16 deletions(-) diff --git a/buildSrc/settings.gradle.kts b/buildSrc/settings.gradle.kts index 096cda7f..7aa99318 100644 --- a/buildSrc/settings.gradle.kts +++ b/buildSrc/settings.gradle.kts @@ -30,7 +30,7 @@ dependencyResolutionManagement { } versionCatalogs { - val version = "2024.09.04" // Keep it in sync with root settings.gradle.kts + val version = "2024.12.12" // Keep it in sync with root settings.gradle.kts create("rmr") { from("com.redmadrobot.versions:versions-redmadrobot:$version") } diff --git a/buildSrc/src/main/kotlin/Project.kt b/buildSrc/src/main/kotlin/Project.kt index fa0a3bd7..9782340f 100644 --- a/buildSrc/src/main/kotlin/Project.kt +++ b/buildSrc/src/main/kotlin/Project.kt @@ -1,12 +1,7 @@ -import org.gradle.api.Project -import org.gradle.kotlin.dsl.provideDelegate -import java.io.File -import java.util.* - object Project { const val MIN_SDK = 21 - const val TARGET_SDK = 34 - const val COMPILE_SDK = 34 + const val TARGET_SDK = 35 + const val COMPILE_SDK = 35 object BuildTypes { const val release = "release" diff --git a/buildSrc/src/main/kotlin/internal/Versions.kt b/buildSrc/src/main/kotlin/internal/Versions.kt index 88286118..bcb1b16a 100644 --- a/buildSrc/src/main/kotlin/internal/Versions.kt +++ b/buildSrc/src/main/kotlin/internal/Versions.kt @@ -2,6 +2,6 @@ package internal internal object Versions { const val MIN_SDK = 21 - const val TARGET_SDK = 34 + const val TARGET_SDK = 35 const val COMPILE_SDK = TARGET_SDK } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index b82aa23a..09523c0e 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-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/panel-common/build.gradle.kts b/panel-common/build.gradle.kts index 924e02f1..8b3ff17a 100644 --- a/panel-common/build.gradle.kts +++ b/panel-common/build.gradle.kts @@ -48,6 +48,7 @@ dependencies { api(androidx.compose.animation) api(androidx.compose.foundation) api(androidx.compose.material) + api(androidx.compose.material.icons.core) api(androidx.compose.runtime.livedata) api(androidx.compose.ui) api(androidx.compose.ui.tooling) diff --git a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/compose/DebugBottomSheet.kt b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/compose/DebugBottomSheet.kt index 00ce16b1..222335b6 100644 --- a/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/compose/DebugBottomSheet.kt +++ b/panel-core/src/main/kotlin/com/redmadrobot/debug/core/inapp/compose/DebugBottomSheet.kt @@ -14,7 +14,6 @@ import androidx.compose.foundation.pager.HorizontalPager import androidx.compose.foundation.pager.PagerState import androidx.compose.foundation.pager.rememberPagerState import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material.ExperimentalMaterialApi import androidx.compose.material.MaterialTheme import androidx.compose.material.ModalBottomSheetLayout import androidx.compose.material.ModalBottomSheetValue @@ -36,7 +35,6 @@ import com.redmadrobot.debug.core.extension.getAllPlugins import com.redmadrobot.debug.core.plugin.Plugin import kotlinx.coroutines.launch -@OptIn(ExperimentalMaterialApi::class) @Composable public fun DebugBottomSheet(onClose: () -> Unit) { val state = rememberModalBottomSheetState( @@ -109,8 +107,7 @@ private fun PluginsTabLayout(pluginsName: List, pagerState: PagerState) @Composable private fun PluginsPager(plugins: List, pagerState: PagerState) { - plugins[pagerState.currentPage].content() - HorizontalPager(state = pagerState) { - // no impl. Temporary solution + HorizontalPager(state = pagerState) { page -> + plugins[page].content() } } diff --git a/settings.gradle.kts b/settings.gradle.kts index 656cd3da..b6fefb94 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -31,7 +31,7 @@ dependencyResolutionManagement { } versionCatalogs { - val version = "2024.09.04" // Keep it in sync with buildSrc/settings.gradle.kts + val version = "2024.12.12" // Keep it in sync with buildSrc/settings.gradle.kts create("rmr") { from("com.redmadrobot.versions:versions-redmadrobot:$version") } From b74937305000e0b4b4bdc1e71dbe9155d4ef4116 Mon Sep 17 00:00:00 2001 From: Yuriy Elistratov Date: Fri, 13 Dec 2024 18:44:38 +0400 Subject: [PATCH 2/2] version: 0.9.2 --- CHANGELOG.md | 16 +++++++++------- gradle.properties | 2 +- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f2bb44a2..c88338ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,10 +1,12 @@ -## [Unreleased] - -### Changes - -- *No changes* - -## [0.9.1] (2024-09-18) +## [Unreleased] + +### Changes + +* Gradle обновлен до 8.9 +* compileSdk и targetSdk повышены до 35 +* Обновлены зависимости (полный список обновлений смотрите [тут](https://github.com/RedMadRobot/gradle-version-catalogs/releases/tag/2024.12.12)) + +## [0.9.1] (2024-09-18) ### Changed diff --git a/gradle.properties b/gradle.properties index 4dee9a7d..e303268d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,6 +1,6 @@ # Project-wide Gradle settings. group=com.redmadrobot.debug -version=0.9.1 +version=0.9.2 # IDE (e.g. Android Studio) users: # Gradle settings configured through the IDE *will override*