Add main for diktat.jar

### What's done: * renamed diktat-ruleset to diktat * added DiktatMain * updated gradle plugin to use only diktat as dependency It closes #1557
saveourtool · Nov 15, 2022 · 7fee58a · 7fee58a
1 parent 341ef78
commit 7fee58a
Show file tree

Hide file tree

Showing 45 changed files with 3 additions and 3 deletions.
diff --git a/diktat-ruleset/pom.xml → diktat/pom.xml b/diktat-ruleset/pom.xml → diktat/pom.xml
@@ -3,7 +3,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <artifactId>diktat</artifactId>
-    <description>This module builds jar that can be used to run diktat using ktlint -R via command line</description>
+    <description>This module builds jar that can be used to run diktat using java -jar via command line</description>
 
     <parent>
         <groupId>org.cqfn.diktat</groupId>

diff --git a/...ktat/ruleset/smoke/DiktatSaveSmokeTest.kt → ...ktat/ruleset/smoke/DiktatSaveSmokeTest.kt b/...ktat/ruleset/smoke/DiktatSaveSmokeTest.kt → ...ktat/ruleset/smoke/DiktatSaveSmokeTest.kt
diff --git a/...n/diktat/ruleset/smoke/DiktatSmokeTest.kt → ...n/diktat/ruleset/smoke/DiktatSmokeTest.kt b/...n/diktat/ruleset/smoke/DiktatSmokeTest.kt → ...n/diktat/ruleset/smoke/DiktatSmokeTest.kt
diff --git a/...ktat/ruleset/smoke/DiktatSmokeTestBase.kt → ...ktat/ruleset/smoke/DiktatSmokeTestBase.kt b/...ktat/ruleset/smoke/DiktatSmokeTestBase.kt → ...ktat/ruleset/smoke/DiktatSmokeTestBase.kt
diff --git a/...in/org/cqfn/diktat/util/SmokeTestUtils.kt → ...in/org/cqfn/diktat/util/SmokeTestUtils.kt b/...in/org/cqfn/diktat/util/SmokeTestUtils.kt → ...in/org/cqfn/diktat/util/SmokeTestUtils.kt
diff --git a/.../src/test/resources/test/smoke/.gitignore → .../src/test/resources/test/smoke/.gitignore b/.../src/test/resources/test/smoke/.gitignore → .../src/test/resources/test/smoke/.gitignore
diff --git a/...st/resources/test/smoke/build.gradle_.kts → ...st/resources/test/smoke/build.gradle_.kts b/...st/resources/test/smoke/build.gradle_.kts → ...st/resources/test/smoke/build.gradle_.kts
diff --git a/...t/src/test/resources/test/smoke/save.toml → ...t/src/test/resources/test/smoke/save.toml b/...t/src/test/resources/test/smoke/save.toml → ...t/src/test/resources/test/smoke/save.toml
diff --git a/...org/cqfn/diktat/scripts/ScriptExpected.kt → ...org/cqfn/diktat/scripts/ScriptExpected.kt b/...org/cqfn/diktat/scripts/ScriptExpected.kt → ...org/cqfn/diktat/scripts/ScriptExpected.kt
diff --git a/...lin/org/cqfn/diktat/scripts/ScriptTest.kt → ...lin/org/cqfn/diktat/scripts/ScriptTest.kt b/...lin/org/cqfn/diktat/scripts/ScriptTest.kt → ...lin/org/cqfn/diktat/scripts/ScriptTest.kt
diff --git a/...est/smoke/src/main/kotlin/Bug1Expected.kt → ...est/smoke/src/main/kotlin/Bug1Expected.kt b/...est/smoke/src/main/kotlin/Bug1Expected.kt → ...est/smoke/src/main/kotlin/Bug1Expected.kt
diff --git a/...es/test/smoke/src/main/kotlin/Bug1Test.kt → ...es/test/smoke/src/main/kotlin/Bug1Test.kt b/...es/test/smoke/src/main/kotlin/Bug1Test.kt → ...es/test/smoke/src/main/kotlin/Bug1Test.kt
diff --git a/...src/main/kotlin/DefaultPackageExpected.kt → ...src/main/kotlin/DefaultPackageExpected.kt b/...src/main/kotlin/DefaultPackageExpected.kt → ...src/main/kotlin/DefaultPackageExpected.kt
diff --git a/...oke/src/main/kotlin/DefaultPackageTest.kt → ...oke/src/main/kotlin/DefaultPackageTest.kt b/...oke/src/main/kotlin/DefaultPackageTest.kt → ...oke/src/main/kotlin/DefaultPackageTest.kt
diff --git a/...oke/src/main/kotlin/Example1-2Expected.kt → ...oke/src/main/kotlin/Example1-2Expected.kt b/...oke/src/main/kotlin/Example1-2Expected.kt → ...oke/src/main/kotlin/Example1-2Expected.kt
diff --git a/...smoke/src/main/kotlin/Example1Expected.kt → ...smoke/src/main/kotlin/Example1Expected.kt b/...smoke/src/main/kotlin/Example1Expected.kt → ...smoke/src/main/kotlin/Example1Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example1Test.kt → ...est/smoke/src/main/kotlin/Example1Test.kt b/...est/smoke/src/main/kotlin/Example1Test.kt → ...est/smoke/src/main/kotlin/Example1Test.kt
diff --git a/...smoke/src/main/kotlin/Example2Expected.kt → ...smoke/src/main/kotlin/Example2Expected.kt b/...smoke/src/main/kotlin/Example2Expected.kt → ...smoke/src/main/kotlin/Example2Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example2Test.kt → ...est/smoke/src/main/kotlin/Example2Test.kt b/...est/smoke/src/main/kotlin/Example2Test.kt → ...est/smoke/src/main/kotlin/Example2Test.kt
diff --git a/...smoke/src/main/kotlin/Example3Expected.kt → ...smoke/src/main/kotlin/Example3Expected.kt b/...smoke/src/main/kotlin/Example3Expected.kt → ...smoke/src/main/kotlin/Example3Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example3Test.kt → ...est/smoke/src/main/kotlin/Example3Test.kt b/...est/smoke/src/main/kotlin/Example3Test.kt → ...est/smoke/src/main/kotlin/Example3Test.kt
diff --git a/...smoke/src/main/kotlin/Example4Expected.kt → ...smoke/src/main/kotlin/Example4Expected.kt b/...smoke/src/main/kotlin/Example4Expected.kt → ...smoke/src/main/kotlin/Example4Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example4Test.kt → ...est/smoke/src/main/kotlin/Example4Test.kt b/...est/smoke/src/main/kotlin/Example4Test.kt → ...est/smoke/src/main/kotlin/Example4Test.kt
diff --git a/...smoke/src/main/kotlin/Example5Expected.kt → ...smoke/src/main/kotlin/Example5Expected.kt b/...smoke/src/main/kotlin/Example5Expected.kt → ...smoke/src/main/kotlin/Example5Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example5Test.kt → ...est/smoke/src/main/kotlin/Example5Test.kt b/...est/smoke/src/main/kotlin/Example5Test.kt → ...est/smoke/src/main/kotlin/Example5Test.kt
diff --git a/...smoke/src/main/kotlin/Example6Expected.kt → ...smoke/src/main/kotlin/Example6Expected.kt b/...smoke/src/main/kotlin/Example6Expected.kt → ...smoke/src/main/kotlin/Example6Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example6Test.kt → ...est/smoke/src/main/kotlin/Example6Test.kt b/...est/smoke/src/main/kotlin/Example6Test.kt → ...est/smoke/src/main/kotlin/Example6Test.kt
diff --git a/...smoke/src/main/kotlin/Example7Expected.kt → ...smoke/src/main/kotlin/Example7Expected.kt b/...smoke/src/main/kotlin/Example7Expected.kt → ...smoke/src/main/kotlin/Example7Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example7Test.kt → ...est/smoke/src/main/kotlin/Example7Test.kt b/...est/smoke/src/main/kotlin/Example7Test.kt → ...est/smoke/src/main/kotlin/Example7Test.kt
diff --git a/...smoke/src/main/kotlin/Example8Expected.kt → ...smoke/src/main/kotlin/Example8Expected.kt b/...smoke/src/main/kotlin/Example8Expected.kt → ...smoke/src/main/kotlin/Example8Expected.kt
diff --git a/...est/smoke/src/main/kotlin/Example8Test.kt → ...est/smoke/src/main/kotlin/Example8Test.kt b/...est/smoke/src/main/kotlin/Example8Test.kt → ...est/smoke/src/main/kotlin/Example8Test.kt
diff --git a/...in/KdocFormattingMultilineTagsExpected.kt → ...in/KdocFormattingMultilineTagsExpected.kt b/...in/KdocFormattingMultilineTagsExpected.kt → ...in/KdocFormattingMultilineTagsExpected.kt
diff --git a/...kotlin/KdocFormattingMultilineTagsTest.kt → ...kotlin/KdocFormattingMultilineTagsTest.kt b/...kotlin/KdocFormattingMultilineTagsTest.kt → ...kotlin/KdocFormattingMultilineTagsTest.kt
diff --git a/...kotlin/LocalVariableWithOffsetExpected.kt → ...kotlin/LocalVariableWithOffsetExpected.kt b/...kotlin/LocalVariableWithOffsetExpected.kt → ...kotlin/LocalVariableWithOffsetExpected.kt
diff --git a/...ain/kotlin/LocalVariableWithOffsetTest.kt → ...ain/kotlin/LocalVariableWithOffsetTest.kt b/...ain/kotlin/LocalVariableWithOffsetTest.kt → ...ain/kotlin/LocalVariableWithOffsetTest.kt
diff --git a/...in/ManyLineTransformInLongLineExpected.kt → ...in/ManyLineTransformInLongLineExpected.kt b/...in/ManyLineTransformInLongLineExpected.kt → ...in/ManyLineTransformInLongLineExpected.kt
diff --git a/...kotlin/ManyLineTransformInLongLineTest.kt → ...kotlin/ManyLineTransformInLongLineTest.kt b/...kotlin/ManyLineTransformInLongLineTest.kt → ...kotlin/ManyLineTransformInLongLineTest.kt
diff --git a/...kotlin/kotlin-library-expected.gradle.kts → ...kotlin/kotlin-library-expected.gradle.kts b/...kotlin/kotlin-library-expected.gradle.kts → ...kotlin/kotlin-library-expected.gradle.kts
diff --git a/...src/main/kotlin/kotlin-library.gradle.kts → ...src/main/kotlin/kotlin-library.gradle.kts b/...src/main/kotlin/kotlin-library.gradle.kts → ...src/main/kotlin/kotlin-library.gradle.kts
diff --git a/...rces/test/smoke/src/main/kotlin/save.toml → ...rces/test/smoke/src/main/kotlin/save.toml b/...rces/test/smoke/src/main/kotlin/save.toml → ...rces/test/smoke/src/main/kotlin/save.toml
diff --git a/...kotlin/script/PackageInScriptExpected.kts → ...kotlin/script/PackageInScriptExpected.kts b/...kotlin/script/PackageInScriptExpected.kts → ...kotlin/script/PackageInScriptExpected.kts
diff --git a/...ain/kotlin/script/PackageInScriptTest.kts → ...ain/kotlin/script/PackageInScriptTest.kts b/...ain/kotlin/script/PackageInScriptTest.kts → ...ain/kotlin/script/PackageInScriptTest.kts
diff --git a/...tlin/script/SimpleRunInScriptExpected.kts → ...tlin/script/SimpleRunInScriptExpected.kts b/...tlin/script/SimpleRunInScriptExpected.kts → ...tlin/script/SimpleRunInScriptExpected.kts
diff --git a/...n/kotlin/script/SimpleRunInScriptTest.kts → ...n/kotlin/script/SimpleRunInScriptTest.kts b/...n/kotlin/script/SimpleRunInScriptTest.kts → ...n/kotlin/script/SimpleRunInScriptTest.kts
diff --git a/pom.xml b/pom.xml
@@ -8,7 +8,7 @@
     <version>1.2.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
-    <name>diktat</name>
+    <name>diktat-parent</name>
     <description>diKTat kotlin formatter and fixer</description>
     <url>https://www.cqfn.org/diKTat/</url>
 
@@ -67,7 +67,7 @@
         <module>diktat-common</module>
         <module>diktat-rules</module>
         <module>diktat-test-framework</module>
-        <module>diktat-ruleset</module>
+        <module>diktat</module>
         <module>diktat-maven-plugin</module>
         <module>diktat-gradle-plugin</module>
     </modules>