fix info-root plugin

makeevrserg · Jun 11, 2024 · 6188d25 · 6188d25
1 parent fe9fff6
commit 6188d25
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/...gic/plugins/convention/src/main/kotlin/ru/astrainteractive/gradleplugin/InfoRootPlugin.kt b/...gic/plugins/convention/src/main/kotlin/ru/astrainteractive/gradleplugin/InfoRootPlugin.kt
@@ -2,23 +2,13 @@ package ru.astrainteractive.gradleplugin
 
 import org.gradle.api.Plugin
 import org.gradle.api.Project
-import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.hierarchyGroup
 import ru.astrainteractive.gradleplugin.property.extension.ModelPropertyValueExt.requireProjectInfo
 
 class InfoRootPlugin : Plugin<Project> {
     override fun apply(target: Project) {
         val projectInfo = target.requireProjectInfo
-        if (target.rootProject.group.toString().isEmpty()) {
-            target.rootProject.group = projectInfo.group
-        }
-        if (target.group.toString().isEmpty()) {
-            target.group = target.hierarchyGroup
-        }
-        if (target.version.toString().isEmpty()) {
-            target.version = projectInfo.versionString
-        }
-        if (target.description.isNullOrBlank()) {
-            target.description = projectInfo.description
-        }
+        target.group = projectInfo.group
+        target.version = projectInfo.versionString
+        target.description = projectInfo.description
     }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ project-description = "GradlePlugin for my kotlin projects"
 project-group = "ru.astrainteractive.gradleplugin"
 project-web = "https://github.com/makeevrserg/gradle-plugin"
 project-version-code = "4"
-project-version-string = "1.3.1"
+project-version-string = "1.3.2"
 # Kotlin
 kotlin-version = "2.0.0" # https://github.com/JetBrains/kotlin
 kotlin-dokka = "1.9.20" # https://github.com/Kotlin/dokka