From 09c9a6a270c753d5eee957220a09cdb5184072a0 Mon Sep 17 00:00:00 2001 From: rinekri Date: Wed, 19 Aug 2026 17:47:52 +0100 Subject: [PATCH] Switch to Gradle commons library --- CHANGELOG.md | 3 +++ .../src/main/groovy/plugin-convention.gradle | 2 +- gradle/libs.versions.toml | 6 +++--- gradle/wrapper/gradle-wrapper.properties | 2 +- .../quality/plugin/foundation/AggregateTasksWiring.kt | 2 +- .../plugin/foundation/AppQualityFoundationPlugin.kt | 10 +++++----- .../app/quality/plugin/foundation/DetektWiring.kt | 2 +- .../app/quality/plugin/foundation/KtlintWiring.kt | 2 +- .../quality/plugin/foundation/config/DetektConfig.kt | 2 +- .../quality/plugin/foundation/config/KtlintConfig.kt | 2 +- .../plugin/foundation/config/PlatformDetektConfig.kt | 2 +- .../extension/AppQualityFoundationExtension.kt | 5 ++--- 12 files changed, 21 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bba9239..c56dda2 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,9 @@ All notable changes to this project are documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [2.0.1] - 2026-08-19 +* Switch to use Gradle commons library + ## [2.0.0] - 2026-08-17 ### Changed diff --git a/build-conventions/src/main/groovy/plugin-convention.gradle b/build-conventions/src/main/groovy/plugin-convention.gradle index afbade7..cc09601 100644 --- a/build-conventions/src/main/groovy/plugin-convention.gradle +++ b/build-conventions/src/main/groovy/plugin-convention.gradle @@ -1,5 +1,5 @@ version = libs.versions.appQualityPlugin.get() dependencies { - implementation(libs.plugin.core) + api(libs.plugin.core) } \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f763a40..52fd453 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,5 +1,5 @@ [versions] -appQualityPlugin = "2.0.0" +appQualityPlugin = "2.0.1" kotlin = "2.4.10" agp = "9.3.1" detekt = "1.23.8" @@ -9,7 +9,7 @@ publish = "2.1.1" junit = "6.1.3" ktlintCli = "1.8.0" detekt-compose-rules = "1.4.0" -buildPublishCore = "2.1.1" +gradlePluginCommons = "1.0.0" composeMultiplatform = "1.11.1" [libraries] @@ -20,7 +20,7 @@ ktlint-cli = { module = "com.pinterest.ktlint:ktlint-cli", version.ref = "ktlint agp = { module = "com.android.tools.build:gradle", version.ref = "agp" } grgitCore = { module = "org.ajoberstar.grgit:grgit-core", version.ref = "grgit" } junitBom = { module = "org.junit:junit-bom", version.ref = "junit" } -plugin-core = { group = "ru.kode.android", name = "build-publish-novo-core", version.ref = "buildPublishCore" } +plugin-core = { group = "ru.kode.android", name = "gradle-plugin-commons", version.ref = "gradlePluginCommons" } plugin-foundation = { group = "ru.kode.android", name = "app-quality-foundation", version.ref = "appQualityPlugin" } kotlin-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69dd0d0..ad7845b 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.7.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip networkTimeout=10000 retries=0 retryBackOffMs=500 diff --git a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/AggregateTasksWiring.kt b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/AggregateTasksWiring.kt index d6b8a56..df1b8b5 100644 --- a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/AggregateTasksWiring.kt +++ b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/AggregateTasksWiring.kt @@ -9,7 +9,7 @@ import org.gradle.api.provider.Provider import org.gradle.api.tasks.TaskProvider import ru.kode.android.app.quality.plugin.foundation.extension.AppQualityFoundationExtension import ru.kode.android.app.quality.plugin.foundation.task.GitHooksSetupTask -import ru.kode.android.build.publish.plugin.core.logger.LoggerService +import ru.kode.android.gradle.commons.logger.LoggerService import java.lang.management.ManagementFactory internal fun Project.configureGitHooksSetup(extension: AppQualityFoundationExtension): TaskProvider { diff --git a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/AppQualityFoundationPlugin.kt b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/AppQualityFoundationPlugin.kt index 9cabc86..da9c613 100644 --- a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/AppQualityFoundationPlugin.kt +++ b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/AppQualityFoundationPlugin.kt @@ -4,11 +4,11 @@ import org.gradle.api.Plugin import org.gradle.api.Project import ru.kode.android.app.quality.plugin.foundation.extension.AppQualityFoundationExtension import ru.kode.android.app.quality.plugin.foundation.validate.stopExecutionIfNotSupported -import ru.kode.android.build.publish.plugin.core.logger.LOGGER_SERVICE_EXTENSION_NAME -import ru.kode.android.build.publish.plugin.core.logger.LOGGER_SERVICE_NAME -import ru.kode.android.build.publish.plugin.core.logger.LoggerService -import ru.kode.android.build.publish.plugin.core.logger.LoggerServiceExtension -import ru.kode.android.build.publish.plugin.core.util.serviceName +import ru.kode.android.gradle.commons.logger.LOGGER_SERVICE_EXTENSION_NAME +import ru.kode.android.gradle.commons.logger.LOGGER_SERVICE_NAME +import ru.kode.android.gradle.commons.logger.LoggerService +import ru.kode.android.gradle.commons.logger.LoggerServiceExtension +import ru.kode.android.gradle.commons.util.serviceName const val APP_QUALITY_EXTENSION_NAME = "appQualityFoundation" diff --git a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/DetektWiring.kt b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/DetektWiring.kt index da10048..a865864 100644 --- a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/DetektWiring.kt +++ b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/DetektWiring.kt @@ -18,7 +18,7 @@ import ru.kode.android.app.quality.plugin.foundation.utils.activatesKodeRuleSet import ru.kode.android.app.quality.plugin.foundation.utils.resolveConfigFile import ru.kode.android.app.quality.plugin.foundation.utils.wireDependencies import ru.kode.android.app.quality.plugin.foundation.validate.validateSubprojectAgpVersion -import ru.kode.android.build.publish.plugin.core.logger.LoggerService +import ru.kode.android.gradle.commons.logger.LoggerService internal val DEFAULT_DETEKT_INCLUDE_PATTERNS = listOf( diff --git a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/KtlintWiring.kt b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/KtlintWiring.kt index b4bf9e2..d16986f 100644 --- a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/KtlintWiring.kt +++ b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/KtlintWiring.kt @@ -22,7 +22,7 @@ import ru.kode.android.app.quality.plugin.foundation.utils.ignoredSourcePatterns import ru.kode.android.app.quality.plugin.foundation.utils.kotlinSourcePatterns import ru.kode.android.app.quality.plugin.foundation.utils.resolveConfigFile import ru.kode.android.app.quality.plugin.foundation.utils.wireDependencies -import ru.kode.android.build.publish.plugin.core.logger.LoggerService +import ru.kode.android.gradle.commons.logger.LoggerService import java.util.concurrent.Callable internal data class KtlintTasks( diff --git a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/DetektConfig.kt b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/DetektConfig.kt index f67f282..252a511 100644 --- a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/DetektConfig.kt +++ b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/DetektConfig.kt @@ -8,7 +8,7 @@ import org.gradle.api.model.ObjectFactory import org.gradle.api.provider.ListProperty import org.gradle.api.provider.Property import org.gradle.api.tasks.Nested -import ru.kode.android.build.publish.plugin.core.util.configureGroovy +import ru.kode.android.gradle.commons.util.configureGroovy import javax.inject.Inject abstract class DetektConfig diff --git a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/KtlintConfig.kt b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/KtlintConfig.kt index 782118b..7956252 100644 --- a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/KtlintConfig.kt +++ b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/KtlintConfig.kt @@ -5,7 +5,7 @@ import groovy.lang.DelegatesTo import org.gradle.api.Action import org.gradle.api.file.RegularFileProperty import org.gradle.api.model.ObjectFactory -import ru.kode.android.build.publish.plugin.core.util.configureGroovy +import ru.kode.android.gradle.commons.util.configureGroovy import javax.inject.Inject abstract class KtlintConfig diff --git a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/PlatformDetektConfig.kt b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/PlatformDetektConfig.kt index 23000e4..5055650 100644 --- a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/PlatformDetektConfig.kt +++ b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/config/PlatformDetektConfig.kt @@ -5,7 +5,7 @@ import groovy.lang.DelegatesTo import org.gradle.api.Action import org.gradle.api.file.RegularFileProperty import org.gradle.api.model.ObjectFactory -import ru.kode.android.build.publish.plugin.core.util.configureGroovy +import ru.kode.android.gradle.commons.util.configureGroovy import javax.inject.Inject abstract class PlatformDetektConfig diff --git a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/extension/AppQualityFoundationExtension.kt b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/extension/AppQualityFoundationExtension.kt index 8802c9b..996b021 100644 --- a/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/extension/AppQualityFoundationExtension.kt +++ b/plugin-build/plugin-foundation/src/main/kotlin/ru/kode/android/app/quality/plugin/foundation/extension/AppQualityFoundationExtension.kt @@ -11,14 +11,13 @@ import org.jetbrains.kotlin.gradle.dsl.JvmTarget import ru.kode.android.app.quality.plugin.foundation.config.AndroidLintConfig import ru.kode.android.app.quality.plugin.foundation.config.DetektConfig import ru.kode.android.app.quality.plugin.foundation.config.KtlintConfig -import ru.kode.android.build.publish.plugin.core.api.extension.BuildPublishConfigurableExtension -import ru.kode.android.build.publish.plugin.core.util.configureGroovy +import ru.kode.android.gradle.commons.util.configureGroovy import javax.inject.Inject @Suppress("UnnecessaryAbstractClass") abstract class AppQualityFoundationExtension @Inject - constructor(objectFactory: ObjectFactory) : BuildPublishConfigurableExtension() { + constructor(objectFactory: ObjectFactory) { /** * Enables verbose logging for the build and publish plugins. *