Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added shadow for diktat-runner #1834

Merged
merged 9 commits into from
Nov 30, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
}

fun main(args: Array<String>) {
val properties = DiktatProperties.parse(diktatRunnerFactory.diktatReporterFactory, args)
val properties = DiktatProperties.parse(diktatReporterFactory, args)

Check warning on line 29 in diktat-cli/src/main/kotlin/com/saveourtool/diktat/DiktatMain.kt

View check run for this annotation

Codecov / codecov/patch

diktat-cli/src/main/kotlin/com/saveourtool/diktat/DiktatMain.kt#L29

Added line #L29 was not covered by tests
properties.configureLogger()

log.debug {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
files = getFiles(sourceRootDir),
baselineFile = null,
reporterArgsList = listOf(reporterCreationArguments),
loggingListener = loggingListener
loggingListener = loggingListener,

Check warning on line 94 in diktat-cli/src/main/kotlin/com/saveourtool/diktat/cli/DiktatProperties.kt

View check run for this annotation

Codecov / codecov/patch

diktat-cli/src/main/kotlin/com/saveourtool/diktat/cli/DiktatProperties.kt#L94

Added line #L94 was not covered by tests
)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ import org.gradle.api.tasks.TaskProvider
import org.gradle.api.tasks.VerificationTask
import org.gradle.api.tasks.util.PatternFilterable
import org.gradle.language.base.plugins.LifecycleBasePlugin
import java.nio.file.Files

import java.nio.file.Files
import java.nio.file.Path

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ abstract class DiktatBaseMojo : AbstractMojo() {
* @param args arguments for [DiktatRunner]
* @return count of errors
*/
@Suppress("TOO_MANY_PARAMETERS")
abstract fun runAction(
runner: DiktatRunner,
args: DiktatRunnerArguments,
Expand Down
30 changes: 29 additions & 1 deletion diktat-runner/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,14 @@
import com.saveourtool.diktat.buildutils.configurePublications
import com.saveourtool.diktat.buildutils.configurePublishing
import com.github.jengelman.gradle.plugins.shadow.ShadowExtension
import com.github.jengelman.gradle.plugins.shadow.tasks.ShadowJar

@Suppress("DSL_SCOPE_VIOLATION", "RUN_IN_SCRIPT") // https://github.com/gradle/gradle/issues/22797
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")
alias(libs.plugins.shadow)
}

project.description = "This module contains runner for diktat"
Expand All @@ -13,3 +19,25 @@ dependencies {
implementation(projects.diktatKtlintEngine)
implementation(projects.diktatRules)
}

tasks.named<ShadowJar>("shadowJar") {
archiveClassifier.set("shadow")
duplicatesStrategy = DuplicatesStrategy.FAIL
}

publishing {
publications {
create<MavenPublication>("maven") {
from(components["java"])
}
// it creates a publication for shadowJar
create<MavenPublication>("shadow") {
// https://github.com/johnrengelman/shadow/issues/417#issuecomment-830668442
project.extensions.configure<ShadowExtension> {
component(this@create)
}
}
}
}
configurePublications()
configurePublishing()
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
/**
* Contains only initialized factories
*/

package com.saveourtool.diktat

import com.saveourtool.diktat.api.DiktatBaselineFactory
import com.saveourtool.diktat.api.DiktatReporterFactory
import com.saveourtool.diktat.api.DiktatRuleConfigReader
import com.saveourtool.diktat.api.DiktatRuleSetFactory
import com.saveourtool.diktat.ktlint.DiktatBaselineFactoryImpl
import com.saveourtool.diktat.ktlint.DiktatProcessorFactoryImpl
import com.saveourtool.diktat.ktlint.DiktatReporterFactoryImpl
import com.saveourtool.diktat.ruleset.rules.DiktatRuleConfigReaderImpl
import com.saveourtool.diktat.ruleset.rules.DiktatRuleSetFactoryImpl
import generated.KTLINT_VERSION

/**
* Info about engine
*/
const val ENGINE_INFO: String = "Ktlint: $KTLINT_VERSION"

/**
* @return initialized [DiktatRuleConfigReader]
*/
val diktatRuleConfigReader: DiktatRuleConfigReader = DiktatRuleConfigReaderImpl()

/**
* @return initialized [DiktatRuleSetFactory]
*/
val diktatRuleSetFactory: DiktatRuleSetFactory = DiktatRuleSetFactoryImpl()

/**
* @return initialized [DiktatProcessorFactory]
*/
val diktatProcessorFactory: DiktatProcessorFactory = DiktatProcessorFactoryImpl()

/**
* @return initialized [DiktatBaselineFactory]
*/
val diktatBaselineFactory: DiktatBaselineFactory = DiktatBaselineFactoryImpl()

/**
* @return initialized [DiktatReporterFactory]
*/
val diktatReporterFactory: DiktatReporterFactory = DiktatReporterFactoryImpl()

/**
* @return initialized [DiktatRunnerFactory]
*/
val diktatRunnerFactory: DiktatRunnerFactory = DiktatRunnerFactory(
diktatRuleConfigReader,
diktatRuleSetFactory,
diktatProcessorFactory,
diktatBaselineFactory,
diktatReporterFactory,
)

This file was deleted.

Loading