From 7fee58a3568a495bcd4c0b46a00735ca36c9c8c9 Mon Sep 17 00:00:00 2001 From: Nariman Abdullin Date: Tue, 15 Nov 2022 18:28:03 +0300 Subject: [PATCH] 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 --- {diktat-ruleset => diktat}/pom.xml | 2 +- .../org/cqfn/diktat/ruleset/smoke/DiktatSaveSmokeTest.kt | 0 .../kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTest.kt | 0 .../org/cqfn/diktat/ruleset/smoke/DiktatSmokeTestBase.kt | 0 .../src/test/kotlin/org/cqfn/diktat/util/SmokeTestUtils.kt | 0 .../src/test/resources/test/smoke/.gitignore | 0 .../src/test/resources/test/smoke/build.gradle_.kts | 0 .../src/test/resources/test/smoke/save.toml | 0 .../jsMain/kotlin/org/cqfn/diktat/scripts/ScriptExpected.kt | 0 .../src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptTest.kt | 0 .../test/resources/test/smoke/src/main/kotlin/Bug1Expected.kt | 0 .../src/test/resources/test/smoke/src/main/kotlin/Bug1Test.kt | 0 .../test/smoke/src/main/kotlin/DefaultPackageExpected.kt | 0 .../test/smoke/src/main/kotlin/DefaultPackageTest.kt | 0 .../test/smoke/src/main/kotlin/Example1-2Expected.kt | 0 .../resources/test/smoke/src/main/kotlin/Example1Expected.kt | 0 .../test/resources/test/smoke/src/main/kotlin/Example1Test.kt | 0 .../resources/test/smoke/src/main/kotlin/Example2Expected.kt | 0 .../test/resources/test/smoke/src/main/kotlin/Example2Test.kt | 0 .../resources/test/smoke/src/main/kotlin/Example3Expected.kt | 0 .../test/resources/test/smoke/src/main/kotlin/Example3Test.kt | 0 .../resources/test/smoke/src/main/kotlin/Example4Expected.kt | 0 .../test/resources/test/smoke/src/main/kotlin/Example4Test.kt | 0 .../resources/test/smoke/src/main/kotlin/Example5Expected.kt | 0 .../test/resources/test/smoke/src/main/kotlin/Example5Test.kt | 0 .../resources/test/smoke/src/main/kotlin/Example6Expected.kt | 0 .../test/resources/test/smoke/src/main/kotlin/Example6Test.kt | 0 .../resources/test/smoke/src/main/kotlin/Example7Expected.kt | 0 .../test/resources/test/smoke/src/main/kotlin/Example7Test.kt | 0 .../resources/test/smoke/src/main/kotlin/Example8Expected.kt | 0 .../test/resources/test/smoke/src/main/kotlin/Example8Test.kt | 0 .../src/main/kotlin/KdocFormattingMultilineTagsExpected.kt | 0 .../smoke/src/main/kotlin/KdocFormattingMultilineTagsTest.kt | 0 .../smoke/src/main/kotlin/LocalVariableWithOffsetExpected.kt | 0 .../test/smoke/src/main/kotlin/LocalVariableWithOffsetTest.kt | 0 .../src/main/kotlin/ManyLineTransformInLongLineExpected.kt | 0 .../smoke/src/main/kotlin/ManyLineTransformInLongLineTest.kt | 0 .../smoke/src/main/kotlin/kotlin-library-expected.gradle.kts | 0 .../test/smoke/src/main/kotlin/kotlin-library.gradle.kts | 0 .../src/test/resources/test/smoke/src/main/kotlin/save.toml | 0 .../smoke/src/main/kotlin/script/PackageInScriptExpected.kts | 0 .../test/smoke/src/main/kotlin/script/PackageInScriptTest.kts | 0 .../src/main/kotlin/script/SimpleRunInScriptExpected.kts | 0 .../smoke/src/main/kotlin/script/SimpleRunInScriptTest.kts | 0 pom.xml | 4 ++-- 45 files changed, 3 insertions(+), 3 deletions(-) rename {diktat-ruleset => diktat}/pom.xml (99%) rename {diktat-ruleset => diktat}/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSaveSmokeTest.kt (100%) rename {diktat-ruleset => diktat}/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTest.kt (100%) rename {diktat-ruleset => diktat}/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTestBase.kt (100%) rename {diktat-ruleset => diktat}/src/test/kotlin/org/cqfn/diktat/util/SmokeTestUtils.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/.gitignore (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/build.gradle_.kts (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/save.toml (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptExpected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptTest.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Bug1Expected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Bug1Test.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/DefaultPackageExpected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/DefaultPackageTest.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example1-2Expected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example1Expected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example1Test.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example2Expected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example2Test.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example3Expected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example3Test.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example4Expected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example4Test.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example5Expected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example5Test.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example6Expected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example6Test.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example7Expected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example7Test.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example8Expected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/Example8Test.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/KdocFormattingMultilineTagsExpected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/KdocFormattingMultilineTagsTest.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/LocalVariableWithOffsetExpected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/LocalVariableWithOffsetTest.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineExpected.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineTest.kt (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/kotlin-library-expected.gradle.kts (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/kotlin-library.gradle.kts (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/save.toml (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/script/PackageInScriptExpected.kts (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/script/PackageInScriptTest.kts (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/script/SimpleRunInScriptExpected.kts (100%) rename {diktat-ruleset => diktat}/src/test/resources/test/smoke/src/main/kotlin/script/SimpleRunInScriptTest.kts (100%) diff --git a/diktat-ruleset/pom.xml b/diktat/pom.xml similarity index 99% rename from diktat-ruleset/pom.xml rename to diktat/pom.xml index 9024648b37..12eb7082de 100644 --- a/diktat-ruleset/pom.xml +++ b/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"> 4.0.0 diktat - This module builds jar that can be used to run diktat using ktlint -R via command line + This module builds jar that can be used to run diktat using java -jar via command line org.cqfn.diktat diff --git a/diktat-ruleset/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSaveSmokeTest.kt b/diktat/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSaveSmokeTest.kt similarity index 100% rename from diktat-ruleset/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSaveSmokeTest.kt rename to diktat/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSaveSmokeTest.kt diff --git a/diktat-ruleset/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTest.kt b/diktat/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTest.kt similarity index 100% rename from diktat-ruleset/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTest.kt rename to diktat/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTest.kt diff --git a/diktat-ruleset/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTestBase.kt b/diktat/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTestBase.kt similarity index 100% rename from diktat-ruleset/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTestBase.kt rename to diktat/src/test/kotlin/org/cqfn/diktat/ruleset/smoke/DiktatSmokeTestBase.kt diff --git a/diktat-ruleset/src/test/kotlin/org/cqfn/diktat/util/SmokeTestUtils.kt b/diktat/src/test/kotlin/org/cqfn/diktat/util/SmokeTestUtils.kt similarity index 100% rename from diktat-ruleset/src/test/kotlin/org/cqfn/diktat/util/SmokeTestUtils.kt rename to diktat/src/test/kotlin/org/cqfn/diktat/util/SmokeTestUtils.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/.gitignore b/diktat/src/test/resources/test/smoke/.gitignore similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/.gitignore rename to diktat/src/test/resources/test/smoke/.gitignore diff --git a/diktat-ruleset/src/test/resources/test/smoke/build.gradle_.kts b/diktat/src/test/resources/test/smoke/build.gradle_.kts similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/build.gradle_.kts rename to diktat/src/test/resources/test/smoke/build.gradle_.kts diff --git a/diktat-ruleset/src/test/resources/test/smoke/save.toml b/diktat/src/test/resources/test/smoke/save.toml similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/save.toml rename to diktat/src/test/resources/test/smoke/save.toml diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptExpected.kt b/diktat/src/test/resources/test/smoke/src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptExpected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptExpected.kt rename to diktat/src/test/resources/test/smoke/src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptExpected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptTest.kt b/diktat/src/test/resources/test/smoke/src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptTest.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptTest.kt rename to diktat/src/test/resources/test/smoke/src/jsMain/kotlin/org/cqfn/diktat/scripts/ScriptTest.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Bug1Expected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Bug1Expected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Bug1Expected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Bug1Expected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Bug1Test.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Bug1Test.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Bug1Test.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Bug1Test.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/DefaultPackageExpected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/DefaultPackageExpected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/DefaultPackageExpected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/DefaultPackageExpected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/DefaultPackageTest.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/DefaultPackageTest.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/DefaultPackageTest.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/DefaultPackageTest.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example1-2Expected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example1-2Expected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example1-2Expected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example1-2Expected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example1Expected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example1Expected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example1Expected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example1Expected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example1Test.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example1Test.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example1Test.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example1Test.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example2Expected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example2Expected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example2Expected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example2Expected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example2Test.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example2Test.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example2Test.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example2Test.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example3Expected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example3Expected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example3Expected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example3Expected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example3Test.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example3Test.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example3Test.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example3Test.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example4Expected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example4Expected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example4Expected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example4Expected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example4Test.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example4Test.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example4Test.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example4Test.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example5Expected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example5Expected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example5Expected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example5Expected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example5Test.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example5Test.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example5Test.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example5Test.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example6Expected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example6Expected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example6Expected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example6Expected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example6Test.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example6Test.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example6Test.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example6Test.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example7Expected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example7Expected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example7Expected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example7Expected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example7Test.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example7Test.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example7Test.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example7Test.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example8Expected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example8Expected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example8Expected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example8Expected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example8Test.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/Example8Test.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/Example8Test.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/Example8Test.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/KdocFormattingMultilineTagsExpected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/KdocFormattingMultilineTagsExpected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/KdocFormattingMultilineTagsExpected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/KdocFormattingMultilineTagsExpected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/KdocFormattingMultilineTagsTest.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/KdocFormattingMultilineTagsTest.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/KdocFormattingMultilineTagsTest.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/KdocFormattingMultilineTagsTest.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/LocalVariableWithOffsetExpected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/LocalVariableWithOffsetExpected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/LocalVariableWithOffsetExpected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/LocalVariableWithOffsetExpected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/LocalVariableWithOffsetTest.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/LocalVariableWithOffsetTest.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/LocalVariableWithOffsetTest.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/LocalVariableWithOffsetTest.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineExpected.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineExpected.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineExpected.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineExpected.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineTest.kt b/diktat/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineTest.kt similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineTest.kt rename to diktat/src/test/resources/test/smoke/src/main/kotlin/ManyLineTransformInLongLineTest.kt diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/kotlin-library-expected.gradle.kts b/diktat/src/test/resources/test/smoke/src/main/kotlin/kotlin-library-expected.gradle.kts similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/kotlin-library-expected.gradle.kts rename to diktat/src/test/resources/test/smoke/src/main/kotlin/kotlin-library-expected.gradle.kts diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/kotlin-library.gradle.kts b/diktat/src/test/resources/test/smoke/src/main/kotlin/kotlin-library.gradle.kts similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/kotlin-library.gradle.kts rename to diktat/src/test/resources/test/smoke/src/main/kotlin/kotlin-library.gradle.kts diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/save.toml b/diktat/src/test/resources/test/smoke/src/main/kotlin/save.toml similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/save.toml rename to diktat/src/test/resources/test/smoke/src/main/kotlin/save.toml diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/script/PackageInScriptExpected.kts b/diktat/src/test/resources/test/smoke/src/main/kotlin/script/PackageInScriptExpected.kts similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/script/PackageInScriptExpected.kts rename to diktat/src/test/resources/test/smoke/src/main/kotlin/script/PackageInScriptExpected.kts diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/script/PackageInScriptTest.kts b/diktat/src/test/resources/test/smoke/src/main/kotlin/script/PackageInScriptTest.kts similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/script/PackageInScriptTest.kts rename to diktat/src/test/resources/test/smoke/src/main/kotlin/script/PackageInScriptTest.kts diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/script/SimpleRunInScriptExpected.kts b/diktat/src/test/resources/test/smoke/src/main/kotlin/script/SimpleRunInScriptExpected.kts similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/script/SimpleRunInScriptExpected.kts rename to diktat/src/test/resources/test/smoke/src/main/kotlin/script/SimpleRunInScriptExpected.kts diff --git a/diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/script/SimpleRunInScriptTest.kts b/diktat/src/test/resources/test/smoke/src/main/kotlin/script/SimpleRunInScriptTest.kts similarity index 100% rename from diktat-ruleset/src/test/resources/test/smoke/src/main/kotlin/script/SimpleRunInScriptTest.kts rename to diktat/src/test/resources/test/smoke/src/main/kotlin/script/SimpleRunInScriptTest.kts diff --git a/pom.xml b/pom.xml index e3d68692e1..29b9b2d1d4 100644 --- a/pom.xml +++ b/pom.xml @@ -8,7 +8,7 @@ 1.2.5-SNAPSHOT pom - diktat + diktat-parent diKTat kotlin formatter and fixer https://www.cqfn.org/diKTat/ @@ -67,7 +67,7 @@ diktat-common diktat-rules diktat-test-framework - diktat-ruleset + diktat diktat-maven-plugin diktat-gradle-plugin