Skip to content

Commit 4cc068d

Browse files
Yuriy ElistratovTopHlop
authored andcommitted
build: Update version of libs and plugins
1 parent c8f82f3 commit 4cc068d

6 files changed

Lines changed: 15 additions & 16 deletions

File tree

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
alias(libs.plugins.infrastructure.detekt)
33
alias(libs.plugins.versions)
4+
alias(libs.plugins.kotlin.compose) apply false
45
convention.detekt
56
}

buildSrc/build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@ dependencies {
1818
implementation(libs.kotlin.gradlePlugin)
1919
implementation(libs.detekt.gradlePlugin)
2020
implementation(libs.android.gradlePlugin)
21+
implementation(libs.publish.gradlePlugin)
2122
}

buildSrc/src/main/kotlin/convention.library.android.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,5 @@ plugins {
66

77
redmadrobot {
88
android.minSdk = 19
9+
android.compileSdk = "35"
910
}

gradle/libs.versions.toml

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[versions]
2-
androidGradlePlugin = "7.4.2"
3-
annotation = "1.7.1"
4-
compose-compiler = "1.5.13"
5-
compose-runtime = "1.6.7"
6-
compose-ui = "1.6.7"
7-
detekt = "1.23.6"
2+
androidGradlePlugin = "8.6.0"
3+
annotation = "1.9.1"
4+
compose-runtime = "1.7.8"
5+
compose-ui = "1.7.8"
6+
detekt = "1.23.8"
87
gradle-android-cacheFix = "3.0.1"
98
gradle-infrastructure = "0.18.1"
10-
kotlin = "1.9.23"
11-
versionsPlugin = "0.51.0"
9+
kotlin = "2.1.10"
10+
versionsPlugin = "0.52.0"
11+
publish-plugin = "0.34.0"
1212

1313
[libraries]
1414
android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" }
@@ -20,7 +20,9 @@ gradle-android-cacheFixGradlePlugin = { module = "gradle.plugin.org.gradle.andro
2020
infrastructure-android = { module = "com.redmadrobot.build:infrastructure-android", version.ref = "gradle-infrastructure" }
2121
infrastructure-publish = { module = "com.redmadrobot.build:infrastructure-publish", version.ref = "gradle-infrastructure" }
2222
kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
23+
publish-gradlePlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "publish-plugin" }
2324

2425
[plugins]
2526
infrastructure-detekt = { id = "com.redmadrobot.detekt", version.ref = "gradle-infrastructure" }
2627
versions = { id = "com.github.ben-manes.versions", version.ref = "versionsPlugin" }
28+
kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

settings.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pluginManagement {
1717
dependencyResolutionManagement {
1818
repositories {
1919
mavenCentral()
20+
google()
2021
}
2122
}
2223

textvalue-compose/build.gradle.kts

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
plugins {
2+
alias(libs.plugins.kotlin.compose)
23
convention.library.android
34
}
45

@@ -11,12 +12,4 @@ dependencies {
1112

1213
android {
1314
namespace = "$group.compose"
14-
15-
buildFeatures {
16-
compose = true
17-
}
18-
19-
composeOptions {
20-
kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get()
21-
}
2215
}

0 commit comments

Comments
 (0)