diff --git a/CHANGELOG.md b/CHANGELOG.md index 8ee302e..bcb0ea3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,8 @@ ## [1.0.1] - 2025.09.24 - Add ability to use arguments with text from resources +- Update version of AGP, plugins and libraries +- Update publishing logic to Maven Central, because [OSSRH](https://central.sonatype.org/pages/ossrh-eol/) has been shut down ## [1.0.0] - 2024.05.13 diff --git a/build.gradle.kts b/build.gradle.kts index 2922a30..833258a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ plugins { alias(libs.plugins.infrastructure.detekt) alias(libs.plugins.versions) + alias(libs.plugins.kotlin.compose) apply false convention.detekt } diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts index dd5ba90..a2ff6dc 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts @@ -18,4 +18,5 @@ dependencies { implementation(libs.kotlin.gradlePlugin) implementation(libs.detekt.gradlePlugin) implementation(libs.android.gradlePlugin) + implementation(libs.publish.gradlePlugin) } diff --git a/buildSrc/src/main/kotlin/convention.library.android.gradle.kts b/buildSrc/src/main/kotlin/convention.library.android.gradle.kts index d447089..b434d1c 100644 --- a/buildSrc/src/main/kotlin/convention.library.android.gradle.kts +++ b/buildSrc/src/main/kotlin/convention.library.android.gradle.kts @@ -6,4 +6,5 @@ plugins { redmadrobot { android.minSdk = 19 + android.compileSdk = "35" } diff --git a/buildSrc/src/main/kotlin/convention.publishing.gradle.kts b/buildSrc/src/main/kotlin/convention.publishing.gradle.kts index 9ff9a1f..a6bd846 100644 --- a/buildSrc/src/main/kotlin/convention.publishing.gradle.kts +++ b/buildSrc/src/main/kotlin/convention.publishing.gradle.kts @@ -1,24 +1,26 @@ import com.redmadrobot.build.dsl.* plugins { - id("com.redmadrobot.publish-config") - id("com.redmadrobot.publish") + id("com.vanniktech.maven.publish") } -redmadrobot { - publishing { - signArtifacts = !isRunningOnCi - pom { - setGitHubProject("RedMadRobot/TextValue") +mavenPublishing { + publishToMavenCentral(automaticRelease = true) + signAllPublications() - licenses { - mit() - } + pom { + name.convention(project.name) + description.convention(project.description) - developers { - developer(id = "osipxd", name = "Osip Fatkullin", email = "o.fatkullin@redmadrobot.com") - developer(id = "sonulen", name = "Andrey Tolmachev", email = "sonulen@gmail.com") - } + setGitHubProject("RedMadRobot/TextValue") + + licenses { + mit() + } + + developers { + developer(id = "osipxd", name = "Osip Fatkullin", email = "o.fatkullin@redmadrobot.com") + developer(id = "sonulen", name = "Andrey Tolmachev", email = "sonulen@gmail.com") } } } @@ -26,6 +28,5 @@ redmadrobot { publishing { repositories { if (isRunningOnCi) githubPackages("RedMadRobot/TextValue") - if (isReleaseVersion && credentialsExist("ossrh")) ossrh() } } diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d84778c..c2af6c5 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,14 +1,14 @@ [versions] -androidGradlePlugin = "7.4.2" -annotation = "1.7.1" -compose-compiler = "1.5.13" -compose-runtime = "1.6.7" -compose-ui = "1.6.7" -detekt = "1.23.6" +androidGradlePlugin = "8.6.0" +annotation = "1.9.1" +compose-runtime = "1.7.8" +compose-ui = "1.7.8" +detekt = "1.23.8" gradle-android-cacheFix = "3.0.1" gradle-infrastructure = "0.18.1" -kotlin = "1.9.23" -versionsPlugin = "0.51.0" +kotlin = "2.1.10" +versionsPlugin = "0.52.0" +publish-plugin = "0.34.0" [libraries] android-gradlePlugin = { module = "com.android.tools.build:gradle", version.ref = "androidGradlePlugin" } @@ -20,7 +20,9 @@ gradle-android-cacheFixGradlePlugin = { module = "gradle.plugin.org.gradle.andro infrastructure-android = { module = "com.redmadrobot.build:infrastructure-android", version.ref = "gradle-infrastructure" } infrastructure-publish = { module = "com.redmadrobot.build:infrastructure-publish", version.ref = "gradle-infrastructure" } kotlin-gradlePlugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } +publish-gradlePlugin = { module = "com.vanniktech:gradle-maven-publish-plugin", version.ref = "publish-plugin" } [plugins] infrastructure-detekt = { id = "com.redmadrobot.detekt", version.ref = "gradle-infrastructure" } versions = { id = "com.github.ben-manes.versions", version.ref = "versionsPlugin" } +kotlin-compose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/settings.gradle.kts b/settings.gradle.kts index 8e5dee0..6bb4674 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -17,6 +17,7 @@ pluginManagement { dependencyResolutionManagement { repositories { mavenCentral() + google() } } diff --git a/textvalue-compose/build.gradle.kts b/textvalue-compose/build.gradle.kts index 11020c4..327d84f 100644 --- a/textvalue-compose/build.gradle.kts +++ b/textvalue-compose/build.gradle.kts @@ -1,4 +1,5 @@ plugins { + alias(libs.plugins.kotlin.compose) convention.library.android } @@ -11,12 +12,4 @@ dependencies { android { namespace = "$group.compose" - - buildFeatures { - compose = true - } - - composeOptions { - kotlinCompilerExtensionVersion = libs.versions.compose.compiler.get() - } }