removed everything and use the default configurations

saveourtool · Nov 10, 2023 · 5da9264 · 5da9264
1 parent ae7d316
commit 5da9264
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 3 deletions.
diff --git a/diktat-cli/build.gradle.kts b/diktat-cli/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.saveourtool.diktat.buildutils.configurePublications
 import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 import org.jetbrains.kotlin.incremental.createDirectory
@@ -92,3 +93,4 @@ publishing {
         }
     }
 }
+configurePublications()
diff --git a/diktat-gradle-plugin/build.gradle.kts b/diktat-gradle-plugin/build.gradle.kts
@@ -1,13 +1,16 @@
+import com.saveourtool.diktat.buildutils.configurePom
 import org.gradle.nativeplatform.platform.internal.DefaultNativePlatform.getCurrentOperatingSystem
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
+//import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
 plugins {
     id("com.saveourtool.diktat.buildutils.kotlin-jvm-configuration")
     id("com.saveourtool.diktat.buildutils.code-quality-convention")
-    id("com.saveourtool.diktat.buildutils.publishing-default-configuration")
+    id("com.saveourtool.diktat.buildutils.publishing-configuration")
     id("pl.droidsonroids.jacoco.testkit") version "1.0.12"
     id("org.gradle.test-retry") version "1.5.6"
     id("com.gradle.plugin-publish") version "1.2.1"
+//    alias(libs.plugins.shadow)
 }
 
 dependencies {
@@ -48,6 +51,38 @@ gradlePlugin {
     }
 }
 
+//tasks.named("jar") {
+//    enabled = false
+//}
+//val shadowJar by tasks.existing(ShadowJar::class) {
+//    archiveClassifier.set("")
+//    duplicatesStrategy = DuplicatesStrategy.FAIL
+//}
+//
+//val javadocJar by tasks.registering(Jar::class) {
+//    group = "documentation"
+//    archiveClassifier.set("javadoc")
+//    from(tasks.named("dokkaHtml"))
+//}
+//
+//publishing {
+//    repositories {
+//        mavenLocal()
+//    }
+//    publications {
+//        val pluginMaven by creating(MavenPublication::class) {
+//            artifact(shadowJar)
+//            artifact(javadocJar)
+//            pom {
+//                configurePom(project)
+//            }
+//        }
+//    }
+//}
+
+
+
+
 // === testing & code coverage, jacoco is run independent from maven
 val functionalTestTask by tasks.register<Test>("functionalTest")
 tasks.withType<Test> {
@@ -105,3 +140,9 @@ tasks.jacocoTestReport {
         xml.required.set(true)
     }
 }
+
+//afterEvaluate {
+//    tasks.named("publishDiktatPluginPluginMarkerMavenPublicationToMavenLocal") {
+//        dependsOn(javadocJar)
+//    }
+//}
diff --git a/diktat-maven-plugin/build.gradle.kts b/diktat-maven-plugin/build.gradle.kts
@@ -1,3 +1,4 @@
+import com.saveourtool.diktat.buildutils.configurePublications
 import de.benediktritter.maven.plugin.development.task.GenerateHelpMojoSourcesTask
 import de.benediktritter.maven.plugin.development.task.GenerateMavenPluginDescriptorTask
 
@@ -47,3 +48,4 @@ publishing {
         }
     }
 }
+configurePublications()
diff --git a/diktat-ruleset/build.gradle.kts b/diktat-ruleset/build.gradle.kts
@@ -1,4 +1,5 @@
 import com.saveourtool.diktat.buildutils.configurePom
+import com.saveourtool.diktat.buildutils.configurePublications
 import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
 import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar
 
@@ -73,3 +74,4 @@ publishing {
         }
     }
 }
+configurePublications()
diff --git a/gradle/plugins/src/main/kotlin/com/saveourtool/diktat/buildutils/PublishingConfiguration.kt b/gradle/plugins/src/main/kotlin/com/saveourtool/diktat/buildutils/PublishingConfiguration.kt
@@ -39,7 +39,6 @@ import org.jetbrains.dokka.gradle.DokkaPlugin
  * Configures all aspects of the publishing process.
  */
 fun Project.configurePublishing() {
-    configurePublications()
     apply<MavenPublishPlugin>()
     if (this == rootProject) {
         configureNexusPublishing()
@@ -161,7 +160,7 @@ private fun Project.configureGitHubPublishing() {
  * Configures all publications. The publications must already exist.
  */
 @Suppress("TOO_LONG_FUNCTION")
-private fun Project.configurePublications() {
+fun Project.configurePublications() {
     if (this == rootProject) {
         return
     }

diff --git a/...main/kotlin/com/saveourtool/diktat/buildutils/publishing-default-configuration.gradle.kts b/...main/kotlin/com/saveourtool/diktat/buildutils/publishing-default-configuration.gradle.kts
@@ -16,4 +16,5 @@ publishing {
     }
 }
 
+configurePublications()
 configurePublishing()