Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update version of version catalog and update version to 0.9.2 #40

Merged
merged 2 commits into from
Dec 16, 2024
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
16 changes: 9 additions & 7 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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

Expand Down
2 changes: 1 addition & 1 deletion buildSrc/settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
9 changes: 2 additions & 7 deletions buildSrc/src/main/kotlin/Project.kt
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
2 changes: 1 addition & 1 deletion buildSrc/src/main/kotlin/internal/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -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*
Expand Down
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-8.7-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
1 change: 1 addition & 0 deletions panel-common/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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(
Expand Down Expand Up @@ -109,8 +107,7 @@ private fun PluginsTabLayout(pluginsName: List<String>, pagerState: PagerState)

@Composable
private fun PluginsPager(plugins: List<Plugin>, pagerState: PagerState) {
plugins[pagerState.currentPage].content()
HorizontalPager(state = pagerState) {
// no impl. Temporary solution
HorizontalPager(state = pagerState) { page ->
plugins[page].content()
}
}
2 changes: 1 addition & 1 deletion settings.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
Loading